diff --git a/.librarian/state.yaml b/.librarian/state.yaml index 7ac491118624..30558a66384d 100644 --- a/.librarian/state.yaml +++ b/.librarian/state.yaml @@ -1,4 +1,4 @@ -image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:f5426423676c75008c2135037e7b98f78cbb99f78b3c46fe043b6897be92d836 +image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:a38add811f7f139d6a385b22d283ad09ef305b8cf50382ef62f0ce690787f021 libraries: - id: google-ads-admanager version: 0.8.0 @@ -428,7 +428,7 @@ libraries: - packages/google-cloud-apphub/ tag_format: '{id}-v{version}' - id: google-cloud-artifact-registry - version: 1.19.0 + version: 1.20.0 last_generated_commit: 9eea40c74d97622bb0aa406dd313409a376cc73b apis: - path: google/devtools/artifactregistry/v1 @@ -803,7 +803,7 @@ libraries: - packages/google-cloud-bigquery-reservation/ tag_format: '{id}-v{version}' - id: google-cloud-bigquery-storage - version: 2.36.0 + version: 2.36.1 last_generated_commit: 6b36371f6f3099624547e9ce4c1db304161e6afe apis: - path: google/cloud/bigquery/storage/v1beta2 @@ -1053,7 +1053,7 @@ libraries: - packages/google-cloud-compute-v1beta/ tag_format: '{id}-v{version}' - id: google-cloud-confidentialcomputing - version: 0.7.0 + version: 0.8.0 last_generated_commit: 9eea40c74d97622bb0aa406dd313409a376cc73b apis: - path: google/cloud/confidentialcomputing/v1 @@ -1187,7 +1187,7 @@ libraries: - packages/google-cloud-data-qna/ tag_format: '{id}-v{version}' - id: google-cloud-databasecenter - version: 0.4.0 + version: 0.5.0 last_generated_commit: 9eea40c74d97622bb0aa406dd313409a376cc73b apis: - path: google/cloud/databasecenter/v1beta @@ -1246,7 +1246,7 @@ libraries: - packages/google-cloud-dataflow-client/ tag_format: '{id}-v{version}' - id: google-cloud-dataform - version: 0.8.0 + version: 0.9.0 last_generated_commit: 9eea40c74d97622bb0aa406dd313409a376cc73b apis: - path: google/cloud/dataform/v1beta1 @@ -1381,7 +1381,7 @@ libraries: - packages/google-cloud-devicestreaming/ tag_format: '{id}-v{version}' - id: google-cloud-dialogflow - version: 2.45.0 + version: 2.46.0 last_generated_commit: 7f62014053cd26b1acb7a1d0bf167104b64e3690 apis: - path: google/cloud/dialogflow/v2beta1 @@ -1413,7 +1413,7 @@ libraries: - packages/google-cloud-dialogflow-cx tag_format: '{id}-v{version}' - id: google-cloud-discoveryengine - version: 0.16.0 + version: 0.17.0 last_generated_commit: f248ed087ef9b822834de74c962d9ba67bb737d3 apis: - path: google/cloud/discoveryengine/v1 @@ -1460,7 +1460,7 @@ libraries: - packages/google-cloud-dms/ tag_format: '{id}-v{version}' - id: google-cloud-documentai - version: 3.9.0 + version: 3.10.0 last_generated_commit: 9eea40c74d97622bb0aa406dd313409a376cc73b apis: - path: google/cloud/documentai/v1beta3 @@ -1680,7 +1680,7 @@ libraries: - packages/google-cloud-gke-connect-gateway/ tag_format: '{id}-v{version}' - id: google-cloud-gke-hub - version: 1.20.0 + version: 1.21.0 last_generated_commit: 7f62014053cd26b1acb7a1d0bf167104b64e3690 apis: - path: google/cloud/gkehub/v1 @@ -2831,7 +2831,7 @@ libraries: - packages/google-cloud-speech/ tag_format: '{id}-v{version}' - id: google-cloud-storage-control - version: 1.9.0 + version: 1.10.0 last_generated_commit: 9eea40c74d97622bb0aa406dd313409a376cc73b apis: - path: google/storage/control/v2 @@ -3142,7 +3142,7 @@ libraries: - packages/google-cloud-vision/ tag_format: '{id}-v{version}' - id: google-cloud-visionai - version: 0.3.0 + version: 0.4.0 last_generated_commit: 9eea40c74d97622bb0aa406dd313409a376cc73b apis: - path: google/cloud/visionai/v1alpha1 @@ -3397,7 +3397,7 @@ libraries: - packages/google-maps-routing tag_format: '{id}-v{version}' - id: google-maps-solar - version: 0.3.0 + version: 0.4.0 last_generated_commit: 9eea40c74d97622bb0aa406dd313409a376cc73b apis: - path: google/maps/solar/v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f2a0727028f..1db3ac3b9c1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ Changelogs - [google-cloud-appengine-admin==1.16.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-appengine-admin/CHANGELOG.md) - [google-cloud-appengine-logging==1.8.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-appengine-logging/CHANGELOG.md) - [google-cloud-apphub==0.3.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-apphub/CHANGELOG.md) -- [google-cloud-artifact-registry==1.19.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-artifact-registry/CHANGELOG.md) +- [google-cloud-artifact-registry==1.20.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-artifact-registry/CHANGELOG.md) - [google-cloud-asset==4.2.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-asset/CHANGELOG.md) - [google-cloud-assured-workloads==2.2.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-assured-workloads/CHANGELOG.md) - [google-cloud-audit-log==0.4.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-audit-log/CHANGELOG.md) @@ -60,7 +60,7 @@ Changelogs - [google-cloud-common==1.8.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-common/CHANGELOG.md) - [google-cloud-compute-v1beta==0.6.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-compute-v1beta/CHANGELOG.md) - [google-cloud-compute==1.43.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-compute/CHANGELOG.md) -- [google-cloud-confidentialcomputing==0.7.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-confidentialcomputing/CHANGELOG.md) +- [google-cloud-confidentialcomputing==0.8.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-confidentialcomputing/CHANGELOG.md) - [google-cloud-config==0.4.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-config/CHANGELOG.md) - [google-cloud-configdelivery==0.3.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-configdelivery/CHANGELOG.md) - [google-cloud-contact-center-insights==1.25.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-contact-center-insights/CHANGELOG.md) @@ -72,7 +72,7 @@ Changelogs - [google-cloud-datacatalog-lineage==0.5.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-datacatalog-lineage/CHANGELOG.md) - [google-cloud-datacatalog==3.29.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-datacatalog/CHANGELOG.md) - [google-cloud-dataflow-client==0.11.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dataflow-client/CHANGELOG.md) -- [google-cloud-dataform==0.8.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dataform/CHANGELOG.md) +- [google-cloud-dataform==0.9.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dataform/CHANGELOG.md) - [google-cloud-datalabeling==1.15.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-datalabeling/CHANGELOG.md) - [google-cloud-dataplex==2.16.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dataplex/CHANGELOG.md) - [google-cloud-dataproc-metastore==1.21.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dataproc-metastore/CHANGELOG.md) @@ -82,11 +82,11 @@ Changelogs - [google-cloud-developerconnect==0.3.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-developerconnect/CHANGELOG.md) - [google-cloud-devicestreaming==0.3.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-devicestreaming/CHANGELOG.md) - [google-cloud-dialogflow-cx==2.3.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dialogflow-cx/CHANGELOG.md) -- [google-cloud-dialogflow==2.45.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dialogflow/CHANGELOG.md) -- [google-cloud-discoveryengine==0.16.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-discoveryengine/CHANGELOG.md) +- [google-cloud-dialogflow==2.46.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dialogflow/CHANGELOG.md) +- [google-cloud-discoveryengine==0.17.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-discoveryengine/CHANGELOG.md) - [google-cloud-dlp==3.34.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dlp/CHANGELOG.md) - [google-cloud-dms==1.14.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dms/CHANGELOG.md) -- [google-cloud-documentai==3.9.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-documentai/CHANGELOG.md) +- [google-cloud-documentai==3.10.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-documentai/CHANGELOG.md) - [google-cloud-domains==1.12.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-domains/CHANGELOG.md) - [google-cloud-edgecontainer==0.7.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-edgecontainer/CHANGELOG.md) - [google-cloud-edgenetwork==0.4.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-edgenetwork/CHANGELOG.md) @@ -101,7 +101,7 @@ Changelogs - [google-cloud-geminidataanalytics==0.10.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-geminidataanalytics/CHANGELOG.md) - [google-cloud-gke-backup==0.7.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-gke-backup/CHANGELOG.md) - [google-cloud-gke-connect-gateway==0.12.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-gke-connect-gateway/CHANGELOG.md) -- [google-cloud-gke-hub==1.20.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-gke-hub/CHANGELOG.md) +- [google-cloud-gke-hub==1.21.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-gke-hub/CHANGELOG.md) - [google-cloud-gke-multicloud==0.8.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-gke-multicloud/CHANGELOG.md) - [google-cloud-gsuiteaddons==0.4.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-gsuiteaddons/CHANGELOG.md) - [google-cloud-iam-logging==1.6.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-iam-logging/CHANGELOG.md) @@ -172,7 +172,7 @@ Changelogs - [google-cloud-shell==1.14.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-shell/CHANGELOG.md) - [google-cloud-source-context==1.9.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-source-context/CHANGELOG.md) - [google-cloud-speech==2.36.1](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-speech/CHANGELOG.md) -- [google-cloud-storage-control==1.9.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-storage-control/CHANGELOG.md) +- [google-cloud-storage-control==1.10.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-storage-control/CHANGELOG.md) - [google-cloud-storage-transfer==1.19.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-storage-transfer/CHANGELOG.md) - [google-cloud-storagebatchoperations==0.3.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-storagebatchoperations/CHANGELOG.md) - [google-cloud-storageinsights==0.3.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-storageinsights/CHANGELOG.md) @@ -189,7 +189,7 @@ Changelogs - [google-cloud-video-transcoder==1.19.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-video-transcoder/CHANGELOG.md) - [google-cloud-videointelligence==2.18.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-videointelligence/CHANGELOG.md) - [google-cloud-vision==3.12.1](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-vision/CHANGELOG.md) -- [google-cloud-visionai==0.3.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-visionai/CHANGELOG.md) +- [google-cloud-visionai==0.4.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-visionai/CHANGELOG.md) - [google-cloud-vm-migration==1.15.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-vm-migration/CHANGELOG.md) - [google-cloud-vmwareengine==1.10.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-vmwareengine/CHANGELOG.md) - [google-cloud-vpc-access==1.15.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-vpc-access/CHANGELOG.md) @@ -206,7 +206,7 @@ Changelogs - [google-maps-places==0.6.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-maps-places/CHANGELOG.md) - [google-maps-routeoptimization==0.3.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-maps-routeoptimization/CHANGELOG.md) - [google-maps-routing==0.8.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-maps-routing/CHANGELOG.md) -- [google-maps-solar==0.3.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-maps-solar/CHANGELOG.md) +- [google-maps-solar==0.4.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-maps-solar/CHANGELOG.md) - [google-shopping-css==0.3.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-shopping-css/CHANGELOG.md) - [google-shopping-merchant-accounts==1.3.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-shopping-merchant-accounts/CHANGELOG.md) - [google-shopping-merchant-conversions==1.2.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-shopping-merchant-conversions/CHANGELOG.md) diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/__init__.py index ffa700c219fd..f55750c3f29c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.ad_break_service import AdBreakServiceClient from .services.ad_review_center_ad_service import AdReviewCenterAdServiceClient from .services.ad_unit_service import AdUnitServiceClient diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/client.py index bf3c44670f17..742c1e15e9a2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore 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 google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.ad_break_service import pagers from google.ads.admanager_v1.types import ( @@ -85,9 +85,7 @@ class AdBreakServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AdBreakServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AdBreakServiceTransport]] _transport_registry["rest"] = AdBreakServiceRestTransport def get_transport_class( @@ -645,11 +643,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AdBreakServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AdBreakServiceClient._read_environment_variables() + ) self._client_cert_source = AdBreakServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -684,8 +680,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AdBreakServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/pagers.py index 6bf54a2fe8d6..708a6e295e99 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/base.py index a720d23ea7a3..f62045ec90dc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ad_break_messages, ad_break_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest.py index 15b7b763c4a5..520f27684cd0 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.ads.admanager_v1.types import ad_break_messages, ad_break_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest_base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest_base.py index a70bf670aa4d..1668e30ba69e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest_base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ads.admanager_v1.types import ad_break_messages, ad_break_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/client.py index 1637949e1534..a05ef2f6d1b7 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -83,9 +83,7 @@ class AdReviewCenterAdServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AdReviewCenterAdServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AdReviewCenterAdServiceTransport]] _transport_registry["rest"] = AdReviewCenterAdServiceRestTransport def get_transport_class( @@ -649,11 +647,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AdReviewCenterAdServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AdReviewCenterAdServiceClient._read_environment_variables() + ) self._client_cert_source = ( AdReviewCenterAdServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -690,8 +686,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AdReviewCenterAdServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/pagers.py index 5b7d3e65cde6..5e3e15dd0825 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/__init__.py index 91d81f66f8c2..7bc63d24d4c7 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AdReviewCenterAdServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AdReviewCenterAdServiceTransport]] _transport_registry["rest"] = AdReviewCenterAdServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/base.py index 2b391fba5a35..fdc7dc2d9d84 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ad_review_center_ad_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/rest.py index 26ce959e9b51..41dd10bbe278 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -464,9 +464,7 @@ def __call__( """ - http_options = ( - _BaseAdReviewCenterAdServiceRestTransport._BaseBatchAllowAdReviewCenterAds._get_http_options() - ) + http_options = _BaseAdReviewCenterAdServiceRestTransport._BaseBatchAllowAdReviewCenterAds._get_http_options() request, metadata = self._interceptor.pre_batch_allow_ad_review_center_ads( request, metadata @@ -533,11 +531,10 @@ def __call__( resp = self._interceptor.post_batch_allow_ad_review_center_ads(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_allow_ad_review_center_ads_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_allow_ad_review_center_ads_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -625,9 +622,7 @@ def __call__( """ - http_options = ( - _BaseAdReviewCenterAdServiceRestTransport._BaseBatchBlockAdReviewCenterAds._get_http_options() - ) + http_options = _BaseAdReviewCenterAdServiceRestTransport._BaseBatchBlockAdReviewCenterAds._get_http_options() request, metadata = self._interceptor.pre_batch_block_ad_review_center_ads( request, metadata @@ -694,11 +689,10 @@ def __call__( resp = self._interceptor.post_batch_block_ad_review_center_ads(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_block_ad_review_center_ads_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_block_ad_review_center_ads_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -779,9 +773,7 @@ def __call__( Response object for ``SearchAdReviewCenterAds`` method. """ - http_options = ( - _BaseAdReviewCenterAdServiceRestTransport._BaseSearchAdReviewCenterAds._get_http_options() - ) + http_options = _BaseAdReviewCenterAdServiceRestTransport._BaseSearchAdReviewCenterAds._get_http_options() request, metadata = self._interceptor.pre_search_ad_review_center_ads( request, metadata @@ -884,7 +876,9 @@ def batch_allow_ad_review_center_ads( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchAllowAdReviewCenterAds(self._session, self._host, self._interceptor) # type: ignore + return self._BatchAllowAdReviewCenterAds( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_block_ad_review_center_ads( @@ -895,7 +889,9 @@ def batch_block_ad_review_center_ads( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchBlockAdReviewCenterAds(self._session, self._host, self._interceptor) # type: ignore + return self._BatchBlockAdReviewCenterAds( + self._session, self._host, self._interceptor + ) # type: ignore @property def search_ad_review_center_ads( @@ -906,7 +902,9 @@ def search_ad_review_center_ads( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SearchAdReviewCenterAds(self._session, self._host, self._interceptor) # type: ignore + return self._SearchAdReviewCenterAds( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -966,9 +964,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAdReviewCenterAdServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAdReviewCenterAdServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAdReviewCenterAdServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/client.py index 90ec036c9743..d5e9814c0dfe 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore 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 google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.ad_unit_service import pagers from google.ads.admanager_v1.types import ( @@ -668,11 +668,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AdUnitServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AdUnitServiceClient._read_environment_variables() + ) self._client_cert_source = AdUnitServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -707,8 +705,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AdUnitServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/pagers.py index 35a60482fdc9..995c71e1f584 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/base.py index 1092e1b34c4d..08ed693dab8c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ad_unit_messages, ad_unit_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/rest.py index 4a3d2d1b9794..1850a8318b32 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -831,9 +831,7 @@ def __call__( Response object for ``BatchActivateAdUnits`` method. """ - http_options = ( - _BaseAdUnitServiceRestTransport._BaseBatchActivateAdUnits._get_http_options() - ) + http_options = _BaseAdUnitServiceRestTransport._BaseBatchActivateAdUnits._get_http_options() request, metadata = self._interceptor.pre_batch_activate_ad_units( request, metadata @@ -985,9 +983,7 @@ def __call__( Response object for ``BatchArchiveAdUnits`` method. """ - http_options = ( - _BaseAdUnitServiceRestTransport._BaseBatchArchiveAdUnits._get_http_options() - ) + http_options = _BaseAdUnitServiceRestTransport._BaseBatchArchiveAdUnits._get_http_options() request, metadata = self._interceptor.pre_batch_archive_ad_units( request, metadata @@ -1139,9 +1135,7 @@ def __call__( Response object for ``BatchCreateAdUnits`` method. """ - http_options = ( - _BaseAdUnitServiceRestTransport._BaseBatchCreateAdUnits._get_http_options() - ) + http_options = _BaseAdUnitServiceRestTransport._BaseBatchCreateAdUnits._get_http_options() request, metadata = self._interceptor.pre_batch_create_ad_units( request, metadata @@ -1294,9 +1288,7 @@ def __call__( Response object for ``BatchDeactivateAdUnits`` method. """ - http_options = ( - _BaseAdUnitServiceRestTransport._BaseBatchDeactivateAdUnits._get_http_options() - ) + http_options = _BaseAdUnitServiceRestTransport._BaseBatchDeactivateAdUnits._get_http_options() request, metadata = self._interceptor.pre_batch_deactivate_ad_units( request, metadata @@ -1448,9 +1440,7 @@ def __call__( Response object for ``BatchUpdateAdUnits`` method. """ - http_options = ( - _BaseAdUnitServiceRestTransport._BaseBatchUpdateAdUnits._get_http_options() - ) + http_options = _BaseAdUnitServiceRestTransport._BaseBatchUpdateAdUnits._get_http_options() request, metadata = self._interceptor.pre_batch_update_ad_units( request, metadata @@ -2341,7 +2331,9 @@ def batch_deactivate_ad_units( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchDeactivateAdUnits(self._session, self._host, self._interceptor) # type: ignore + return self._BatchDeactivateAdUnits( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_ad_units( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/client.py index 3da4620956e6..0e7a626845b9 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class ApplicationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ApplicationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ApplicationServiceTransport]] _transport_registry["rest"] = ApplicationServiceRestTransport def get_transport_class( @@ -634,11 +632,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApplicationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApplicationServiceClient._read_environment_variables() + ) self._client_cert_source = ApplicationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -673,8 +669,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApplicationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/pagers.py index 7b6fd3d8cb5b..3350400d8dbf 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/__init__.py index 96088f830d7c..df94997a00b6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ApplicationServiceRestInterceptor, ApplicationServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ApplicationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ApplicationServiceTransport]] _transport_registry["rest"] = ApplicationServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/base.py index a160509b80b4..9125ca11c6b5 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import application_messages, application_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/rest.py index 61b9c5d62503..738d8c1dbbb3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -370,9 +370,7 @@ def __call__( """ - http_options = ( - _BaseApplicationServiceRestTransport._BaseGetApplication._get_http_options() - ) + http_options = _BaseApplicationServiceRestTransport._BaseGetApplication._get_http_options() request, metadata = self._interceptor.pre_get_application(request, metadata) transcoded_request = _BaseApplicationServiceRestTransport._BaseGetApplication._get_transcoded_request( @@ -519,9 +517,7 @@ def __call__( """ - http_options = ( - _BaseApplicationServiceRestTransport._BaseListApplications._get_http_options() - ) + http_options = _BaseApplicationServiceRestTransport._BaseListApplications._get_http_options() request, metadata = self._interceptor.pre_list_applications( request, metadata @@ -692,9 +688,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseApplicationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseApplicationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseApplicationServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/client.py index 15717f6010ce..8bd2e0a3ce73 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class AudienceSegmentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AudienceSegmentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AudienceSegmentServiceTransport]] _transport_registry["rest"] = AudienceSegmentServiceRestTransport def get_transport_class( @@ -640,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AudienceSegmentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AudienceSegmentServiceClient._read_environment_variables() + ) self._client_cert_source = AudienceSegmentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -679,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AudienceSegmentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/pagers.py index 8940bd966b66..bc92516907cb 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/__init__.py index caf4d2aa56d1..e21bd63eaeb4 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AudienceSegmentServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AudienceSegmentServiceTransport]] _transport_registry["rest"] = AudienceSegmentServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/base.py index 8d43d6e6aa5b..aabe0d0279c8 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/rest.py index f41c5533858a..188597bfcef6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -370,9 +370,7 @@ def __call__( The ``AudienceSegment`` resource. """ - http_options = ( - _BaseAudienceSegmentServiceRestTransport._BaseGetAudienceSegment._get_http_options() - ) + http_options = _BaseAudienceSegmentServiceRestTransport._BaseGetAudienceSegment._get_http_options() request, metadata = self._interceptor.pre_get_audience_segment( request, metadata @@ -523,9 +521,7 @@ def __call__( """ - http_options = ( - _BaseAudienceSegmentServiceRestTransport._BaseListAudienceSegments._get_http_options() - ) + http_options = _BaseAudienceSegmentServiceRestTransport._BaseListAudienceSegments._get_http_options() request, metadata = self._interceptor.pre_list_audience_segments( request, metadata @@ -701,9 +697,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAudienceSegmentServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAudienceSegmentServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAudienceSegmentServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/client.py index 1905f0615ff8..97f4267bad05 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class BandwidthGroupServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BandwidthGroupServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BandwidthGroupServiceTransport]] _transport_registry["rest"] = BandwidthGroupServiceRestTransport def get_transport_class( @@ -640,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BandwidthGroupServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BandwidthGroupServiceClient._read_environment_variables() + ) self._client_cert_source = BandwidthGroupServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -679,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BandwidthGroupServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/pagers.py index e015c21f381b..fd99bac400c3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/__init__.py index 96b9cbe70396..7779891532a2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[BandwidthGroupServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[BandwidthGroupServiceTransport]] _transport_registry["rest"] = BandwidthGroupServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/base.py index 33cb98b4e16a..8337018ac15f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/rest.py index 29c3165baa02..9d6b21cc5399 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -373,9 +373,7 @@ def __call__( """ - http_options = ( - _BaseBandwidthGroupServiceRestTransport._BaseGetBandwidthGroup._get_http_options() - ) + http_options = _BaseBandwidthGroupServiceRestTransport._BaseGetBandwidthGroup._get_http_options() request, metadata = self._interceptor.pre_get_bandwidth_group( request, metadata @@ -526,9 +524,7 @@ def __call__( """ - http_options = ( - _BaseBandwidthGroupServiceRestTransport._BaseListBandwidthGroups._get_http_options() - ) + http_options = _BaseBandwidthGroupServiceRestTransport._BaseListBandwidthGroups._get_http_options() request, metadata = self._interceptor.pre_list_bandwidth_groups( request, metadata @@ -704,9 +700,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseBandwidthGroupServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseBandwidthGroupServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseBandwidthGroupServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/client.py index 3d6f162ebfc3..74307fada64e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class BrowserLanguageServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BrowserLanguageServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BrowserLanguageServiceTransport]] _transport_registry["rest"] = BrowserLanguageServiceRestTransport def get_transport_class( @@ -640,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BrowserLanguageServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BrowserLanguageServiceClient._read_environment_variables() + ) self._client_cert_source = BrowserLanguageServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -679,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BrowserLanguageServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/pagers.py index 29c5432dec77..78ad1aa38472 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/__init__.py index b3d0a4067c54..bebfbd81b315 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[BrowserLanguageServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[BrowserLanguageServiceTransport]] _transport_registry["rest"] = BrowserLanguageServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/base.py index 12f2e19b7fdd..4b85e2f2d72f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/rest.py index a8b8fcbad57c..523d03a2b385 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -370,9 +370,7 @@ def __call__( Represents the language of a browser. """ - http_options = ( - _BaseBrowserLanguageServiceRestTransport._BaseGetBrowserLanguage._get_http_options() - ) + http_options = _BaseBrowserLanguageServiceRestTransport._BaseGetBrowserLanguage._get_http_options() request, metadata = self._interceptor.pre_get_browser_language( request, metadata @@ -523,9 +521,7 @@ def __call__( """ - http_options = ( - _BaseBrowserLanguageServiceRestTransport._BaseListBrowserLanguages._get_http_options() - ) + http_options = _BaseBrowserLanguageServiceRestTransport._BaseListBrowserLanguages._get_http_options() request, metadata = self._interceptor.pre_list_browser_languages( request, metadata @@ -701,9 +697,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseBrowserLanguageServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseBrowserLanguageServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseBrowserLanguageServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/client.py index c74e94e381c3..3b54412cc6dc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class BrowserServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BrowserServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BrowserServiceTransport]] _transport_registry["rest"] = BrowserServiceRestTransport def get_transport_class( @@ -630,11 +628,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BrowserServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BrowserServiceClient._read_environment_variables() + ) self._client_cert_source = BrowserServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -669,8 +665,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BrowserServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/pagers.py index 95173cb5fbe0..580770e2cb04 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/base.py index 214406dd960b..4786de410282 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import browser_messages, browser_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/rest.py index b503188825a7..242bc55dcb22 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/client.py index ea1f2c031e28..e5296369d232 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -82,9 +82,7 @@ class CmsMetadataKeyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CmsMetadataKeyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CmsMetadataKeyServiceTransport]] _transport_registry["rest"] = CmsMetadataKeyServiceRestTransport def get_transport_class( @@ -641,11 +639,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CmsMetadataKeyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CmsMetadataKeyServiceClient._read_environment_variables() + ) self._client_cert_source = CmsMetadataKeyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -680,8 +676,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CmsMetadataKeyServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/pagers.py index ef1178a06532..bdf1fc7d7bb2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/__init__.py index 8df01714ef69..0813dc61268a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CmsMetadataKeyServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CmsMetadataKeyServiceTransport]] _transport_registry["rest"] = CmsMetadataKeyServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/base.py index 8fdc1627f8b1..b6d059cee96f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/rest.py index ba7cc92b7378..44ff0a90719e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -372,9 +372,7 @@ def __call__( """ - http_options = ( - _BaseCmsMetadataKeyServiceRestTransport._BaseGetCmsMetadataKey._get_http_options() - ) + http_options = _BaseCmsMetadataKeyServiceRestTransport._BaseGetCmsMetadataKey._get_http_options() request, metadata = self._interceptor.pre_get_cms_metadata_key( request, metadata @@ -525,9 +523,7 @@ def __call__( """ - http_options = ( - _BaseCmsMetadataKeyServiceRestTransport._BaseListCmsMetadataKeys._get_http_options() - ) + http_options = _BaseCmsMetadataKeyServiceRestTransport._BaseListCmsMetadataKeys._get_http_options() request, metadata = self._interceptor.pre_list_cms_metadata_keys( request, metadata @@ -703,9 +699,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCmsMetadataKeyServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCmsMetadataKeyServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCmsMetadataKeyServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/client.py index 16ad97e28fe1..55d30c3d083e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -82,9 +82,7 @@ class CmsMetadataValueServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CmsMetadataValueServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CmsMetadataValueServiceTransport]] _transport_registry["rest"] = CmsMetadataValueServiceRestTransport def get_transport_class( @@ -661,11 +659,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CmsMetadataValueServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CmsMetadataValueServiceClient._read_environment_variables() + ) self._client_cert_source = ( CmsMetadataValueServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -702,8 +698,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CmsMetadataValueServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/pagers.py index bc68d27c7c58..fda969e49c09 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/__init__.py index 03c87919081d..e708c6678877 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CmsMetadataValueServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CmsMetadataValueServiceTransport]] _transport_registry["rest"] = CmsMetadataValueServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/base.py index 64f7c508e112..2c11cd33402d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/rest.py index e17ef914e113..ff26c2594d4f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -372,9 +372,7 @@ def __call__( """ - http_options = ( - _BaseCmsMetadataValueServiceRestTransport._BaseGetCmsMetadataValue._get_http_options() - ) + http_options = _BaseCmsMetadataValueServiceRestTransport._BaseGetCmsMetadataValue._get_http_options() request, metadata = self._interceptor.pre_get_cms_metadata_value( request, metadata @@ -525,9 +523,7 @@ def __call__( """ - http_options = ( - _BaseCmsMetadataValueServiceRestTransport._BaseListCmsMetadataValues._get_http_options() - ) + http_options = _BaseCmsMetadataValueServiceRestTransport._BaseListCmsMetadataValues._get_http_options() request, metadata = self._interceptor.pre_list_cms_metadata_values( request, metadata @@ -699,9 +695,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCmsMetadataValueServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCmsMetadataValueServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCmsMetadataValueServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/client.py index 0cd058d3a317..779d7304a55f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.company_service import pagers from google.ads.admanager_v1.types import ( @@ -84,9 +84,7 @@ class CompanyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CompanyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CompanyServiceTransport]] _transport_registry["rest"] = CompanyServiceRestTransport def get_transport_class( @@ -689,11 +687,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CompanyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CompanyServiceClient._read_environment_variables() + ) self._client_cert_source = CompanyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -728,8 +724,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CompanyServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/pagers.py index 91ba86c1c532..b926a659fd41 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/base.py index bd8405b8a7b5..6c52bec87938 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import company_messages, company_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/rest.py index 7938aa979aa4..2541be08436d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/client.py index fac7a70534ac..47fa8c2bf3ec 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.contact_service import pagers from google.ads.admanager_v1.types import ( @@ -83,9 +83,7 @@ class ContactServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ContactServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ContactServiceTransport]] _transport_registry["rest"] = ContactServiceRestTransport def get_transport_class( @@ -654,11 +652,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContactServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContactServiceClient._read_environment_variables() + ) self._client_cert_source = ContactServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -693,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContactServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/pagers.py index 900bdb93c0b5..832124a8b028 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/base.py index 610c710d3c34..b12f5ec0224e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import contact_messages, contact_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/rest.py index 8ea86924104b..411f40a746ed 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -594,9 +594,7 @@ def __call__( Response object for ``BatchCreateContacts`` method. """ - http_options = ( - _BaseContactServiceRestTransport._BaseBatchCreateContacts._get_http_options() - ) + http_options = _BaseContactServiceRestTransport._BaseBatchCreateContacts._get_http_options() request, metadata = self._interceptor.pre_batch_create_contacts( request, metadata @@ -749,9 +747,7 @@ def __call__( Response object for ``BatchUpdateContacts`` method. """ - http_options = ( - _BaseContactServiceRestTransport._BaseBatchUpdateContacts._get_http_options() - ) + http_options = _BaseContactServiceRestTransport._BaseBatchUpdateContacts._get_http_options() request, metadata = self._interceptor.pre_batch_update_contacts( request, metadata diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/client.py index 0002dd41b0a8..baf43d2ab53d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class ContentBundleServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ContentBundleServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ContentBundleServiceTransport]] _transport_registry["rest"] = ContentBundleServiceRestTransport def get_transport_class( @@ -638,11 +636,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContentBundleServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContentBundleServiceClient._read_environment_variables() + ) self._client_cert_source = ContentBundleServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +673,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContentBundleServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/pagers.py index c010507bcda3..2adf8af36566 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/__init__.py index 435b5c1001f5..1533486b6998 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ContentBundleServiceRestInterceptor, ContentBundleServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ContentBundleServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ContentBundleServiceTransport]] _transport_registry["rest"] = ContentBundleServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/base.py index ebee2c64eb30..65333bb2a392 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/rest.py index 05cfaf157cbe..aad63c04ffbc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -377,9 +377,7 @@ def __call__( """ - http_options = ( - _BaseContentBundleServiceRestTransport._BaseGetContentBundle._get_http_options() - ) + http_options = _BaseContentBundleServiceRestTransport._BaseGetContentBundle._get_http_options() request, metadata = self._interceptor.pre_get_content_bundle( request, metadata @@ -530,9 +528,7 @@ def __call__( """ - http_options = ( - _BaseContentBundleServiceRestTransport._BaseListContentBundles._get_http_options() - ) + http_options = _BaseContentBundleServiceRestTransport._BaseListContentBundles._get_http_options() request, metadata = self._interceptor.pre_list_content_bundles( request, metadata @@ -708,9 +704,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseContentBundleServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseContentBundleServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseContentBundleServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/client.py index 93654e9ed830..6e1af6c11bb3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class ContentLabelServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ContentLabelServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ContentLabelServiceTransport]] _transport_registry["rest"] = ContentLabelServiceRestTransport def get_transport_class( @@ -635,11 +633,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContentLabelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContentLabelServiceClient._read_environment_variables() + ) self._client_cert_source = ContentLabelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -674,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContentLabelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/pagers.py index 31f5522bc145..5b74fed627e4 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/__init__.py index b14b83ab13da..f8e096c74fa4 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ContentLabelServiceRestInterceptor, ContentLabelServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ContentLabelServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ContentLabelServiceTransport]] _transport_registry["rest"] = ContentLabelServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/base.py index 954287f12698..001c8d304e88 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import content_label_messages, content_label_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/rest.py index 09ed6137106b..e04874b0b718 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -366,9 +366,7 @@ def __call__( A content label. """ - http_options = ( - _BaseContentLabelServiceRestTransport._BaseGetContentLabel._get_http_options() - ) + http_options = _BaseContentLabelServiceRestTransport._BaseGetContentLabel._get_http_options() request, metadata = self._interceptor.pre_get_content_label( request, metadata @@ -517,9 +515,7 @@ def __call__( """ - http_options = ( - _BaseContentLabelServiceRestTransport._BaseListContentLabels._get_http_options() - ) + http_options = _BaseContentLabelServiceRestTransport._BaseListContentLabels._get_http_options() request, metadata = self._interceptor.pre_list_content_labels( request, metadata @@ -695,9 +691,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseContentLabelServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseContentLabelServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseContentLabelServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/client.py index a74694a64c32..9c4686798997 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class ContentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ContentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ContentServiceTransport]] _transport_registry["rest"] = ContentServiceRestTransport def get_transport_class( @@ -628,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContentServiceClient._read_environment_variables() + ) self._client_cert_source = ContentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/pagers.py index cc1feb6bb787..bf4cf1359012 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/base.py index 66b40f930556..5ece053dc174 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import content_messages, content_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/rest.py index 8cb123fa350f..ae6fcbd7c6f2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/client.py index cb145f88b0af..13c2c5d09e9c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -82,9 +82,7 @@ class CreativeTemplateServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CreativeTemplateServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CreativeTemplateServiceTransport]] _transport_registry["rest"] = CreativeTemplateServiceRestTransport def get_transport_class( @@ -641,11 +639,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CreativeTemplateServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CreativeTemplateServiceClient._read_environment_variables() + ) self._client_cert_source = ( CreativeTemplateServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -682,8 +678,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CreativeTemplateServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/pagers.py index 4ec78308875f..3e66404e2b0a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/__init__.py index 760dd54dd935..0390751e27db 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CreativeTemplateServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CreativeTemplateServiceTransport]] _transport_registry["rest"] = CreativeTemplateServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/base.py index abd950b74d8c..056e0c6caa23 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/rest.py index 22b568cbabf4..d168804fde63 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -372,9 +372,7 @@ def __call__( """ - http_options = ( - _BaseCreativeTemplateServiceRestTransport._BaseGetCreativeTemplate._get_http_options() - ) + http_options = _BaseCreativeTemplateServiceRestTransport._BaseGetCreativeTemplate._get_http_options() request, metadata = self._interceptor.pre_get_creative_template( request, metadata @@ -525,9 +523,7 @@ def __call__( """ - http_options = ( - _BaseCreativeTemplateServiceRestTransport._BaseListCreativeTemplates._get_http_options() - ) + http_options = _BaseCreativeTemplateServiceRestTransport._BaseListCreativeTemplates._get_http_options() request, metadata = self._interceptor.pre_list_creative_templates( request, metadata @@ -701,9 +697,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCreativeTemplateServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCreativeTemplateServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCreativeTemplateServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/client.py index 62a1b15e22c7..23aab254162b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.custom_field_service import pagers from google.ads.admanager_v1.types import ( @@ -83,9 +83,7 @@ class CustomFieldServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CustomFieldServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CustomFieldServiceTransport]] _transport_registry["rest"] = CustomFieldServiceRestTransport def get_transport_class( @@ -639,11 +637,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CustomFieldServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CustomFieldServiceClient._read_environment_variables() + ) self._client_cert_source = CustomFieldServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -678,8 +674,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CustomFieldServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/pagers.py index 3052d8dadcb9..6054e24f17d0 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/__init__.py index c4ee1d8975f5..1cb5c79ffe64 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import CustomFieldServiceRestInterceptor, CustomFieldServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CustomFieldServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CustomFieldServiceTransport]] _transport_registry["rest"] = CustomFieldServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/base.py index 61f90b2d3e25..cd7d6a072413 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import custom_field_messages, custom_field_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/rest.py index 4b567d05e8e3..2a4e4ccf071a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -729,9 +729,7 @@ def __call__( """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseBatchActivateCustomFields._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseBatchActivateCustomFields._get_http_options() request, metadata = self._interceptor.pre_batch_activate_custom_fields( request, metadata @@ -887,9 +885,7 @@ def __call__( Response object for ``BatchCreateCustomFields`` method. """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseBatchCreateCustomFields._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseBatchCreateCustomFields._get_http_options() request, metadata = self._interceptor.pre_batch_create_custom_fields( request, metadata @@ -1050,9 +1046,7 @@ def __call__( """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseBatchDeactivateCustomFields._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseBatchDeactivateCustomFields._get_http_options() request, metadata = self._interceptor.pre_batch_deactivate_custom_fields( request, metadata @@ -1121,11 +1115,10 @@ def __call__( resp = self._interceptor.post_batch_deactivate_custom_fields(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_deactivate_custom_fields_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_deactivate_custom_fields_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1209,9 +1202,7 @@ def __call__( Response object for ``BatchUpdateCustomFields`` method. """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseBatchUpdateCustomFields._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseBatchUpdateCustomFields._get_http_options() request, metadata = self._interceptor.pre_batch_update_custom_fields( request, metadata @@ -1370,9 +1361,7 @@ def __call__( """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseCreateCustomField._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseCreateCustomField._get_http_options() request, metadata = self._interceptor.pre_create_custom_field( request, metadata @@ -1526,9 +1515,7 @@ def __call__( """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseGetCustomField._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseGetCustomField._get_http_options() request, metadata = self._interceptor.pre_get_custom_field( request, metadata @@ -1677,9 +1664,7 @@ def __call__( """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseListCustomFields._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseListCustomFields._get_http_options() request, metadata = self._interceptor.pre_list_custom_fields( request, metadata @@ -1829,9 +1814,7 @@ def __call__( """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseUpdateCustomField._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseUpdateCustomField._get_http_options() request, metadata = self._interceptor.pre_update_custom_field( request, metadata @@ -1937,7 +1920,9 @@ def batch_activate_custom_fields( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchActivateCustomFields(self._session, self._host, self._interceptor) # type: ignore + return self._BatchActivateCustomFields( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_create_custom_fields( @@ -1948,7 +1933,9 @@ def batch_create_custom_fields( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchCreateCustomFields(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateCustomFields( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_deactivate_custom_fields( @@ -1959,7 +1946,9 @@ def batch_deactivate_custom_fields( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchDeactivateCustomFields(self._session, self._host, self._interceptor) # type: ignore + return self._BatchDeactivateCustomFields( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_custom_fields( @@ -1970,7 +1959,9 @@ def batch_update_custom_fields( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchUpdateCustomFields(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateCustomFields( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_custom_field( @@ -2073,9 +2064,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCustomFieldServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/client.py index 43def4572fe9..8bef80064aba 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.custom_targeting_key_service import pagers from google.ads.admanager_v1.types import ( @@ -83,9 +83,7 @@ class CustomTargetingKeyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CustomTargetingKeyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CustomTargetingKeyServiceTransport]] _transport_registry["rest"] = CustomTargetingKeyServiceRestTransport def get_transport_class( @@ -644,11 +642,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CustomTargetingKeyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CustomTargetingKeyServiceClient._read_environment_variables() + ) self._client_cert_source = ( CustomTargetingKeyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -685,8 +681,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CustomTargetingKeyServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/pagers.py index 898de4765849..7b15fa0c6868 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/__init__.py index 7433408cca85..fbc0d2eac12a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CustomTargetingKeyServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CustomTargetingKeyServiceTransport]] _transport_registry["rest"] = CustomTargetingKeyServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/base.py index 6a226b68b199..4761253f6b5e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/rest.py index 7e2630b80eb3..a2a1800122dd 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -743,15 +743,12 @@ def __call__( """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseBatchActivateCustomTargetingKeys._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchActivateCustomTargetingKeys._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_batch_activate_custom_targeting_keys( - request, metadata + request, metadata = ( + self._interceptor.pre_batch_activate_custom_targeting_keys( + request, metadata + ) ) transcoded_request = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchActivateCustomTargetingKeys._get_transcoded_request( http_options, request @@ -821,11 +818,10 @@ def __call__( resp = self._interceptor.post_batch_activate_custom_targeting_keys(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_activate_custom_targeting_keys_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_activate_custom_targeting_keys_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -914,15 +910,12 @@ def __call__( """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseBatchCreateCustomTargetingKeys._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchCreateCustomTargetingKeys._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_batch_create_custom_targeting_keys( - request, metadata + request, metadata = ( + self._interceptor.pre_batch_create_custom_targeting_keys( + request, metadata + ) ) transcoded_request = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchCreateCustomTargetingKeys._get_transcoded_request( http_options, request @@ -992,11 +985,10 @@ def __call__( resp = self._interceptor.post_batch_create_custom_targeting_keys(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_create_custom_targeting_keys_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_create_custom_targeting_keys_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1085,15 +1077,12 @@ def __call__( """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseBatchDeactivateCustomTargetingKeys._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchDeactivateCustomTargetingKeys._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_batch_deactivate_custom_targeting_keys( - request, metadata + request, metadata = ( + self._interceptor.pre_batch_deactivate_custom_targeting_keys( + request, metadata + ) ) transcoded_request = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchDeactivateCustomTargetingKeys._get_transcoded_request( http_options, request @@ -1152,9 +1141,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - custom_targeting_key_service.BatchDeactivateCustomTargetingKeysResponse() - ) + resp = custom_targeting_key_service.BatchDeactivateCustomTargetingKeysResponse() pb_resp = custom_targeting_key_service.BatchDeactivateCustomTargetingKeysResponse.pb( resp ) @@ -1163,11 +1150,10 @@ def __call__( resp = self._interceptor.post_batch_deactivate_custom_targeting_keys(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_deactivate_custom_targeting_keys_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_deactivate_custom_targeting_keys_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1256,15 +1242,12 @@ def __call__( """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseBatchUpdateCustomTargetingKeys._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchUpdateCustomTargetingKeys._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_batch_update_custom_targeting_keys( - request, metadata + request, metadata = ( + self._interceptor.pre_batch_update_custom_targeting_keys( + request, metadata + ) ) transcoded_request = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchUpdateCustomTargetingKeys._get_transcoded_request( http_options, request @@ -1334,11 +1317,10 @@ def __call__( resp = self._interceptor.post_batch_update_custom_targeting_keys(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_update_custom_targeting_keys_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_update_custom_targeting_keys_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1424,9 +1406,7 @@ def __call__( The ``CustomTargetingKey`` resource. """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseCreateCustomTargetingKey._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseCreateCustomTargetingKey._get_http_options() request, metadata = self._interceptor.pre_create_custom_targeting_key( request, metadata @@ -1580,9 +1560,7 @@ def __call__( The ``CustomTargetingKey`` resource. """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseGetCustomTargetingKey._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseGetCustomTargetingKey._get_http_options() request, metadata = self._interceptor.pre_get_custom_targeting_key( request, metadata @@ -1736,9 +1714,7 @@ def __call__( """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseListCustomTargetingKeys._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseListCustomTargetingKeys._get_http_options() request, metadata = self._interceptor.pre_list_custom_targeting_keys( request, metadata @@ -1891,9 +1867,7 @@ def __call__( The ``CustomTargetingKey`` resource. """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseUpdateCustomTargetingKey._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseUpdateCustomTargetingKey._get_http_options() request, metadata = self._interceptor.pre_update_custom_targeting_key( request, metadata @@ -2001,7 +1975,9 @@ def batch_activate_custom_targeting_keys( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchActivateCustomTargetingKeys(self._session, self._host, self._interceptor) # type: ignore + return self._BatchActivateCustomTargetingKeys( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_create_custom_targeting_keys( @@ -2012,7 +1988,9 @@ def batch_create_custom_targeting_keys( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchCreateCustomTargetingKeys(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateCustomTargetingKeys( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_deactivate_custom_targeting_keys( @@ -2023,7 +2001,9 @@ def batch_deactivate_custom_targeting_keys( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchDeactivateCustomTargetingKeys(self._session, self._host, self._interceptor) # type: ignore + return self._BatchDeactivateCustomTargetingKeys( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_custom_targeting_keys( @@ -2034,7 +2014,9 @@ def batch_update_custom_targeting_keys( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchUpdateCustomTargetingKeys(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateCustomTargetingKeys( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_custom_targeting_key( @@ -2045,7 +2027,9 @@ def create_custom_targeting_key( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateCustomTargetingKey(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCustomTargetingKey( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_custom_targeting_key( @@ -2067,7 +2051,9 @@ def list_custom_targeting_keys( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListCustomTargetingKeys(self._session, self._host, self._interceptor) # type: ignore + return self._ListCustomTargetingKeys( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_custom_targeting_key( @@ -2078,7 +2064,9 @@ def update_custom_targeting_key( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateCustomTargetingKey(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCustomTargetingKey( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -2138,9 +2126,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCustomTargetingKeyServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/client.py index 752e5311b0b7..eec17123836d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -82,9 +82,7 @@ class CustomTargetingValueServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CustomTargetingValueServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CustomTargetingValueServiceTransport]] _transport_registry["rest"] = CustomTargetingValueServiceRestTransport def get_transport_class( @@ -665,11 +663,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CustomTargetingValueServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CustomTargetingValueServiceClient._read_environment_variables() + ) self._client_cert_source = ( CustomTargetingValueServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -706,8 +702,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CustomTargetingValueServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/pagers.py index 3ccae9afc101..565eb2bee6fd 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/__init__.py index d329984aab4b..50d73c506308 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CustomTargetingValueServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CustomTargetingValueServiceTransport]] _transport_registry["rest"] = CustomTargetingValueServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/base.py index 0cce7512aeed..1171c65cb703 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/rest.py index 32b7a4256f2e..bf5cae07c938 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -375,9 +375,7 @@ def __call__( The ``CustomTargetingValue`` resource. """ - http_options = ( - _BaseCustomTargetingValueServiceRestTransport._BaseGetCustomTargetingValue._get_http_options() - ) + http_options = _BaseCustomTargetingValueServiceRestTransport._BaseGetCustomTargetingValue._get_http_options() request, metadata = self._interceptor.pre_get_custom_targeting_value( request, metadata @@ -531,9 +529,7 @@ def __call__( """ - http_options = ( - _BaseCustomTargetingValueServiceRestTransport._BaseListCustomTargetingValues._get_http_options() - ) + http_options = _BaseCustomTargetingValueServiceRestTransport._BaseListCustomTargetingValues._get_http_options() request, metadata = self._interceptor.pre_list_custom_targeting_values( request, metadata @@ -638,7 +634,9 @@ def get_custom_targeting_value( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetCustomTargetingValue(self._session, self._host, self._interceptor) # type: ignore + return self._GetCustomTargetingValue( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_custom_targeting_values( @@ -649,7 +647,9 @@ def list_custom_targeting_values( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListCustomTargetingValues(self._session, self._host, self._interceptor) # type: ignore + return self._ListCustomTargetingValues( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -709,9 +709,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCustomTargetingValueServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCustomTargetingValueServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCustomTargetingValueServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/client.py index 841dc47261dc..5dac58d5681f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class DeviceCapabilityServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DeviceCapabilityServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DeviceCapabilityServiceTransport]] _transport_registry["rest"] = DeviceCapabilityServiceRestTransport def get_transport_class( @@ -640,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DeviceCapabilityServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DeviceCapabilityServiceClient._read_environment_variables() + ) self._client_cert_source = ( DeviceCapabilityServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -681,8 +677,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DeviceCapabilityServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/pagers.py index a69e874671aa..3494841b25f6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/__init__.py index 96cc6d3d9875..02d105a5935c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DeviceCapabilityServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DeviceCapabilityServiceTransport]] _transport_registry["rest"] = DeviceCapabilityServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/base.py index e9cc18fb6b4d..6173a69e7ed6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/rest.py index f5cd40b6d5f2..88dd94e252b1 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -370,9 +370,7 @@ def __call__( Represents a device capability. """ - http_options = ( - _BaseDeviceCapabilityServiceRestTransport._BaseGetDeviceCapability._get_http_options() - ) + http_options = _BaseDeviceCapabilityServiceRestTransport._BaseGetDeviceCapability._get_http_options() request, metadata = self._interceptor.pre_get_device_capability( request, metadata @@ -523,9 +521,7 @@ def __call__( """ - http_options = ( - _BaseDeviceCapabilityServiceRestTransport._BaseListDeviceCapabilities._get_http_options() - ) + http_options = _BaseDeviceCapabilityServiceRestTransport._BaseListDeviceCapabilities._get_http_options() request, metadata = self._interceptor.pre_list_device_capabilities( request, metadata @@ -637,7 +633,9 @@ def list_device_capabilities( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListDeviceCapabilities(self._session, self._host, self._interceptor) # type: ignore + return self._ListDeviceCapabilities( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -697,9 +695,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDeviceCapabilityServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDeviceCapabilityServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDeviceCapabilityServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/client.py index bed4de1a390e..920de19ba80c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class DeviceCategoryServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DeviceCategoryServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DeviceCategoryServiceTransport]] _transport_registry["rest"] = DeviceCategoryServiceRestTransport def get_transport_class( @@ -640,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DeviceCategoryServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DeviceCategoryServiceClient._read_environment_variables() + ) self._client_cert_source = DeviceCategoryServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -679,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DeviceCategoryServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/pagers.py index 37c59e30b51c..04dc4c36b0a2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/__init__.py index d4566e32176f..d16dc5696da3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DeviceCategoryServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DeviceCategoryServiceTransport]] _transport_registry["rest"] = DeviceCategoryServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/base.py index e1325e0ca54b..7809286c3508 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/rest.py index 64d39fcc3fe7..a2e95d691c85 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -371,9 +371,7 @@ def __call__( """ - http_options = ( - _BaseDeviceCategoryServiceRestTransport._BaseGetDeviceCategory._get_http_options() - ) + http_options = _BaseDeviceCategoryServiceRestTransport._BaseGetDeviceCategory._get_http_options() request, metadata = self._interceptor.pre_get_device_category( request, metadata @@ -524,9 +522,7 @@ def __call__( """ - http_options = ( - _BaseDeviceCategoryServiceRestTransport._BaseListDeviceCategories._get_http_options() - ) + http_options = _BaseDeviceCategoryServiceRestTransport._BaseListDeviceCategories._get_http_options() request, metadata = self._interceptor.pre_list_device_categories( request, metadata @@ -702,9 +698,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDeviceCategoryServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDeviceCategoryServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDeviceCategoryServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/client.py index cdaa052132bf..be47ef9cb7f5 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class DeviceManufacturerServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DeviceManufacturerServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DeviceManufacturerServiceTransport]] _transport_registry["rest"] = DeviceManufacturerServiceRestTransport def get_transport_class( @@ -642,11 +640,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DeviceManufacturerServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DeviceManufacturerServiceClient._read_environment_variables() + ) self._client_cert_source = ( DeviceManufacturerServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -683,8 +679,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DeviceManufacturerServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/pagers.py index 8350962d8ec0..a9ff7cc7ee46 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/__init__.py index de35fae566fd..90b0f8bdf00f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DeviceManufacturerServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DeviceManufacturerServiceTransport]] _transport_registry["rest"] = DeviceManufacturerServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/base.py index a5c3f5eaf527..de6aa6c097ce 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/rest.py index 825c4cd4522d..0eeb3a5bd708 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -372,9 +372,7 @@ def __call__( Represents a device manufacturer. """ - http_options = ( - _BaseDeviceManufacturerServiceRestTransport._BaseGetDeviceManufacturer._get_http_options() - ) + http_options = _BaseDeviceManufacturerServiceRestTransport._BaseGetDeviceManufacturer._get_http_options() request, metadata = self._interceptor.pre_get_device_manufacturer( request, metadata @@ -527,9 +525,7 @@ def __call__( """ - http_options = ( - _BaseDeviceManufacturerServiceRestTransport._BaseListDeviceManufacturers._get_http_options() - ) + http_options = _BaseDeviceManufacturerServiceRestTransport._BaseListDeviceManufacturers._get_http_options() request, metadata = self._interceptor.pre_list_device_manufacturers( request, metadata @@ -643,7 +639,9 @@ def list_device_manufacturers( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListDeviceManufacturers(self._session, self._host, self._interceptor) # type: ignore + return self._ListDeviceManufacturers( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -703,9 +701,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDeviceManufacturerServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDeviceManufacturerServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDeviceManufacturerServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/client.py index 401f6450d157..dd8a92913398 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.entity_signals_mapping_service import pagers from google.ads.admanager_v1.types import ( @@ -82,9 +82,7 @@ class EntitySignalsMappingServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EntitySignalsMappingServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EntitySignalsMappingServiceTransport]] _transport_registry["rest"] = EntitySignalsMappingServiceRestTransport def get_transport_class( @@ -643,11 +641,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EntitySignalsMappingServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EntitySignalsMappingServiceClient._read_environment_variables() + ) self._client_cert_source = ( EntitySignalsMappingServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -684,8 +680,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EntitySignalsMappingServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/pagers.py index 171272468ad3..e6057e7b7b2a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/__init__.py index a2ce2dea2ae8..6505476453ec 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[EntitySignalsMappingServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[EntitySignalsMappingServiceTransport]] _transport_registry["rest"] = EntitySignalsMappingServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/base.py index 9a8e51b5096e..06581914586f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/rest.py index 42f16c63eb96..cdf41abad502 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -621,15 +621,12 @@ def __call__( """ - http_options = ( - _BaseEntitySignalsMappingServiceRestTransport._BaseBatchCreateEntitySignalsMappings._get_http_options() - ) + http_options = _BaseEntitySignalsMappingServiceRestTransport._BaseBatchCreateEntitySignalsMappings._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_batch_create_entity_signals_mappings( - request, metadata + request, metadata = ( + self._interceptor.pre_batch_create_entity_signals_mappings( + request, metadata + ) ) transcoded_request = _BaseEntitySignalsMappingServiceRestTransport._BaseBatchCreateEntitySignalsMappings._get_transcoded_request( http_options, request @@ -688,9 +685,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - entity_signals_mapping_service.BatchCreateEntitySignalsMappingsResponse() - ) + resp = entity_signals_mapping_service.BatchCreateEntitySignalsMappingsResponse() pb_resp = entity_signals_mapping_service.BatchCreateEntitySignalsMappingsResponse.pb( resp ) @@ -699,11 +694,10 @@ def __call__( resp = self._interceptor.post_batch_create_entity_signals_mappings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_create_entity_signals_mappings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_create_entity_signals_mappings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -792,15 +786,12 @@ def __call__( """ - http_options = ( - _BaseEntitySignalsMappingServiceRestTransport._BaseBatchUpdateEntitySignalsMappings._get_http_options() - ) + http_options = _BaseEntitySignalsMappingServiceRestTransport._BaseBatchUpdateEntitySignalsMappings._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_batch_update_entity_signals_mappings( - request, metadata + request, metadata = ( + self._interceptor.pre_batch_update_entity_signals_mappings( + request, metadata + ) ) transcoded_request = _BaseEntitySignalsMappingServiceRestTransport._BaseBatchUpdateEntitySignalsMappings._get_transcoded_request( http_options, request @@ -859,9 +850,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - entity_signals_mapping_service.BatchUpdateEntitySignalsMappingsResponse() - ) + resp = entity_signals_mapping_service.BatchUpdateEntitySignalsMappingsResponse() pb_resp = entity_signals_mapping_service.BatchUpdateEntitySignalsMappingsResponse.pb( resp ) @@ -870,11 +859,10 @@ def __call__( resp = self._interceptor.post_batch_update_entity_signals_mappings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_update_entity_signals_mappings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_update_entity_signals_mappings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -961,9 +949,7 @@ def __call__( The ``EntitySignalsMapping`` resource. """ - http_options = ( - _BaseEntitySignalsMappingServiceRestTransport._BaseCreateEntitySignalsMapping._get_http_options() - ) + http_options = _BaseEntitySignalsMappingServiceRestTransport._BaseCreateEntitySignalsMapping._get_http_options() request, metadata = self._interceptor.pre_create_entity_signals_mapping( request, metadata @@ -1032,11 +1018,10 @@ def __call__( resp = self._interceptor.post_create_entity_signals_mapping(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_entity_signals_mapping_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_entity_signals_mapping_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1123,9 +1108,7 @@ def __call__( The ``EntitySignalsMapping`` resource. """ - http_options = ( - _BaseEntitySignalsMappingServiceRestTransport._BaseGetEntitySignalsMapping._get_http_options() - ) + http_options = _BaseEntitySignalsMappingServiceRestTransport._BaseGetEntitySignalsMapping._get_http_options() request, metadata = self._interceptor.pre_get_entity_signals_mapping( request, metadata @@ -1279,9 +1262,7 @@ def __call__( """ - http_options = ( - _BaseEntitySignalsMappingServiceRestTransport._BaseListEntitySignalsMappings._get_http_options() - ) + http_options = _BaseEntitySignalsMappingServiceRestTransport._BaseListEntitySignalsMappings._get_http_options() request, metadata = self._interceptor.pre_list_entity_signals_mappings( request, metadata @@ -1437,9 +1418,7 @@ def __call__( The ``EntitySignalsMapping`` resource. """ - http_options = ( - _BaseEntitySignalsMappingServiceRestTransport._BaseUpdateEntitySignalsMapping._get_http_options() - ) + http_options = _BaseEntitySignalsMappingServiceRestTransport._BaseUpdateEntitySignalsMapping._get_http_options() request, metadata = self._interceptor.pre_update_entity_signals_mapping( request, metadata @@ -1508,11 +1487,10 @@ def __call__( resp = self._interceptor.post_update_entity_signals_mapping(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_entity_signals_mapping_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_entity_signals_mapping_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1550,7 +1528,9 @@ def batch_create_entity_signals_mappings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchCreateEntitySignalsMappings(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateEntitySignalsMappings( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_entity_signals_mappings( @@ -1561,7 +1541,9 @@ def batch_update_entity_signals_mappings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchUpdateEntitySignalsMappings(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateEntitySignalsMappings( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_entity_signals_mapping( @@ -1572,7 +1554,9 @@ def create_entity_signals_mapping( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateEntitySignalsMapping(self._session, self._host, self._interceptor) # type: ignore + return self._CreateEntitySignalsMapping( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_entity_signals_mapping( @@ -1583,7 +1567,9 @@ def get_entity_signals_mapping( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetEntitySignalsMapping(self._session, self._host, self._interceptor) # type: ignore + return self._GetEntitySignalsMapping( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_entity_signals_mappings( @@ -1594,7 +1580,9 @@ def list_entity_signals_mappings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListEntitySignalsMappings(self._session, self._host, self._interceptor) # type: ignore + return self._ListEntitySignalsMappings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_entity_signals_mapping( @@ -1605,7 +1593,9 @@ def update_entity_signals_mapping( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateEntitySignalsMapping(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateEntitySignalsMapping( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -1665,9 +1655,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseEntitySignalsMappingServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseEntitySignalsMappingServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseEntitySignalsMappingServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/client.py index 8b241c8f7dc8..0c1165777d5b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class GeoTargetServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GeoTargetServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GeoTargetServiceTransport]] _transport_registry["rest"] = GeoTargetServiceRestTransport def get_transport_class( @@ -632,11 +630,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GeoTargetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GeoTargetServiceClient._read_environment_variables() + ) self._client_cert_source = GeoTargetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -671,8 +667,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GeoTargetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/pagers.py index 5a337140ee62..250c1f7434e9 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/base.py index 3094a520dc48..9c97fefd085a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import geo_target_messages, geo_target_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/rest.py index defcd3fb3e92..9e05825b9f05 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -510,9 +510,7 @@ def __call__( """ - http_options = ( - _BaseGeoTargetServiceRestTransport._BaseListGeoTargets._get_http_options() - ) + http_options = _BaseGeoTargetServiceRestTransport._BaseListGeoTargets._get_http_options() request, metadata = self._interceptor.pre_list_geo_targets( request, metadata diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/client.py index ac78c5a9360d..bcc7a3bd7201 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.type.money_pb2 as money_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.line_item_service import pagers from google.ads.admanager_v1.types import ( @@ -86,9 +86,7 @@ class LineItemServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[LineItemServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[LineItemServiceTransport]] _transport_registry["rest"] = LineItemServiceRestTransport def get_transport_class( @@ -676,11 +674,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LineItemServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LineItemServiceClient._read_environment_variables() + ) self._client_cert_source = LineItemServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -715,8 +711,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LineItemServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/pagers.py index 2974bf2d4fab..09167d3cabc5 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/base.py index 2f7336f0d603..09418cbc310b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import line_item_messages, line_item_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/rest.py index 0418b69597d1..770d5a716b22 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/client.py index fead9735f6aa..8b531473dc60 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class MobileCarrierServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MobileCarrierServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MobileCarrierServiceTransport]] _transport_registry["rest"] = MobileCarrierServiceRestTransport def get_transport_class( @@ -638,11 +636,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MobileCarrierServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MobileCarrierServiceClient._read_environment_variables() + ) self._client_cert_source = MobileCarrierServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +673,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MobileCarrierServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/pagers.py index 1e2c65ccb757..93c62d9db96c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/__init__.py index 544e6e3e623d..d609344d00c7 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import MobileCarrierServiceRestInterceptor, MobileCarrierServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[MobileCarrierServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[MobileCarrierServiceTransport]] _transport_registry["rest"] = MobileCarrierServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/base.py index 916c3fcc14d4..64593884db9f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/rest.py index 47e7bd49560f..0d2f8727ea5a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -369,9 +369,7 @@ def __call__( Represents a mobile carrier. """ - http_options = ( - _BaseMobileCarrierServiceRestTransport._BaseGetMobileCarrier._get_http_options() - ) + http_options = _BaseMobileCarrierServiceRestTransport._BaseGetMobileCarrier._get_http_options() request, metadata = self._interceptor.pre_get_mobile_carrier( request, metadata @@ -522,9 +520,7 @@ def __call__( """ - http_options = ( - _BaseMobileCarrierServiceRestTransport._BaseListMobileCarriers._get_http_options() - ) + http_options = _BaseMobileCarrierServiceRestTransport._BaseListMobileCarriers._get_http_options() request, metadata = self._interceptor.pre_list_mobile_carriers( request, metadata @@ -700,9 +696,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseMobileCarrierServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseMobileCarrierServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseMobileCarrierServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/client.py index e9326937dd41..a15f15a6bf30 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class MobileDeviceServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MobileDeviceServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MobileDeviceServiceTransport]] _transport_registry["rest"] = MobileDeviceServiceRestTransport def get_transport_class( @@ -657,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MobileDeviceServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MobileDeviceServiceClient._read_environment_variables() + ) self._client_cert_source = MobileDeviceServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -696,8 +692,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MobileDeviceServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/pagers.py index ab6a4cfa93ab..50278d57efd0 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/__init__.py index b01a56ca24a4..823a5bb989cc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import MobileDeviceServiceRestInterceptor, MobileDeviceServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[MobileDeviceServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[MobileDeviceServiceTransport]] _transport_registry["rest"] = MobileDeviceServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/base.py index a2f2316aa1bd..05d7769190cc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import mobile_device_messages, mobile_device_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/rest.py index 04da8951ea26..64d13eefecf1 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -366,9 +366,7 @@ def __call__( Represents a mobile device. """ - http_options = ( - _BaseMobileDeviceServiceRestTransport._BaseGetMobileDevice._get_http_options() - ) + http_options = _BaseMobileDeviceServiceRestTransport._BaseGetMobileDevice._get_http_options() request, metadata = self._interceptor.pre_get_mobile_device( request, metadata @@ -517,9 +515,7 @@ def __call__( """ - http_options = ( - _BaseMobileDeviceServiceRestTransport._BaseListMobileDevices._get_http_options() - ) + http_options = _BaseMobileDeviceServiceRestTransport._BaseListMobileDevices._get_http_options() request, metadata = self._interceptor.pre_list_mobile_devices( request, metadata @@ -695,9 +691,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseMobileDeviceServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseMobileDeviceServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseMobileDeviceServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/client.py index 508646652609..7bba8bf9620e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class MobileDeviceSubmodelServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MobileDeviceSubmodelServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MobileDeviceSubmodelServiceTransport]] _transport_registry["rest"] = MobileDeviceSubmodelServiceRestTransport def get_transport_class( @@ -662,11 +660,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MobileDeviceSubmodelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MobileDeviceSubmodelServiceClient._read_environment_variables() + ) self._client_cert_source = ( MobileDeviceSubmodelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -703,8 +699,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MobileDeviceSubmodelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/pagers.py index 5f3b655437c1..66b2635e32aa 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/__init__.py index 14eed448f6dd..d7d2b93cff5d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[MobileDeviceSubmodelServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[MobileDeviceSubmodelServiceTransport]] _transport_registry["rest"] = MobileDeviceSubmodelServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/base.py index eb74a85fe720..127b7ed67ab7 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/rest.py index a5e16dbe9bce..309d2b5038c2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -375,9 +375,7 @@ def __call__( Represents a mobile device submodel. """ - http_options = ( - _BaseMobileDeviceSubmodelServiceRestTransport._BaseGetMobileDeviceSubmodel._get_http_options() - ) + http_options = _BaseMobileDeviceSubmodelServiceRestTransport._BaseGetMobileDeviceSubmodel._get_http_options() request, metadata = self._interceptor.pre_get_mobile_device_submodel( request, metadata @@ -531,9 +529,7 @@ def __call__( """ - http_options = ( - _BaseMobileDeviceSubmodelServiceRestTransport._BaseListMobileDeviceSubmodels._get_http_options() - ) + http_options = _BaseMobileDeviceSubmodelServiceRestTransport._BaseListMobileDeviceSubmodels._get_http_options() request, metadata = self._interceptor.pre_list_mobile_device_submodels( request, metadata @@ -638,7 +634,9 @@ def get_mobile_device_submodel( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetMobileDeviceSubmodel(self._session, self._host, self._interceptor) # type: ignore + return self._GetMobileDeviceSubmodel( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_mobile_device_submodels( @@ -649,7 +647,9 @@ def list_mobile_device_submodels( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListMobileDeviceSubmodels(self._session, self._host, self._interceptor) # type: ignore + return self._ListMobileDeviceSubmodels( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -709,9 +709,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseMobileDeviceSubmodelServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseMobileDeviceSubmodelServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseMobileDeviceSubmodelServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/client.py index 5a202e187fe6..f9cfc6a97834 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class NetworkServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkServiceTransport]] _transport_registry["rest"] = NetworkServiceRestTransport def get_transport_class( @@ -628,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkServiceClient._read_environment_variables() + ) self._client_cert_source = NetworkServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/pagers.py index d2f6f9ac2c81..bfc626b6837d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/base.py index 37a533bcb399..769ddd77fb18 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import network_messages, network_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/rest.py index 738cf7c4cf2c..2e3fe5b080e5 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/client.py index ff5a417ed399..e4d4d148520e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class OperatingSystemServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OperatingSystemServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OperatingSystemServiceTransport]] _transport_registry["rest"] = OperatingSystemServiceRestTransport def get_transport_class( @@ -640,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OperatingSystemServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OperatingSystemServiceClient._read_environment_variables() + ) self._client_cert_source = OperatingSystemServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -679,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OperatingSystemServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/pagers.py index 952dbf48f68c..dc27f6d1f1de 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/__init__.py index 320902eb5eaa..761697f492ec 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[OperatingSystemServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[OperatingSystemServiceTransport]] _transport_registry["rest"] = OperatingSystemServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/base.py index 540beae9d436..85b2c3deaa50 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/rest.py index c06b27340a3b..486ec21b3272 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -372,9 +372,7 @@ def __call__( """ - http_options = ( - _BaseOperatingSystemServiceRestTransport._BaseGetOperatingSystem._get_http_options() - ) + http_options = _BaseOperatingSystemServiceRestTransport._BaseGetOperatingSystem._get_http_options() request, metadata = self._interceptor.pre_get_operating_system( request, metadata @@ -525,9 +523,7 @@ def __call__( """ - http_options = ( - _BaseOperatingSystemServiceRestTransport._BaseListOperatingSystems._get_http_options() - ) + http_options = _BaseOperatingSystemServiceRestTransport._BaseListOperatingSystems._get_http_options() request, metadata = self._interceptor.pre_list_operating_systems( request, metadata @@ -703,9 +699,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseOperatingSystemServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseOperatingSystemServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseOperatingSystemServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/client.py index f7e8cc6beb56..68e5626177c6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class OperatingSystemVersionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OperatingSystemVersionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OperatingSystemVersionServiceTransport]] _transport_registry["rest"] = OperatingSystemVersionServiceRestTransport def get_transport_class( @@ -646,11 +644,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OperatingSystemVersionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OperatingSystemVersionServiceClient._read_environment_variables() + ) self._client_cert_source = ( OperatingSystemVersionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -691,8 +687,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OperatingSystemVersionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/pagers.py index 88e371f5d87f..e283158de02c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/__init__.py index e86e270fa10d..ab371b34e078 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[OperatingSystemVersionServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[OperatingSystemVersionServiceTransport]] _transport_registry["rest"] = OperatingSystemVersionServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/base.py index 418158eb9b8c..1692e88fbf9f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/rest.py index 23edfc6975ed..c7dbd5f9c529 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -380,9 +380,7 @@ def __call__( """ - http_options = ( - _BaseOperatingSystemVersionServiceRestTransport._BaseGetOperatingSystemVersion._get_http_options() - ) + http_options = _BaseOperatingSystemVersionServiceRestTransport._BaseGetOperatingSystemVersion._get_http_options() request, metadata = self._interceptor.pre_get_operating_system_version( request, metadata @@ -536,9 +534,7 @@ def __call__( """ - http_options = ( - _BaseOperatingSystemVersionServiceRestTransport._BaseListOperatingSystemVersions._get_http_options() - ) + http_options = _BaseOperatingSystemVersionServiceRestTransport._BaseListOperatingSystemVersions._get_http_options() request, metadata = self._interceptor.pre_list_operating_system_versions( request, metadata @@ -608,11 +604,10 @@ def __call__( resp = self._interceptor.post_list_operating_system_versions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_operating_system_versions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_operating_system_versions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -648,7 +643,9 @@ def get_operating_system_version( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetOperatingSystemVersion(self._session, self._host, self._interceptor) # type: ignore + return self._GetOperatingSystemVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_operating_system_versions( @@ -659,7 +656,9 @@ def list_operating_system_versions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListOperatingSystemVersions(self._session, self._host, self._interceptor) # type: ignore + return self._ListOperatingSystemVersions( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -719,9 +718,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseOperatingSystemVersionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseOperatingSystemVersionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseOperatingSystemVersionServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/client.py index 4cdd39528be5..62a0142aab7c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.order_service import pagers from google.ads.admanager_v1.types import ( @@ -741,11 +741,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OrderServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OrderServiceClient._read_environment_variables() + ) self._client_cert_source = OrderServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -780,8 +778,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OrderServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/pagers.py index 60a8d182a397..e39347ca767a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/base.py index d860c4065617..8fe8014579d2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import order_messages, order_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/rest.py index 5e735d8d71f8..db92845e7713 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/client.py index 85e6cbe4d4bf..94720a2e9545 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.placement_service import pagers from google.ads.admanager_v1.types import ( @@ -84,9 +84,7 @@ class PlacementServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PlacementServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PlacementServiceTransport]] _transport_registry["rest"] = PlacementServiceRestTransport def get_transport_class( @@ -655,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PlacementServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PlacementServiceClient._read_environment_variables() + ) self._client_cert_source = PlacementServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PlacementServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/pagers.py index 1a62376a2c77..00b15804855f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/base.py index bc8be2e7b0fd..7b43eb46372c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import placement_messages, placement_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/rest.py index 66f812e66d80..117a885ccc99 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -777,9 +777,7 @@ def __call__( Response object for ``BatchActivatePlacements`` method. """ - http_options = ( - _BasePlacementServiceRestTransport._BaseBatchActivatePlacements._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseBatchActivatePlacements._get_http_options() request, metadata = self._interceptor.pre_batch_activate_placements( request, metadata @@ -936,9 +934,7 @@ def __call__( Response object for ``BatchArchivePlacements`` method. """ - http_options = ( - _BasePlacementServiceRestTransport._BaseBatchArchivePlacements._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseBatchArchivePlacements._get_http_options() request, metadata = self._interceptor.pre_batch_archive_placements( request, metadata @@ -1095,9 +1091,7 @@ def __call__( Response object for ``BatchCreatePlacements`` method. """ - http_options = ( - _BasePlacementServiceRestTransport._BaseBatchCreatePlacements._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseBatchCreatePlacements._get_http_options() request, metadata = self._interceptor.pre_batch_create_placements( request, metadata @@ -1258,9 +1252,7 @@ def __call__( """ - http_options = ( - _BasePlacementServiceRestTransport._BaseBatchDeactivatePlacements._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseBatchDeactivatePlacements._get_http_options() request, metadata = self._interceptor.pre_batch_deactivate_placements( request, metadata @@ -1417,9 +1409,7 @@ def __call__( Response object for ``BatchUpdatePlacements`` method. """ - http_options = ( - _BasePlacementServiceRestTransport._BaseBatchUpdatePlacements._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseBatchUpdatePlacements._get_http_options() request, metadata = self._interceptor.pre_batch_update_placements( request, metadata @@ -1576,9 +1566,7 @@ def __call__( The ``Placement`` resource. """ - http_options = ( - _BasePlacementServiceRestTransport._BaseCreatePlacement._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseCreatePlacement._get_http_options() request, metadata = self._interceptor.pre_create_placement( request, metadata @@ -1873,9 +1861,7 @@ def __call__( """ - http_options = ( - _BasePlacementServiceRestTransport._BaseListPlacements._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseListPlacements._get_http_options() request, metadata = self._interceptor.pre_list_placements(request, metadata) transcoded_request = _BasePlacementServiceRestTransport._BaseListPlacements._get_transcoded_request( @@ -2021,9 +2007,7 @@ def __call__( The ``Placement`` resource. """ - http_options = ( - _BasePlacementServiceRestTransport._BaseUpdatePlacement._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseUpdatePlacement._get_http_options() request, metadata = self._interceptor.pre_update_placement( request, metadata @@ -2127,7 +2111,9 @@ def batch_activate_placements( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchActivatePlacements(self._session, self._host, self._interceptor) # type: ignore + return self._BatchActivatePlacements( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_archive_placements( @@ -2138,7 +2124,9 @@ def batch_archive_placements( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchArchivePlacements(self._session, self._host, self._interceptor) # type: ignore + return self._BatchArchivePlacements( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_create_placements( @@ -2160,7 +2148,9 @@ def batch_deactivate_placements( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchDeactivatePlacements(self._session, self._host, self._interceptor) # type: ignore + return self._BatchDeactivatePlacements( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_placements( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/client.py index 265ad8180294..9e117fd86d2b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_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 google.type.money_pb2 as money_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.private_auction_deal_service import pagers from google.ads.admanager_v1.types import ( @@ -88,9 +88,7 @@ class PrivateAuctionDealServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PrivateAuctionDealServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PrivateAuctionDealServiceTransport]] _transport_registry["rest"] = PrivateAuctionDealServiceRestTransport def get_transport_class( @@ -1063,11 +1061,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PrivateAuctionDealServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PrivateAuctionDealServiceClient._read_environment_variables() + ) self._client_cert_source = ( PrivateAuctionDealServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -1104,8 +1100,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PrivateAuctionDealServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/pagers.py index 542239dc9eae..d27ac1773697 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/__init__.py index c02ba6caa52d..2d6c70d00393 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PrivateAuctionDealServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PrivateAuctionDealServiceTransport]] _transport_registry["rest"] = PrivateAuctionDealServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/base.py index ba6d70aee264..03e871c09c3d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/rest.py index 3f855c0dae98..64c41a68cb79 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -496,9 +496,7 @@ def __call__( The ``PrivateAuctionDeal`` resource. """ - http_options = ( - _BasePrivateAuctionDealServiceRestTransport._BaseCreatePrivateAuctionDeal._get_http_options() - ) + http_options = _BasePrivateAuctionDealServiceRestTransport._BaseCreatePrivateAuctionDeal._get_http_options() request, metadata = self._interceptor.pre_create_private_auction_deal( request, metadata @@ -652,9 +650,7 @@ def __call__( The ``PrivateAuctionDeal`` resource. """ - http_options = ( - _BasePrivateAuctionDealServiceRestTransport._BaseGetPrivateAuctionDeal._get_http_options() - ) + http_options = _BasePrivateAuctionDealServiceRestTransport._BaseGetPrivateAuctionDeal._get_http_options() request, metadata = self._interceptor.pre_get_private_auction_deal( request, metadata @@ -808,9 +804,7 @@ def __call__( """ - http_options = ( - _BasePrivateAuctionDealServiceRestTransport._BaseListPrivateAuctionDeals._get_http_options() - ) + http_options = _BasePrivateAuctionDealServiceRestTransport._BaseListPrivateAuctionDeals._get_http_options() request, metadata = self._interceptor.pre_list_private_auction_deals( request, metadata @@ -963,9 +957,7 @@ def __call__( The ``PrivateAuctionDeal`` resource. """ - http_options = ( - _BasePrivateAuctionDealServiceRestTransport._BaseUpdatePrivateAuctionDeal._get_http_options() - ) + http_options = _BasePrivateAuctionDealServiceRestTransport._BaseUpdatePrivateAuctionDeal._get_http_options() request, metadata = self._interceptor.pre_update_private_auction_deal( request, metadata @@ -1073,7 +1065,9 @@ def create_private_auction_deal( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreatePrivateAuctionDeal(self._session, self._host, self._interceptor) # type: ignore + return self._CreatePrivateAuctionDeal( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_private_auction_deal( @@ -1095,7 +1089,9 @@ def list_private_auction_deals( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListPrivateAuctionDeals(self._session, self._host, self._interceptor) # type: ignore + return self._ListPrivateAuctionDeals( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_private_auction_deal( @@ -1106,7 +1102,9 @@ def update_private_auction_deal( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdatePrivateAuctionDeal(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePrivateAuctionDeal( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -1166,9 +1164,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePrivateAuctionDealServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePrivateAuctionDealServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePrivateAuctionDealServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/client.py index ca32def4243e..89216c65ae55 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.private_auction_service import pagers from google.ads.admanager_v1.types import ( @@ -83,9 +83,7 @@ class PrivateAuctionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PrivateAuctionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PrivateAuctionServiceTransport]] _transport_registry["rest"] = PrivateAuctionServiceRestTransport def get_transport_class( @@ -659,11 +657,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PrivateAuctionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PrivateAuctionServiceClient._read_environment_variables() + ) self._client_cert_source = PrivateAuctionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -698,8 +694,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PrivateAuctionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/pagers.py index f363c3017f6b..0e91098181ee 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/__init__.py index 84f5afae6bbc..9ea1bd1380a2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PrivateAuctionServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PrivateAuctionServiceTransport]] _transport_registry["rest"] = PrivateAuctionServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/base.py index f20c4f75c638..e90d84efa450 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/rest.py index 03d1be5b00cc..9db728615a4c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -488,9 +488,7 @@ def __call__( The ``PrivateAuction`` resource. """ - http_options = ( - _BasePrivateAuctionServiceRestTransport._BaseCreatePrivateAuction._get_http_options() - ) + http_options = _BasePrivateAuctionServiceRestTransport._BaseCreatePrivateAuction._get_http_options() request, metadata = self._interceptor.pre_create_private_auction( request, metadata @@ -644,9 +642,7 @@ def __call__( The ``PrivateAuction`` resource. """ - http_options = ( - _BasePrivateAuctionServiceRestTransport._BaseGetPrivateAuction._get_http_options() - ) + http_options = _BasePrivateAuctionServiceRestTransport._BaseGetPrivateAuction._get_http_options() request, metadata = self._interceptor.pre_get_private_auction( request, metadata @@ -797,9 +793,7 @@ def __call__( """ - http_options = ( - _BasePrivateAuctionServiceRestTransport._BaseListPrivateAuctions._get_http_options() - ) + http_options = _BasePrivateAuctionServiceRestTransport._BaseListPrivateAuctions._get_http_options() request, metadata = self._interceptor.pre_list_private_auctions( request, metadata @@ -951,9 +945,7 @@ def __call__( The ``PrivateAuction`` resource. """ - http_options = ( - _BasePrivateAuctionServiceRestTransport._BaseUpdatePrivateAuction._get_http_options() - ) + http_options = _BasePrivateAuctionServiceRestTransport._BaseUpdatePrivateAuction._get_http_options() request, metadata = self._interceptor.pre_update_private_auction( request, metadata @@ -1154,9 +1146,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePrivateAuctionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePrivateAuctionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePrivateAuctionServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/client.py index 153f15d1cc82..b8012b83bcff 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class ProgrammaticBuyerServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ProgrammaticBuyerServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ProgrammaticBuyerServiceTransport]] _transport_registry["rest"] = ProgrammaticBuyerServiceRestTransport def get_transport_class( @@ -640,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProgrammaticBuyerServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProgrammaticBuyerServiceClient._read_environment_variables() + ) self._client_cert_source = ( ProgrammaticBuyerServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -681,8 +677,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProgrammaticBuyerServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/pagers.py index 40844d5ebe50..c33e9e83f4bc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/__init__.py index c21930623d4e..d091304cbac5 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ProgrammaticBuyerServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ProgrammaticBuyerServiceTransport]] _transport_registry["rest"] = ProgrammaticBuyerServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/base.py index 0a997490eb0f..7a741064fec7 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/rest.py index 76055ab6e4ae..a1fdd5bf449a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -370,9 +370,7 @@ def __call__( Represents a programmatic buyer. """ - http_options = ( - _BaseProgrammaticBuyerServiceRestTransport._BaseGetProgrammaticBuyer._get_http_options() - ) + http_options = _BaseProgrammaticBuyerServiceRestTransport._BaseGetProgrammaticBuyer._get_http_options() request, metadata = self._interceptor.pre_get_programmatic_buyer( request, metadata @@ -521,9 +519,7 @@ def __call__( """ - http_options = ( - _BaseProgrammaticBuyerServiceRestTransport._BaseListProgrammaticBuyers._get_http_options() - ) + http_options = _BaseProgrammaticBuyerServiceRestTransport._BaseListProgrammaticBuyers._get_http_options() request, metadata = self._interceptor.pre_list_programmatic_buyers( request, metadata @@ -635,7 +631,9 @@ def list_programmatic_buyers( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListProgrammaticBuyers(self._session, self._host, self._interceptor) # type: ignore + return self._ListProgrammaticBuyers( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -695,9 +693,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseProgrammaticBuyerServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseProgrammaticBuyerServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseProgrammaticBuyerServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/client.py index e81a609a6eee..6751cfb4f4ba 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -63,9 +63,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.report_service import pagers from google.ads.admanager_v1.types import ( @@ -634,11 +634,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReportServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReportServiceClient._read_environment_variables() + ) self._client_cert_source = ReportServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -673,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReportServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/pagers.py index b37c4e04b280..d61a5cef9232 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/base.py index 1ea30ce61825..a3329f3ba979 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import report_messages, report_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/rest.py index cf97bcdb51d5..8ece1ffd362a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -777,9 +777,7 @@ def __call__( """ - http_options = ( - _BaseReportServiceRestTransport._BaseFetchReportResultRows._get_http_options() - ) + http_options = _BaseReportServiceRestTransport._BaseFetchReportResultRows._get_http_options() request, metadata = self._interceptor.pre_fetch_report_result_rows( request, metadata diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/client.py index 8bd563ac2103..dadab8476135 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -626,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RoleServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RoleServiceClient._read_environment_variables() + ) self._client_cert_source = RoleServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RoleServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/pagers.py index 1c15b06368ee..9c87a549f2d3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/base.py index 0777067a15b6..9e51d0906149 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import role_messages, role_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/rest.py index 652d35156dd1..bc5782b31c95 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/client.py index afaf798e6ec8..8ae27a598bcf 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.site_service import pagers from google.ads.admanager_v1.types import site_enums, site_messages, site_service @@ -628,11 +628,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SiteServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SiteServiceClient._read_environment_variables() + ) self._client_cert_source = SiteServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +665,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SiteServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/pagers.py index dea236c7bd2d..9bd8759e7dd4 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/base.py index 2aaf6a93f0a6..7689fb1da24f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import site_messages, site_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/rest.py index 845aa0aae342..84af71b87da6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -847,9 +847,7 @@ def __call__( Response object for ``BatchDeactivateSites`` method. """ - http_options = ( - _BaseSiteServiceRestTransport._BaseBatchDeactivateSites._get_http_options() - ) + http_options = _BaseSiteServiceRestTransport._BaseBatchDeactivateSites._get_http_options() request, metadata = self._interceptor.pre_batch_deactivate_sites( request, metadata @@ -1006,9 +1004,7 @@ def __call__( """ - http_options = ( - _BaseSiteServiceRestTransport._BaseBatchSubmitSitesForApproval._get_http_options() - ) + http_options = _BaseSiteServiceRestTransport._BaseBatchSubmitSitesForApproval._get_http_options() request, metadata = self._interceptor.pre_batch_submit_sites_for_approval( request, metadata @@ -1079,11 +1075,10 @@ def __call__( resp = self._interceptor.post_batch_submit_sites_for_approval(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_submit_sites_for_approval_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_submit_sites_for_approval_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1916,7 +1911,9 @@ def batch_submit_sites_for_approval( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchSubmitSitesForApproval(self._session, self._host, self._interceptor) # type: ignore + return self._BatchSubmitSitesForApproval( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_sites( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/client.py index 54b1ee4d8c43..865a53b31575 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -82,9 +82,7 @@ class TaxonomyCategoryServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TaxonomyCategoryServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TaxonomyCategoryServiceTransport]] _transport_registry["rest"] = TaxonomyCategoryServiceRestTransport def get_transport_class( @@ -641,11 +639,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TaxonomyCategoryServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TaxonomyCategoryServiceClient._read_environment_variables() + ) self._client_cert_source = ( TaxonomyCategoryServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -682,8 +678,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TaxonomyCategoryServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/pagers.py index d8926e0ccd58..5eab44a3eb2a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/__init__.py index ffbde4bb2418..b98cebe59c73 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[TaxonomyCategoryServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[TaxonomyCategoryServiceTransport]] _transport_registry["rest"] = TaxonomyCategoryServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/base.py index b019dcdeb321..39b6e8284770 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/rest.py index fa45cce7a9b9..87bd41299405 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -370,9 +370,7 @@ def __call__( The ``TaxonomyCategory`` resource. """ - http_options = ( - _BaseTaxonomyCategoryServiceRestTransport._BaseGetTaxonomyCategory._get_http_options() - ) + http_options = _BaseTaxonomyCategoryServiceRestTransport._BaseGetTaxonomyCategory._get_http_options() request, metadata = self._interceptor.pre_get_taxonomy_category( request, metadata @@ -523,9 +521,7 @@ def __call__( """ - http_options = ( - _BaseTaxonomyCategoryServiceRestTransport._BaseListTaxonomyCategories._get_http_options() - ) + http_options = _BaseTaxonomyCategoryServiceRestTransport._BaseListTaxonomyCategories._get_http_options() request, metadata = self._interceptor.pre_list_taxonomy_categories( request, metadata @@ -637,7 +633,9 @@ def list_taxonomy_categories( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListTaxonomyCategories(self._session, self._host, self._interceptor) # type: ignore + return self._ListTaxonomyCategories( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -697,9 +695,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseTaxonomyCategoryServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseTaxonomyCategoryServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseTaxonomyCategoryServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/client.py index 282dc452afdc..f779f2f11ddd 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.team_service import pagers from google.ads.admanager_v1.types import team_enums, team_messages, team_service @@ -627,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TeamServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TeamServiceClient._read_environment_variables() + ) self._client_cert_source = TeamServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -666,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TeamServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/pagers.py index 406ed033d41e..e0a352c06757 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/base.py index 606d50c61ab1..951f10b63ec8 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import team_messages, team_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/rest.py index 8b23bd9d774c..26bfc31fd33f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -691,9 +691,7 @@ def __call__( Response object for ``BatchActivateTeams`` method. """ - http_options = ( - _BaseTeamServiceRestTransport._BaseBatchActivateTeams._get_http_options() - ) + http_options = _BaseTeamServiceRestTransport._BaseBatchActivateTeams._get_http_options() request, metadata = self._interceptor.pre_batch_activate_teams( request, metadata @@ -999,9 +997,7 @@ def __call__( Response object for ``BatchDeactivateTeams`` method. """ - http_options = ( - _BaseTeamServiceRestTransport._BaseBatchDeactivateTeams._get_http_options() - ) + http_options = _BaseTeamServiceRestTransport._BaseBatchDeactivateTeams._get_http_options() request, metadata = self._interceptor.pre_batch_deactivate_teams( request, metadata diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/client.py index d0609b04fbbc..7876307940bb 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -627,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UserServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UserServiceClient._read_environment_variables() + ) self._client_cert_source = UserServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -666,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UserServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/base.py index 68c14f256d50..09a4cfde8dfc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import user_messages, user_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/rest.py index c08c08c38d9a..1da40b44dcb6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/__init__.py index 3946c32d71d0..9d23e8c82bc3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .ad_break_messages import AdBreak +from .ad_break_messages import ( + AdBreak, +) from .ad_break_service import ( CreateAdBreakRequest, DeleteAdBreakRequest, @@ -22,8 +24,12 @@ ListAdBreaksResponse, UpdateAdBreakRequest, ) -from .ad_review_center_ad_enums import AdReviewCenterAdStatusEnum -from .ad_review_center_ad_messages import AdReviewCenterAd +from .ad_review_center_ad_enums import ( + AdReviewCenterAdStatusEnum, +) +from .ad_review_center_ad_messages import ( + AdReviewCenterAd, +) from .ad_review_center_ad_service import ( BatchAdReviewCenterAdsOperationMetadata, BatchAllowAdReviewCenterAdsRequest, @@ -33,8 +39,17 @@ SearchAdReviewCenterAdsRequest, SearchAdReviewCenterAdsResponse, ) -from .ad_unit_enums import AdUnitStatusEnum, SmartSizeModeEnum, TargetWindowEnum -from .ad_unit_messages import AdUnit, AdUnitParent, AdUnitSize, LabelFrequencyCap +from .ad_unit_enums import ( + AdUnitStatusEnum, + SmartSizeModeEnum, + TargetWindowEnum, +) +from .ad_unit_messages import ( + AdUnit, + AdUnitParent, + AdUnitSize, + LabelFrequencyCap, +) from .ad_unit_service import ( BatchActivateAdUnitsRequest, BatchActivateAdUnitsResponse, @@ -54,61 +69,92 @@ ListAdUnitsResponse, UpdateAdUnitRequest, ) -from .admanager_error import AdManagerError -from .application_messages import Application +from .admanager_error import ( + AdManagerError, +) +from .application_messages import ( + Application, +) from .application_service import ( GetApplicationRequest, ListApplicationsRequest, ListApplicationsResponse, ) -from .applied_label import AppliedLabel -from .audience_segment_messages import AudienceSegment +from .applied_label import ( + AppliedLabel, +) +from .audience_segment_messages import ( + AudienceSegment, +) from .audience_segment_service import ( GetAudienceSegmentRequest, ListAudienceSegmentsRequest, ListAudienceSegmentsResponse, ) -from .bandwidth_group_messages import BandwidthGroup +from .bandwidth_group_messages import ( + BandwidthGroup, +) from .bandwidth_group_service import ( GetBandwidthGroupRequest, ListBandwidthGroupsRequest, ListBandwidthGroupsResponse, ) -from .browser_language_messages import BrowserLanguage +from .browser_language_messages import ( + BrowserLanguage, +) from .browser_language_service import ( GetBrowserLanguageRequest, ListBrowserLanguagesRequest, ListBrowserLanguagesResponse, ) -from .browser_messages import Browser +from .browser_messages import ( + Browser, +) from .browser_service import ( GetBrowserRequest, ListBrowsersRequest, ListBrowsersResponse, ) -from .cms_metadata_key_enums import CmsMetadataKeyStatusEnum -from .cms_metadata_key_messages import CmsMetadataKey +from .cms_metadata_key_enums import ( + CmsMetadataKeyStatusEnum, +) +from .cms_metadata_key_messages import ( + CmsMetadataKey, +) from .cms_metadata_key_service import ( GetCmsMetadataKeyRequest, ListCmsMetadataKeysRequest, ListCmsMetadataKeysResponse, ) -from .cms_metadata_value_enums import CmsMetadataValueStatusEnum -from .cms_metadata_value_messages import CmsMetadataValue +from .cms_metadata_value_enums import ( + CmsMetadataValueStatusEnum, +) +from .cms_metadata_value_messages import ( + CmsMetadataValue, +) from .cms_metadata_value_service import ( GetCmsMetadataValueRequest, ListCmsMetadataValuesRequest, ListCmsMetadataValuesResponse, ) -from .company_enums import CompanyCreditStatusEnum, CompanyTypeEnum -from .company_messages import Company +from .company_enums import ( + CompanyCreditStatusEnum, + CompanyTypeEnum, +) +from .company_messages import ( + Company, +) from .company_service import ( GetCompanyRequest, ListCompaniesRequest, ListCompaniesResponse, ) -from .contact_enums import ContactStatusEnum -from .contact_messages import Contact +from .contact_enums import ( + ContactStatusEnum, +) +from .contact_messages import ( + Contact, +) from .contact_service import ( BatchCreateContactsRequest, BatchCreateContactsResponse, @@ -120,25 +166,38 @@ ListContactsResponse, UpdateContactRequest, ) -from .content_bundle_messages import ContentBundle +from .content_bundle_messages import ( + ContentBundle, +) from .content_bundle_service import ( GetContentBundleRequest, ListContentBundlesRequest, ListContentBundlesResponse, ) -from .content_label_messages import ContentLabel +from .content_label_messages import ( + ContentLabel, +) from .content_label_service import ( GetContentLabelRequest, ListContentLabelsRequest, ListContentLabelsResponse, ) -from .content_messages import Content -from .content_service import GetContentRequest, ListContentRequest, ListContentResponse +from .content_messages import ( + Content, +) +from .content_service import ( + GetContentRequest, + ListContentRequest, + ListContentResponse, +) from .creative_template_enums import ( CreativeTemplateStatusEnum, CreativeTemplateTypeEnum, ) -from .creative_template_messages import CreativeTemplate, CreativeTemplateVariable +from .creative_template_messages import ( + CreativeTemplate, + CreativeTemplateVariable, +) from .creative_template_service import ( GetCreativeTemplateRequest, ListCreativeTemplatesRequest, @@ -153,7 +212,10 @@ CustomFieldStatusEnum, CustomFieldVisibilityEnum, ) -from .custom_field_messages import CustomField, CustomFieldOption +from .custom_field_messages import ( + CustomField, + CustomFieldOption, +) from .custom_field_service import ( BatchActivateCustomFieldsRequest, BatchActivateCustomFieldsResponse, @@ -169,13 +231,17 @@ ListCustomFieldsResponse, UpdateCustomFieldRequest, ) -from .custom_field_value import CustomFieldValue +from .custom_field_value import ( + CustomFieldValue, +) from .custom_targeting_key_enums import ( CustomTargetingKeyReportableTypeEnum, CustomTargetingKeyStatusEnum, CustomTargetingKeyTypeEnum, ) -from .custom_targeting_key_messages import CustomTargetingKey +from .custom_targeting_key_messages import ( + CustomTargetingKey, +) from .custom_targeting_key_service import ( BatchActivateCustomTargetingKeysRequest, BatchActivateCustomTargetingKeysResponse, @@ -195,33 +261,47 @@ CustomTargetingValueMatchTypeEnum, CustomTargetingValueStatusEnum, ) -from .custom_targeting_value_messages import CustomTargetingValue +from .custom_targeting_value_messages import ( + CustomTargetingValue, +) from .custom_targeting_value_service import ( GetCustomTargetingValueRequest, ListCustomTargetingValuesRequest, ListCustomTargetingValuesResponse, ) -from .deal_buyer_permission_type_enum import DealBuyerPermissionTypeEnum -from .device_capability_messages import DeviceCapability +from .deal_buyer_permission_type_enum import ( + DealBuyerPermissionTypeEnum, +) +from .device_capability_messages import ( + DeviceCapability, +) from .device_capability_service import ( GetDeviceCapabilityRequest, ListDeviceCapabilitiesRequest, ListDeviceCapabilitiesResponse, ) -from .device_category_messages import DeviceCategory +from .device_category_messages import ( + DeviceCategory, +) from .device_category_service import ( GetDeviceCategoryRequest, ListDeviceCategoriesRequest, ListDeviceCategoriesResponse, ) -from .device_manufacturer_messages import DeviceManufacturer +from .device_manufacturer_messages import ( + DeviceManufacturer, +) from .device_manufacturer_service import ( GetDeviceManufacturerRequest, ListDeviceManufacturersRequest, ListDeviceManufacturersResponse, ) -from .early_ad_break_notification_enums import AdBreakStateEnum -from .entity_signals_mapping_messages import EntitySignalsMapping +from .early_ad_break_notification_enums import ( + AdBreakStateEnum, +) +from .entity_signals_mapping_messages import ( + EntitySignalsMapping, +) from .entity_signals_mapping_service import ( BatchCreateEntitySignalsMappingsRequest, BatchCreateEntitySignalsMappingsResponse, @@ -233,67 +313,112 @@ ListEntitySignalsMappingsResponse, UpdateEntitySignalsMappingRequest, ) -from .environment_type_enum import EnvironmentTypeEnum -from .exchange_syndication_product_enum import ExchangeSyndicationProductEnum -from .frequency_cap import FrequencyCap -from .geo_target_messages import GeoTarget +from .environment_type_enum import ( + EnvironmentTypeEnum, +) +from .exchange_syndication_product_enum import ( + ExchangeSyndicationProductEnum, +) +from .frequency_cap import ( + FrequencyCap, +) +from .geo_target_messages import ( + GeoTarget, +) from .geo_target_service import ( GetGeoTargetRequest, ListGeoTargetsRequest, ListGeoTargetsResponse, ) -from .goal import Goal -from .goal_enums import GoalTypeEnum, UnitTypeEnum -from .label_messages import Label -from .line_item_enums import LineItemTypeEnum -from .line_item_messages import LineItem +from .goal import ( + Goal, +) +from .goal_enums import ( + GoalTypeEnum, + UnitTypeEnum, +) +from .label_messages import ( + Label, +) +from .line_item_enums import ( + LineItemTypeEnum, +) +from .line_item_messages import ( + LineItem, +) from .line_item_service import ( GetLineItemRequest, ListLineItemsRequest, ListLineItemsResponse, ) -from .live_stream_event_messages import LiveStreamEvent -from .mobile_carrier_messages import MobileCarrier +from .live_stream_event_messages import ( + LiveStreamEvent, +) +from .mobile_carrier_messages import ( + MobileCarrier, +) from .mobile_carrier_service import ( GetMobileCarrierRequest, ListMobileCarriersRequest, ListMobileCarriersResponse, ) -from .mobile_device_messages import MobileDevice +from .mobile_device_messages import ( + MobileDevice, +) from .mobile_device_service import ( GetMobileDeviceRequest, ListMobileDevicesRequest, ListMobileDevicesResponse, ) -from .mobile_device_submodel_messages import MobileDeviceSubmodel +from .mobile_device_submodel_messages import ( + MobileDeviceSubmodel, +) from .mobile_device_submodel_service import ( GetMobileDeviceSubmodelRequest, ListMobileDeviceSubmodelsRequest, ListMobileDeviceSubmodelsResponse, ) -from .network_messages import Network +from .network_messages import ( + Network, +) from .network_service import ( GetNetworkRequest, ListNetworksRequest, ListNetworksResponse, ) -from .operating_system_messages import OperatingSystem +from .operating_system_messages import ( + OperatingSystem, +) from .operating_system_service import ( GetOperatingSystemRequest, ListOperatingSystemsRequest, ListOperatingSystemsResponse, ) -from .operating_system_version_messages import OperatingSystemVersion +from .operating_system_version_messages import ( + OperatingSystemVersion, +) from .operating_system_version_service import ( GetOperatingSystemVersionRequest, ListOperatingSystemVersionsRequest, ListOperatingSystemVersionsResponse, ) -from .order_enums import OrderStatusEnum -from .order_messages import Order -from .order_service import GetOrderRequest, ListOrdersRequest, ListOrdersResponse -from .placement_enums import PlacementStatusEnum -from .placement_messages import Placement +from .order_enums import ( + OrderStatusEnum, +) +from .order_messages import ( + Order, +) +from .order_service import ( + GetOrderRequest, + ListOrdersRequest, + ListOrdersResponse, +) +from .placement_enums import ( + PlacementStatusEnum, +) +from .placement_messages import ( + Placement, +) from .placement_service import ( BatchActivatePlacementsRequest, BatchActivatePlacementsResponse, @@ -311,7 +436,9 @@ ListPlacementsResponse, UpdatePlacementRequest, ) -from .private_auction_deal_messages import PrivateAuctionDeal +from .private_auction_deal_messages import ( + PrivateAuctionDeal, +) from .private_auction_deal_service import ( CreatePrivateAuctionDealRequest, GetPrivateAuctionDealRequest, @@ -319,7 +446,9 @@ ListPrivateAuctionDealsResponse, UpdatePrivateAuctionDealRequest, ) -from .private_auction_messages import PrivateAuction +from .private_auction_messages import ( + PrivateAuction, +) from .private_auction_service import ( CreatePrivateAuctionRequest, GetPrivateAuctionRequest, @@ -327,15 +456,25 @@ ListPrivateAuctionsResponse, UpdatePrivateAuctionRequest, ) -from .private_marketplace_enums import PrivateMarketplaceDealStatusEnum -from .programmatic_buyer_messages import ProgrammaticBuyer +from .private_marketplace_enums import ( + PrivateMarketplaceDealStatusEnum, +) +from .programmatic_buyer_messages import ( + ProgrammaticBuyer, +) from .programmatic_buyer_service import ( GetProgrammaticBuyerRequest, ListProgrammaticBuyersRequest, ListProgrammaticBuyersResponse, ) -from .report_definition import ReportDefinition -from .report_messages import Report, ReportDataTable, ScheduleOptions +from .report_definition import ( + ReportDefinition, +) +from .report_messages import ( + Report, + ReportDataTable, + ScheduleOptions, +) from .report_service import ( CreateReportRequest, FetchReportResultRowsRequest, @@ -348,13 +487,31 @@ RunReportResponse, UpdateReportRequest, ) -from .report_value import ReportValue -from .request_platform_enum import RequestPlatformEnum -from .role_enums import RoleStatusEnum -from .role_messages import Role -from .role_service import GetRoleRequest, ListRolesRequest, ListRolesResponse -from .site_enums import SiteApprovalStatusEnum, SiteDisapprovalReasonEnum -from .site_messages import DisapprovalReason, Site +from .report_value import ( + ReportValue, +) +from .request_platform_enum import ( + RequestPlatformEnum, +) +from .role_enums import ( + RoleStatusEnum, +) +from .role_messages import ( + Role, +) +from .role_service import ( + GetRoleRequest, + ListRolesRequest, + ListRolesResponse, +) +from .site_enums import ( + SiteApprovalStatusEnum, + SiteDisapprovalReasonEnum, +) +from .site_messages import ( + DisapprovalReason, + Site, +) from .site_service import ( BatchCreateSitesRequest, BatchCreateSitesResponse, @@ -370,9 +527,15 @@ ListSitesResponse, UpdateSiteRequest, ) -from .size import Size -from .size_type_enum import SizeTypeEnum -from .targeted_video_bumper_type_enum import TargetedVideoBumperTypeEnum +from .size import ( + Size, +) +from .size_type_enum import ( + SizeTypeEnum, +) +from .targeted_video_bumper_type_enum import ( + TargetedVideoBumperTypeEnum, +) from .targeting import ( AdUnitTargeting, AudienceSegmentTargeting, @@ -401,15 +564,24 @@ VideoPosition, VideoPositionTargeting, ) -from .taxonomy_category_messages import TaxonomyCategory +from .taxonomy_category_messages import ( + TaxonomyCategory, +) from .taxonomy_category_service import ( GetTaxonomyCategoryRequest, ListTaxonomyCategoriesRequest, ListTaxonomyCategoriesResponse, ) -from .taxonomy_type_enum import TaxonomyTypeEnum -from .team_enums import TeamAccessTypeEnum, TeamStatusEnum -from .team_messages import Team +from .taxonomy_type_enum import ( + TaxonomyTypeEnum, +) +from .team_enums import ( + TeamAccessTypeEnum, + TeamStatusEnum, +) +from .team_messages import ( + Team, +) from .team_service import ( BatchActivateTeamsRequest, BatchActivateTeamsResponse, @@ -425,11 +597,21 @@ ListTeamsResponse, UpdateTeamRequest, ) -from .time_unit_enum import TimeUnitEnum -from .user_messages import User -from .user_service import GetUserRequest -from .video_position_enum import VideoPositionEnum -from .web_property import WebProperty +from .time_unit_enum import ( + TimeUnitEnum, +) +from .user_messages import ( + User, +) +from .user_service import ( + GetUserRequest, +) +from .video_position_enum import ( + VideoPositionEnum, +) +from .web_property import ( + WebProperty, +) __all__ = ( "AdBreak", diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_review_center_ad_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_review_center_ad_enums.py index 6c39673c5e7d..efc8adebe853 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_review_center_ad_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_review_center_ad_enums.py @@ -48,6 +48,7 @@ class AdReviewCenterAdStatus(proto.Enum): This ad is allowed to serve by default and has not been reviewed. """ + AD_REVIEW_CENTER_AD_STATUS_UNSPECIFIED = 0 ALLOWED = 1 BLOCKED = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_enums.py index 06685fd9cb8b..2fa61c8ba661 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_enums.py @@ -51,6 +51,7 @@ class AdUnitStatus(proto.Enum): The ad unit will be hidden in the UI and ignored by serving. """ + AD_UNIT_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 @@ -78,6 +79,7 @@ class SmartSizeMode(proto.Enum): DYNAMIC_SIZE (3): Height and width are ranges. """ + SMART_SIZE_MODE_UNSPECIFIED = 0 NONE = 1 SMART_BANNER = 2 @@ -104,6 +106,7 @@ class TargetWindow(proto.Enum): Specifies that the link should open in a new window. """ + TARGET_WINDOW_UNSPECIFIED = 0 TOP = 1 BLANK = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_messages.py index 818197b3f92b..e5e54a9fb9bb 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_messages.py @@ -282,26 +282,26 @@ class AdUnit(proto.Message): number=21, message=applied_label.AppliedLabel, ) - effective_applied_labels: MutableSequence[ - applied_label.AppliedLabel - ] = proto.RepeatedField( - proto.MESSAGE, - number=22, - message=applied_label.AppliedLabel, + effective_applied_labels: MutableSequence[applied_label.AppliedLabel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=22, + message=applied_label.AppliedLabel, + ) ) - applied_label_frequency_caps: MutableSequence[ - "LabelFrequencyCap" - ] = proto.RepeatedField( - proto.MESSAGE, - number=23, - message="LabelFrequencyCap", + applied_label_frequency_caps: MutableSequence["LabelFrequencyCap"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=23, + message="LabelFrequencyCap", + ) ) - effective_label_frequency_caps: MutableSequence[ - "LabelFrequencyCap" - ] = proto.RepeatedField( - proto.MESSAGE, - number=24, - message="LabelFrequencyCap", + effective_label_frequency_caps: MutableSequence["LabelFrequencyCap"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=24, + message="LabelFrequencyCap", + ) ) smart_size_mode: ad_unit_enums.SmartSizeModeEnum.SmartSizeMode = proto.Field( proto.ENUM, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/application_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/application_service.py index 66466c2392f6..ff84e778783a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/application_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/application_service.py @@ -136,12 +136,12 @@ class ListApplicationsResponse(proto.Message): def raw_page(self): return self - applications: MutableSequence[ - application_messages.Application - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=application_messages.Application, + applications: MutableSequence[application_messages.Application] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=application_messages.Application, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/audience_segment_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/audience_segment_service.py index 8a3818c7d45a..36bd48920444 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/audience_segment_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/audience_segment_service.py @@ -136,12 +136,12 @@ class ListAudienceSegmentsResponse(proto.Message): def raw_page(self): return self - audience_segments: MutableSequence[ - audience_segment_messages.AudienceSegment - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=audience_segment_messages.AudienceSegment, + audience_segments: MutableSequence[audience_segment_messages.AudienceSegment] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=audience_segment_messages.AudienceSegment, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/bandwidth_group_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/bandwidth_group_service.py index da2bcff452fa..a9ce1dfb813b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/bandwidth_group_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/bandwidth_group_service.py @@ -136,12 +136,12 @@ class ListBandwidthGroupsResponse(proto.Message): def raw_page(self): return self - bandwidth_groups: MutableSequence[ - bandwidth_group_messages.BandwidthGroup - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=bandwidth_group_messages.BandwidthGroup, + bandwidth_groups: MutableSequence[bandwidth_group_messages.BandwidthGroup] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=bandwidth_group_messages.BandwidthGroup, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/browser_language_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/browser_language_service.py index 9dcc58ecfa08..888dc092edd8 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/browser_language_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/browser_language_service.py @@ -136,12 +136,12 @@ class ListBrowserLanguagesResponse(proto.Message): def raw_page(self): return self - browser_languages: MutableSequence[ - browser_language_messages.BrowserLanguage - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=browser_language_messages.BrowserLanguage, + browser_languages: MutableSequence[browser_language_messages.BrowserLanguage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=browser_language_messages.BrowserLanguage, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_enums.py index 7dbc67bb2349..256ae4190e10 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_enums.py @@ -44,6 +44,7 @@ class CmsMetadataKeyStatus(proto.Enum): INACTIVE (2): The key is not active. """ + CMS_METADATA_KEY_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_service.py index cbaaa15d50a3..b4c3ed88902b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_service.py @@ -136,12 +136,12 @@ class ListCmsMetadataKeysResponse(proto.Message): def raw_page(self): return self - cms_metadata_keys: MutableSequence[ - cms_metadata_key_messages.CmsMetadataKey - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=cms_metadata_key_messages.CmsMetadataKey, + cms_metadata_keys: MutableSequence[cms_metadata_key_messages.CmsMetadataKey] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=cms_metadata_key_messages.CmsMetadataKey, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_value_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_value_enums.py index c8e57667f854..9feb62b80a04 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_value_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_value_enums.py @@ -46,6 +46,7 @@ class CmsMetadataValueStatus(proto.Enum): INACTIVE (3): The value is not active. """ + CMS_METADATA_VALUE_STATUS_UNSPECIFIED = 0 ACTIVE = 1 ARCHIVED = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/company_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/company_enums.py index 5beadbc05e2c..010be14a19d5 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/company_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/company_enums.py @@ -57,6 +57,7 @@ class CompanyType(proto.Enum): A company representing multiple advertisers and agencies. """ + COMPANY_TYPE_UNSPECIFIED = 0 ADVERTISER = 1 HOUSE_ADVERTISER = 2 @@ -144,6 +145,7 @@ class CompanyCreditStatus(proto.Enum): This credit status is only available in advance settings. """ + COMPANY_CREDIT_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/contact_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/contact_enums.py index baca3c7df8d8..303fb7273d51 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/contact_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/contact_enums.py @@ -59,6 +59,7 @@ class ContactStatus(proto.Enum): their orders, but their access was later revoked. """ + CONTACT_STATUS_UNSPECIFIED = 0 INVITE_CANCELED = 1 INVITE_EXPIRED = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/content_bundle_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/content_bundle_service.py index f97a13a50a3a..33526003265b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/content_bundle_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/content_bundle_service.py @@ -136,12 +136,12 @@ class ListContentBundlesResponse(proto.Message): def raw_page(self): return self - content_bundles: MutableSequence[ - content_bundle_messages.ContentBundle - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=content_bundle_messages.ContentBundle, + content_bundles: MutableSequence[content_bundle_messages.ContentBundle] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=content_bundle_messages.ContentBundle, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/content_label_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/content_label_service.py index c70c118f105e..e3d4908579ce 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/content_label_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/content_label_service.py @@ -136,12 +136,12 @@ class ListContentLabelsResponse(proto.Message): def raw_page(self): return self - content_labels: MutableSequence[ - content_label_messages.ContentLabel - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=content_label_messages.ContentLabel, + content_labels: MutableSequence[content_label_messages.ContentLabel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=content_label_messages.ContentLabel, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_enums.py index 11eec0934cb7..2e0ede8e6193 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_enums.py @@ -47,6 +47,7 @@ class CreativeTemplateType(proto.Enum): Creative templates created by an administrator or other user in the network. """ + CREATIVE_TEMPLATE_TYPE_UNSPECIFIED = 0 STANDARD = 1 CUSTOM = 2 @@ -76,6 +77,7 @@ class CreativeTemplateStatus(proto.Enum): but existing ones can be edited and continue to serve """ + CREATIVE_TEMPLATE_STATUS_UNSPECIFIED = 0 ACTIVE = 1 DELETED = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_messages.py index e0fa7533f5a3..e2a7aef58d94 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_messages.py @@ -245,6 +245,7 @@ class MimeType(proto.Enum): GIF (3): The ``image/gif`` MIME type. """ + MIME_TYPE_UNSPECIFIED = 0 JPG = 1 PNG = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_service.py index 7247e40fc9c0..623b5e8057e3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_service.py @@ -136,12 +136,12 @@ class ListCreativeTemplatesResponse(proto.Message): def raw_page(self): return self - creative_templates: MutableSequence[ - creative_template_messages.CreativeTemplate - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=creative_template_messages.CreativeTemplate, + creative_templates: MutableSequence[creative_template_messages.CreativeTemplate] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=creative_template_messages.CreativeTemplate, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_variable_url_type_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_variable_url_type_enum.py index 5f4e2f19313a..35842c2a9cdc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_variable_url_type_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_variable_url_type_enum.py @@ -49,6 +49,7 @@ class CreativeTemplateVariableUrlType(proto.Enum): STANDARD_HTTP (4): Standard HTTP URL. """ + CREATIVE_TEMPLATE_VARIABLE_URL_TYPE_UNSPECIFIED = 0 CLICK_TRACKER = 1 DEEPLINK = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_enums.py index 83aaa4c45593..6f17d7aafcfc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_enums.py @@ -53,6 +53,7 @@ class CustomFieldDataType(proto.Enum): DROP_DOWN (4): A drop-down field. """ + CUSTOM_FIELD_DATA_TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -84,6 +85,7 @@ class CustomFieldEntityType(proto.Enum): The CustomField is applied to ProposalLineItems. """ + CUSTOM_FIELD_ENTITY_TYPE_UNSPECIFIED = 0 LINE_ITEM = 1 ORDER = 2 @@ -109,6 +111,7 @@ class CustomFieldStatus(proto.Enum): INACTIVE (2): The CustomField is inactive. """ + CUSTOM_FIELD_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 @@ -136,6 +139,7 @@ class CustomFieldVisibility(proto.Enum): The CustomField is visible and editable in both the API and UI. """ + CUSTOM_FIELD_VISIBILITY_UNSPECIFIED = 0 HIDDEN = 1 READ_ONLY = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_service.py index 200a33e6a7b4..d4a71d7307bd 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_service.py @@ -147,12 +147,12 @@ class ListCustomFieldsResponse(proto.Message): def raw_page(self): return self - custom_fields: MutableSequence[ - custom_field_messages.CustomField - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=custom_field_messages.CustomField, + custom_fields: MutableSequence[custom_field_messages.CustomField] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=custom_field_messages.CustomField, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -218,12 +218,12 @@ class BatchCreateCustomFieldsResponse(proto.Message): The ``CustomField`` objects created. """ - custom_fields: MutableSequence[ - custom_field_messages.CustomField - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=custom_field_messages.CustomField, + custom_fields: MutableSequence[custom_field_messages.CustomField] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=custom_field_messages.CustomField, + ) ) @@ -284,12 +284,12 @@ class BatchUpdateCustomFieldsResponse(proto.Message): The ``CustomField`` objects updated. """ - custom_fields: MutableSequence[ - custom_field_messages.CustomField - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=custom_field_messages.CustomField, + custom_fields: MutableSequence[custom_field_messages.CustomField] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=custom_field_messages.CustomField, + ) ) diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_key_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_key_enums.py index 1057a40e9694..1cdd8745abce 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_key_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_key_enums.py @@ -46,6 +46,7 @@ class CustomTargetingKeyStatus(proto.Enum): INACTIVE (2): Custom targeting key is inactive. """ + CUSTOM_TARGETING_KEY_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 @@ -68,6 +69,7 @@ class CustomTargetingKeyType(proto.Enum): FREEFORM (2): Key without a fixed set of values """ + CUSTOM_TARGETING_KEY_TYPE_UNSPECIFIED = 0 PREDEFINED = 1 FREEFORM = 2 @@ -95,6 +97,7 @@ class CustomTargetingKeyReportableType(proto.Enum): Custom dimension available for reporting in the AdManager query tool. """ + CUSTOM_TARGETING_KEY_REPORTABLE_TYPE_UNSPECIFIED = 0 OFF = 1 ON = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_value_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_value_enums.py index 0ff4475d6e7a..86a290d60d8a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_value_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_value_enums.py @@ -45,6 +45,7 @@ class CustomTargetingValueStatus(proto.Enum): INACTIVE (2): Custom targeting value is inactive. """ + CUSTOM_TARGETING_VALUE_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 @@ -111,6 +112,7 @@ class CustomTargetingValueMatchType(proto.Enum): but not with car=misspelled hond a. This match type can not be used within line item targeting. """ + CUSTOM_TARGETING_VALUE_MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BROAD = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/deal_buyer_permission_type_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/deal_buyer_permission_type_enum.py index 727b9a450384..135822f21b05 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/deal_buyer_permission_type_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/deal_buyer_permission_type_enum.py @@ -47,6 +47,7 @@ class DealBuyerPermissionType(proto.Enum): The deal transacts with all buyers under the same bidder. """ + DEAL_BUYER_PERMISSION_TYPE_UNSPECIFIED = 0 NEGOTIATOR_ONLY = 1 BIDDER = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/device_category_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/device_category_service.py index 205639be4dc1..9b36ba4de585 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/device_category_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/device_category_service.py @@ -136,12 +136,12 @@ class ListDeviceCategoriesResponse(proto.Message): def raw_page(self): return self - device_categories: MutableSequence[ - device_category_messages.DeviceCategory - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=device_category_messages.DeviceCategory, + device_categories: MutableSequence[device_category_messages.DeviceCategory] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=device_category_messages.DeviceCategory, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/early_ad_break_notification_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/early_ad_break_notification_enums.py index 3fef72589f90..685828cf0054 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/early_ad_break_notification_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/early_ad_break_notification_enums.py @@ -50,6 +50,7 @@ class AdBreakState(proto.Enum): will start later. You can delete or update the ad break. """ + AD_BREAK_STATE_UNSPECIFIED = 0 DECISIONED = 1 COMPLETE = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/entity_signals_mapping_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/entity_signals_mapping_service.py index a56b3e4c37f5..a6d1bb312195 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/entity_signals_mapping_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/entity_signals_mapping_service.py @@ -233,12 +233,12 @@ class BatchCreateEntitySignalsMappingsRequest(proto.Message): proto.STRING, number=1, ) - requests: MutableSequence[ - "CreateEntitySignalsMappingRequest" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="CreateEntitySignalsMappingRequest", + requests: MutableSequence["CreateEntitySignalsMappingRequest"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="CreateEntitySignalsMappingRequest", + ) ) @@ -277,12 +277,12 @@ class BatchUpdateEntitySignalsMappingsRequest(proto.Message): proto.STRING, number=1, ) - requests: MutableSequence[ - "UpdateEntitySignalsMappingRequest" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="UpdateEntitySignalsMappingRequest", + requests: MutableSequence["UpdateEntitySignalsMappingRequest"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="UpdateEntitySignalsMappingRequest", + ) ) diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/environment_type_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/environment_type_enum.py index a07d11b28b4b..124ec1b3667a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/environment_type_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/environment_type_enum.py @@ -44,6 +44,7 @@ class EnvironmentType(proto.Enum): VIDEO_PLAYER (2): Video players. """ + ENVIRONMENT_TYPE_UNSPECIFIED = 0 BROWSER = 1 VIDEO_PLAYER = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/exchange_syndication_product_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/exchange_syndication_product_enum.py index 88e5f971c29b..7a7f32053456 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/exchange_syndication_product_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/exchange_syndication_product_enum.py @@ -49,6 +49,7 @@ class ExchangeSyndicationProduct(proto.Enum): GAMES (4): Property serves for games. """ + EXCHANGE_SYNDICATION_PRODUCT_UNSPECIFIED = 0 DISPLAY = 1 MOBILE_APP = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/goal_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/goal_enums.py index cfeadae75c69..d1f1cd6e8403 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/goal_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/goal_enums.py @@ -77,6 +77,7 @@ class GoalType(proto.Enum): - [LineItemTypeEnum.LineItemType.ADMOB][] - [LineItemTypeEnum.LineItemType.BUMPER][google.ads.admanager.v1.LineItemTypeEnum.LineItemType.BUMPER] """ + GOAL_TYPE_UNSPECIFIED = 0 NONE = 1 LIFETIME = 2 @@ -139,6 +140,7 @@ class UnitType(proto.Enum): must be [LineItemTypeEnum.LineItemType.STANDARD][google.ads.admanager.v1.LineItemTypeEnum.LineItemType.STANDARD]. """ + UNIT_TYPE_UNSPECIFIED = 0 IMPRESSIONS = 1 CLICKS = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_enums.py index b4affa0d98a8..5dcf959a2877 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_enums.py @@ -91,6 +91,7 @@ class LineItemType(proto.Enum): The type of LineItem used for configuring audience extension campaigns. """ + LINE_ITEM_TYPE_UNSPECIFIED = 0 SPONSORSHIP = 12 STANDARD = 13 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_messages.py index fc074f938ff7..8a11bc894e72 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_messages.py @@ -21,9 +21,8 @@ import google.type.money_pb2 as money_pb2 # type: ignore import proto # type: ignore -from google.ads.admanager_v1.types import custom_field_value +from google.ads.admanager_v1.types import custom_field_value, line_item_enums from google.ads.admanager_v1.types import goal as gaa_goal -from google.ads.admanager_v1.types import line_item_enums __protobuf__ = proto.module( package="google.ads.admanager.v1", @@ -144,12 +143,12 @@ class LineItem(proto.Message): optional=True, message=money_pb2.Money, ) - custom_field_values: MutableSequence[ - custom_field_value.CustomFieldValue - ] = proto.RepeatedField( - proto.MESSAGE, - number=59, - message=custom_field_value.CustomFieldValue, + custom_field_values: MutableSequence[custom_field_value.CustomFieldValue] = ( + proto.RepeatedField( + proto.MESSAGE, + number=59, + message=custom_field_value.CustomFieldValue, + ) ) goal: gaa_goal.Goal = proto.Field( proto.MESSAGE, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_carrier_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_carrier_service.py index e1b13c95553e..ac6518f3eeee 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_carrier_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_carrier_service.py @@ -136,12 +136,12 @@ class ListMobileCarriersResponse(proto.Message): def raw_page(self): return self - mobile_carriers: MutableSequence[ - mobile_carrier_messages.MobileCarrier - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=mobile_carrier_messages.MobileCarrier, + mobile_carriers: MutableSequence[mobile_carrier_messages.MobileCarrier] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=mobile_carrier_messages.MobileCarrier, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_device_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_device_service.py index c9c15594fccd..d671945074d8 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_device_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_device_service.py @@ -136,12 +136,12 @@ class ListMobileDevicesResponse(proto.Message): def raw_page(self): return self - mobile_devices: MutableSequence[ - mobile_device_messages.MobileDevice - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=mobile_device_messages.MobileDevice, + mobile_devices: MutableSequence[mobile_device_messages.MobileDevice] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=mobile_device_messages.MobileDevice, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/operating_system_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/operating_system_service.py index 596e2872af86..9eff2ad9b6e6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/operating_system_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/operating_system_service.py @@ -136,12 +136,12 @@ class ListOperatingSystemsResponse(proto.Message): def raw_page(self): return self - operating_systems: MutableSequence[ - operating_system_messages.OperatingSystem - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=operating_system_messages.OperatingSystem, + operating_systems: MutableSequence[operating_system_messages.OperatingSystem] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=operating_system_messages.OperatingSystem, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/order_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/order_enums.py index 98643a627af8..8d5734044365 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/order_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/order_enums.py @@ -60,6 +60,7 @@ class OrderStatus(proto.Enum): DELETED (8): Indicates that the Order has been deleted. """ + ORDER_STATUS_UNSPECIFIED = 0 DRAFT = 2 PENDING_APPROVAL = 3 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/order_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/order_messages.py index fde1478d462d..936a9bd5b335 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/order_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/order_messages.py @@ -318,19 +318,19 @@ class Order(proto.Message): number=25, message=applied_label.AppliedLabel, ) - effective_applied_labels: MutableSequence[ - applied_label.AppliedLabel - ] = proto.RepeatedField( - proto.MESSAGE, - number=26, - message=applied_label.AppliedLabel, + effective_applied_labels: MutableSequence[applied_label.AppliedLabel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=26, + message=applied_label.AppliedLabel, + ) ) - custom_field_values: MutableSequence[ - custom_field_value.CustomFieldValue - ] = proto.RepeatedField( - proto.MESSAGE, - number=38, - message=custom_field_value.CustomFieldValue, + custom_field_values: MutableSequence[custom_field_value.CustomFieldValue] = ( + proto.RepeatedField( + proto.MESSAGE, + number=38, + message=custom_field_value.CustomFieldValue, + ) ) diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_enums.py index 93e71bd716e0..a90e90f7b47c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_enums.py @@ -46,6 +46,7 @@ class PlacementStatus(proto.Enum): ARCHIVED (3): No stats collected, user-visible. """ + PLACEMENT_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_service.py index 920e932e9d81..9ad5abb98b5d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_service.py @@ -139,12 +139,12 @@ class ListPrivateAuctionsResponse(proto.Message): def raw_page(self): return self - private_auctions: MutableSequence[ - private_auction_messages.PrivateAuction - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=private_auction_messages.PrivateAuction, + private_auctions: MutableSequence[private_auction_messages.PrivateAuction] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=private_auction_messages.PrivateAuction, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/private_marketplace_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/private_marketplace_enums.py index b057ea735f1c..73da560ed6b3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/private_marketplace_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/private_marketplace_enums.py @@ -50,6 +50,7 @@ class PrivateMarketplaceDealStatus(proto.Enum): BUYER_PAUSED (5): The deal is paused by the buyer. """ + PRIVATE_MARKETPLACE_DEAL_STATUS_UNSPECIFIED = 0 PENDING = 1 ACTIVE = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/report_definition.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/report_definition.py index a5271b58f7ed..5aa22bc2687d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/report_definition.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/report_definition.py @@ -133,6 +133,7 @@ class ReportType(proto.Enum): AD_SPEED (13): Ad speed. """ + REPORT_TYPE_UNSPECIFIED = 0 HISTORICAL = 1 REACH = 5 @@ -5859,6 +5860,7 @@ class Dimension(proto.Enum): equal to the ID in index 9 of ``ReportDefinition.custom_dimension_key_ids``. """ + _pb_options = {"allow_alias": True} DIMENSION_UNSPECIFIED = 0 ACTIVE_VIEW_MEASUREMENT_SOURCE = 575 @@ -11319,6 +11321,7 @@ class Metric(proto.Enum): Data format: ``INTEGER`` """ + _pb_options = {"allow_alias": True} METRIC_UNSPECIFIED = 0 ACTIVE_USERS = 223 @@ -11835,6 +11838,7 @@ class TimePeriodColumn(proto.Enum): TIME_PERIOD_COLUMN_QUARTER (4): A column for each quarter in the report. """ + TIME_PERIOD_COLUMN_UNSPECIFIED = 0 TIME_PERIOD_COLUMN_DATE = 1 TIME_PERIOD_COLUMN_WEEK = 2 @@ -11862,6 +11866,7 @@ class MetricValueType(proto.Enum): The relative change between the primary and comparison date ranges. """ + PRIMARY = 0 PRIMARY_PERCENT_OF_TOTAL = 1 COMPARISON = 2 @@ -11892,6 +11897,7 @@ class TimeZoneSource(proto.Enum): compared with PUBLISHER, and reports may take longer to run since the dates are dynamically calculated at request time. """ + TIME_ZONE_SOURCE_UNSPECIFIED = 0 PUBLISHER = 1 AD_EXCHANGE = 2 @@ -12109,6 +12115,7 @@ class RelativeDateRange(proto.Enum): Wednesday, but SAME_PERIOD_PREVIOUS_YEAR will be Monday - Sunday. """ + RELATIVE_DATE_RANGE_UNSPECIFIED = 0 TODAY = 1 YESTERDAY = 2 @@ -12269,6 +12276,7 @@ class Operation(proto.Enum): expression or set of regular expressions (none must match). """ + IN = 0 NOT_IN = 1 CONTAINS = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/report_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/report_messages.py index 8b11d168f869..dbe3c11ceedc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/report_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/report_messages.py @@ -87,6 +87,7 @@ class Visibility(proto.Enum): Reports with this visibility will appear in the Ad Manager UI. """ + _pb_options = {"allow_alias": True} HIDDEN = 0 DRAFT = 1 @@ -161,19 +162,19 @@ class Row(proto.Message): metric_value_groups represents the metrics for date y. """ - dimension_values: MutableSequence[ - report_value.ReportValue - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=report_value.ReportValue, + dimension_values: MutableSequence[report_value.ReportValue] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=report_value.ReportValue, + ) ) - metric_value_groups: MutableSequence[ - "ReportDataTable.MetricValueGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ReportDataTable.MetricValueGroup", + metric_value_groups: MutableSequence["ReportDataTable.MetricValueGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ReportDataTable.MetricValueGroup", + ) ) class MetricValueGroup(proto.Message): @@ -208,19 +209,19 @@ class MetricValueGroup(proto.Message): number=1, message=report_value.ReportValue, ) - primary_percent_of_total_values: MutableSequence[ - report_value.ReportValue - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=report_value.ReportValue, + primary_percent_of_total_values: MutableSequence[report_value.ReportValue] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=report_value.ReportValue, + ) ) - comparison_values: MutableSequence[ - report_value.ReportValue - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=report_value.ReportValue, + comparison_values: MutableSequence[report_value.ReportValue] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=report_value.ReportValue, + ) ) comparison_percent_of_total_values: MutableSequence[ report_value.ReportValue @@ -229,19 +230,19 @@ class MetricValueGroup(proto.Message): number=4, message=report_value.ReportValue, ) - absolute_change_values: MutableSequence[ - report_value.ReportValue - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=report_value.ReportValue, + absolute_change_values: MutableSequence[report_value.ReportValue] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=report_value.ReportValue, + ) ) - relative_change_values: MutableSequence[ - report_value.ReportValue - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=report_value.ReportValue, + relative_change_values: MutableSequence[report_value.ReportValue] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=report_value.ReportValue, + ) ) flag_values: MutableSequence[bool] = proto.RepeatedField( proto.BOOL, @@ -275,6 +276,7 @@ class DeliveryCondition(proto.Enum): Deliver report when flag's conditions are met. """ + NEVER = 0 ALWAYS = 1 WHEN_FLAG_CONDITIONS_MET = 2 @@ -342,6 +344,7 @@ class Frequency(proto.Enum): MONTHLY (7): Schedule report to run on a monthly basis. """ + FREQUENCY_UNSPECIFIED = 0 HOURLY = 1 TWO_TIMES_DAILY = 2 @@ -360,12 +363,12 @@ class WeeklySchedule(proto.Message): report. """ - weekly_scheduled_days: MutableSequence[ - dayofweek_pb2.DayOfWeek - ] = proto.RepeatedField( - proto.ENUM, - number=1, - enum=dayofweek_pb2.DayOfWeek, + weekly_scheduled_days: MutableSequence[dayofweek_pb2.DayOfWeek] = ( + proto.RepeatedField( + proto.ENUM, + number=1, + enum=dayofweek_pb2.DayOfWeek, + ) ) class MonthlySchedule(proto.Message): @@ -426,12 +429,12 @@ class MonthlySchedule(proto.Message): number=2, enum=DeliveryCondition, ) - flags: MutableSequence[ - gaa_report_definition.ReportDefinition.Flag - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=gaa_report_definition.ReportDefinition.Flag, + flags: MutableSequence[gaa_report_definition.ReportDefinition.Flag] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=gaa_report_definition.ReportDefinition.Flag, + ) ) diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/request_platform_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/request_platform_enum.py index 1db06154bbf5..1eb07c9ddf07 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/request_platform_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/request_platform_enum.py @@ -55,6 +55,7 @@ class RequestPlatform(proto.Enum): Represents a request made from a video player. """ + REQUEST_PLATFORM_UNSPECIFIED = 0 BROWSER = 1 MOBILE_APP = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/role_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/role_enums.py index b89b43559271..12a248dcdb2a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/role_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/role_enums.py @@ -44,6 +44,7 @@ class RoleStatus(proto.Enum): INACTIVE (2): Role is inactive. """ + ROLE_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/site_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/site_enums.py index 46e54da4e27c..efac6f21f6a8 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/site_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/site_enums.py @@ -48,6 +48,7 @@ class SiteDisapprovalReason(proto.Enum): The parent must be an authorized seller of the child network's inventory. """ + SITE_DISAPPROVAL_REASON_UNSPECIFIED = 0 CONTENT = 1 OTHER = 2 @@ -84,6 +85,7 @@ class SiteApprovalStatus(proto.Enum): be reviwed with an estimated turn-around time of 24h. Such a site cannot serve ads. """ + SITE_APPROVAL_STATUS_UNSPECIFIED = 0 APPROVED = 1 DISAPPROVED = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/size_type_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/size_type_enum.py index 7fefa507635c..0f58b8ddfd1b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/size_type_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/size_type_enum.py @@ -65,6 +65,7 @@ class SizeType(proto.Enum): Audio size. Used with audio ads. This must be used with 1x1 size. """ + SIZE_TYPE_UNSPECIFIED = 0 PIXEL = 1 ASPECT_RATIO = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/targeted_video_bumper_type_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/targeted_video_bumper_type_enum.py index 87c5ef66a0c5..05ea7760e22f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/targeted_video_bumper_type_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/targeted_video_bumper_type_enum.py @@ -49,6 +49,7 @@ class TargetedVideoBumperType(proto.Enum): Represents the bumper position before the ad pod. """ + TARGETED_VIDEO_BUMPER_TYPE_UNSPECIFIED = 0 AFTER = 1 BEFORE = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/targeting.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/targeting.py index 1fa0ecd646a5..2d5659b834ee 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/targeting.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/targeting.py @@ -577,12 +577,12 @@ class CustomTargeting(proto.Message): together. """ - custom_targeting_clauses: MutableSequence[ - "CustomTargetingClause" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CustomTargetingClause", + custom_targeting_clauses: MutableSequence["CustomTargetingClause"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CustomTargetingClause", + ) ) @@ -602,26 +602,26 @@ class CustomTargetingClause(proto.Message): metadata. """ - custom_targeting_literals: MutableSequence[ - "CustomTargetingLiteral" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CustomTargetingLiteral", - ) - audience_segment_targetings: MutableSequence[ - "AudienceSegmentTargeting" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="AudienceSegmentTargeting", - ) - cms_metadata_targetings: MutableSequence[ - "CmsMetadataTargeting" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="CmsMetadataTargeting", + custom_targeting_literals: MutableSequence["CustomTargetingLiteral"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CustomTargetingLiteral", + ) + ) + audience_segment_targetings: MutableSequence["AudienceSegmentTargeting"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="AudienceSegmentTargeting", + ) + ) + cms_metadata_targetings: MutableSequence["CmsMetadataTargeting"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="CmsMetadataTargeting", + ) ) diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/taxonomy_type_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/taxonomy_type_enum.py index e03d32877e47..c86791b73f37 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/taxonomy_type_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/taxonomy_type_enum.py @@ -53,6 +53,7 @@ class TaxonomyType(proto.Enum): TAXONOMY_GOOGLE_STRUCTURED_VIDEO_1_0 (7): The PPS structured video signals taxonomy. """ + TAXONOMY_TYPE_UNSPECIFIED = 0 TAXONOMY_IAB_AUDIENCE_1_1 = 3 TAXONOMY_IAB_CONTENT_1_0 = 8 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/team_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/team_enums.py index 30932486144d..0380ac67becc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/team_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/team_enums.py @@ -46,6 +46,7 @@ class TeamStatus(proto.Enum): INACTIVE (2): The status of an inactive team. """ + TEAM_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 @@ -73,6 +74,7 @@ class TeamAccessType(proto.Enum): The level of access in which team members can view and edit a team's orders. """ + TEAM_ACCESS_TYPE_UNSPECIFIED = 0 NONE = 1 READ_ONLY = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/time_unit_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/time_unit_enum.py index 5742c7489ceb..5c1ffd025045 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/time_unit_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/time_unit_enum.py @@ -55,6 +55,7 @@ class TimeUnit(proto.Enum): Per video stream. Only valid for entities in a VIDEO_PLAYER environment. """ + TIME_UNIT_UNSPECIFIED = 0 MINUTE = 1 HOUR = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/video_position_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/video_position_enum.py index 3fca184ec0fb..87f4f1cf2202 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/video_position_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/video_position_enum.py @@ -49,6 +49,7 @@ class VideoPosition(proto.Enum): PREROLL (4): Target ad placement before the video starts. """ + VIDEO_POSITION_UNSPECIFIED = 0 ALL = 1 MIDROLL = 2 diff --git a/packages/google-ads-admanager/mypy.ini b/packages/google-ads-admanager/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-ads-admanager/mypy.ini +++ b/packages/google-ads-admanager/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-ads-admanager/noxfile.py b/packages/google-ads-admanager/noxfile.py index f5011758666f..a81143fd97e9 100644 --- a/packages/google-ads-admanager/noxfile.py +++ b/packages/google-ads-admanager/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_break_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_break_service.py index f20cafb6b142..91084d63a6a4 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_break_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_break_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 google.ads.admanager_v1.services.ad_break_service import ( AdBreakServiceClient, @@ -907,10 +912,9 @@ def test_ad_break_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +959,9 @@ def test_ad_break_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +997,9 @@ def test_ad_break_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_review_center_ad_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_review_center_ad_service.py index 416ffdedfc22..29c67887e2fa 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_review_center_ad_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_review_center_ad_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.interval_pb2 as interval_pb2 # type: ignore from google.ads.admanager_v1.services.ad_review_center_ad_service import ( AdReviewCenterAdServiceClient, @@ -950,10 +950,9 @@ def test_ad_review_center_ad_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +997,9 @@ def test_ad_review_center_ad_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1035,9 @@ def test_ad_review_center_ad_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_unit_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_unit_service.py index f87d534f9787..b2cfadb10b90 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_unit_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_unit_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 google.ads.admanager_v1.services.ad_unit_service import ( AdUnitServiceClient, @@ -905,10 +910,9 @@ def test_ad_unit_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -953,10 +957,9 @@ def test_ad_unit_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -992,10 +995,9 @@ def test_ad_unit_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1610,9 +1612,9 @@ def test_list_ad_unit_sizes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_ad_unit_sizes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_ad_unit_sizes] = ( + mock_rpc + ) request = {} client.list_ad_unit_sizes(request) @@ -2247,9 +2249,9 @@ def test_batch_create_ad_units_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_ad_units - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_ad_units] = ( + mock_rpc + ) request = {} client.batch_create_ad_units(request) @@ -2440,9 +2442,9 @@ def test_batch_update_ad_units_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_ad_units - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_ad_units] = ( + mock_rpc + ) request = {} client.batch_update_ad_units(request) @@ -3038,9 +3040,9 @@ def test_batch_archive_ad_units_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_archive_ad_units - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_archive_ad_units] = ( + mock_rpc + ) request = {} client.batch_archive_ad_units(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_application_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_application_service.py index 5f022949099d..1f0bf725e883 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_application_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_application_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -923,10 +928,9 @@ def test_application_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +975,9 @@ def test_application_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1013,9 @@ def test_application_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1371,9 +1373,9 @@ def test_list_applications_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_applications - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_applications] = ( + mock_rpc + ) request = {} client.list_applications(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_audience_segment_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_audience_segment_service.py index b1a67cc50279..e3171ff07a6b 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_audience_segment_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_audience_segment_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -938,10 +943,9 @@ def test_audience_segment_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +990,9 @@ def test_audience_segment_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1028,9 @@ def test_audience_segment_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1216,9 +1218,9 @@ def test_get_audience_segment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_audience_segment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_audience_segment] = ( + mock_rpc + ) request = {} client.get_audience_segment(request) @@ -1398,9 +1400,9 @@ def test_list_audience_segments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_audience_segments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_audience_segments] = ( + mock_rpc + ) request = {} client.list_audience_segments(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_bandwidth_group_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_bandwidth_group_service.py index a485e8c6c06e..42fc177a7151 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_bandwidth_group_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_bandwidth_group_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -934,10 +939,9 @@ def test_bandwidth_group_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -982,10 +986,9 @@ def test_bandwidth_group_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1021,10 +1024,9 @@ def test_bandwidth_group_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1212,9 +1214,9 @@ def test_get_bandwidth_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_bandwidth_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_bandwidth_group] = ( + mock_rpc + ) request = {} client.get_bandwidth_group(request) @@ -1394,9 +1396,9 @@ def test_list_bandwidth_groups_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_bandwidth_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_bandwidth_groups] = ( + mock_rpc + ) request = {} client.list_bandwidth_groups(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_language_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_language_service.py index 8e61d01e4720..3805e73f7fa7 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_language_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_language_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -938,10 +943,9 @@ def test_browser_language_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +990,9 @@ def test_browser_language_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1028,9 @@ def test_browser_language_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1216,9 +1218,9 @@ def test_get_browser_language_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_browser_language - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_browser_language] = ( + mock_rpc + ) request = {} client.get_browser_language(request) @@ -1398,9 +1400,9 @@ def test_list_browser_languages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_browser_languages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_browser_languages] = ( + mock_rpc + ) request = {} client.list_browser_languages(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_service.py index fe491e7e8ad6..53105e2291b2 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -896,10 +901,9 @@ def test_browser_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -944,10 +948,9 @@ def test_browser_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +986,9 @@ def test_browser_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_key_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_key_service.py index 936e2d4fb511..b6e1138f5ed8 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_key_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_key_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -937,10 +942,9 @@ def test_cms_metadata_key_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +989,9 @@ def test_cms_metadata_key_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1027,9 @@ def test_cms_metadata_key_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1215,9 +1217,9 @@ def test_get_cms_metadata_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cms_metadata_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cms_metadata_key] = ( + mock_rpc + ) request = {} client.get_cms_metadata_key(request) @@ -1397,9 +1399,9 @@ def test_list_cms_metadata_keys_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cms_metadata_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cms_metadata_keys] = ( + mock_rpc + ) request = {} client.list_cms_metadata_keys(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_value_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_value_service.py index db69139275fa..64cc1def0766 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_value_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_value_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -939,10 +944,9 @@ def test_cms_metadata_value_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -987,10 +991,9 @@ def test_cms_metadata_value_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1029,9 @@ def test_cms_metadata_value_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1218,9 +1220,9 @@ def test_get_cms_metadata_value_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cms_metadata_value - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cms_metadata_value] = ( + mock_rpc + ) request = {} client.get_cms_metadata_value(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_company_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_company_service.py index 65e26a552534..5b2676b93554 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_company_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_company_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.company_service import ( CompanyServiceClient, @@ -902,10 +907,9 @@ def test_company_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -950,10 +954,9 @@ def test_company_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +992,9 @@ def test_company_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_contact_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_contact_service.py index 12024a08b8c2..554d8b8b36de 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_contact_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_contact_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.ads.admanager_v1.services.contact_service import ( ContactServiceClient, @@ -901,10 +906,9 @@ def test_contact_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -949,10 +953,9 @@ def test_contact_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +991,9 @@ def test_contact_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1794,9 +1796,9 @@ def test_batch_create_contacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_contacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_contacts] = ( + mock_rpc + ) request = {} client.batch_create_contacts(request) @@ -2172,9 +2174,9 @@ def test_batch_update_contacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_contacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_contacts] = ( + mock_rpc + ) request = {} client.batch_update_contacts(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_bundle_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_bundle_service.py index ce93e89b6156..79298d4ac2d7 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_bundle_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_bundle_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -932,10 +937,9 @@ def test_content_bundle_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -980,10 +984,9 @@ def test_content_bundle_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1022,9 @@ def test_content_bundle_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1210,9 +1212,9 @@ def test_get_content_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_content_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_content_bundle] = ( + mock_rpc + ) request = {} client.get_content_bundle(request) @@ -1390,9 +1392,9 @@ def test_list_content_bundles_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_content_bundles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_content_bundles] = ( + mock_rpc + ) request = {} client.list_content_bundles(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_label_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_label_service.py index 16f4176eba96..65689140ca09 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_label_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_label_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -929,10 +934,9 @@ def test_content_label_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +981,9 @@ def test_content_label_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1019,9 @@ def test_content_label_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1205,9 +1207,9 @@ def test_get_content_label_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_content_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_content_label] = ( + mock_rpc + ) request = {} client.get_content_label(request) @@ -1385,9 +1387,9 @@ def test_list_content_labels_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_content_labels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_content_labels] = ( + mock_rpc + ) request = {} client.list_content_labels(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_service.py index ddb5b47f2022..5ed2f33d4935 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -896,10 +901,9 @@ def test_content_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -944,10 +948,9 @@ def test_content_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +986,9 @@ def test_content_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_creative_template_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_creative_template_service.py index 80c3a669d23a..c051652ff3df 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_creative_template_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_creative_template_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -939,10 +944,9 @@ def test_creative_template_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -987,10 +991,9 @@ def test_creative_template_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1029,9 @@ def test_creative_template_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1218,9 +1220,9 @@ def test_get_creative_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_creative_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_creative_template] = ( + mock_rpc + ) request = {} client.get_creative_template(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_field_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_field_service.py index 29c9f32d4d7d..985ded08a1d8 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_field_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_field_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.ads.admanager_v1.services.custom_field_service import ( CustomFieldServiceClient, @@ -928,10 +933,9 @@ def test_custom_field_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -976,10 +980,9 @@ def test_custom_field_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1018,9 @@ def test_custom_field_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1200,9 +1202,9 @@ def test_get_custom_field_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_field - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_field] = ( + mock_rpc + ) request = {} client.get_custom_field(request) @@ -1380,9 +1382,9 @@ def test_list_custom_fields_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_fields - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_fields] = ( + mock_rpc + ) request = {} client.list_custom_fields(request) @@ -1646,9 +1648,9 @@ def test_create_custom_field_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_custom_field - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_custom_field] = ( + mock_rpc + ) request = {} client.create_custom_field(request) @@ -2039,9 +2041,9 @@ def test_update_custom_field_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_custom_field - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_custom_field] = ( + mock_rpc + ) request = {} client.update_custom_field(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_key_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_key_service.py index 9e86e34b7187..74f534ec9340 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_key_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_key_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.ads.admanager_v1.services.custom_targeting_key_service import ( CustomTargetingKeyServiceClient, @@ -949,10 +954,9 @@ def test_custom_targeting_key_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1001,9 @@ def test_custom_targeting_key_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1036,10 +1039,9 @@ def test_custom_targeting_key_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_value_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_value_service.py index 2ef027954f9e..c19310f0e198 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_value_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_value_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -972,10 +977,9 @@ def test_custom_targeting_value_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1020,10 +1024,9 @@ def test_custom_targeting_value_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1062,9 @@ def test_custom_targeting_value_service_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_capability_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_capability_service.py index f48ee75597a5..4225aaaefe54 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_capability_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_capability_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -938,10 +943,9 @@ def test_device_capability_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +990,9 @@ def test_device_capability_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1028,9 @@ def test_device_capability_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1217,9 +1219,9 @@ def test_get_device_capability_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_device_capability - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_device_capability] = ( + mock_rpc + ) request = {} client.get_device_capability(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_category_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_category_service.py index 6729bafb0869..6803da523acc 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_category_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_category_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -934,10 +939,9 @@ def test_device_category_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -982,10 +986,9 @@ def test_device_category_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1021,10 +1024,9 @@ def test_device_category_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1212,9 +1214,9 @@ def test_get_device_category_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_device_category - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_device_category] = ( + mock_rpc + ) request = {} client.get_device_category(request) @@ -1394,9 +1396,9 @@ def test_list_device_categories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_device_categories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_device_categories] = ( + mock_rpc + ) request = {} client.list_device_categories(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_manufacturer_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_manufacturer_service.py index 4ba56cf1392e..bf0336c64bb3 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_manufacturer_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_manufacturer_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -947,10 +952,9 @@ def test_device_manufacturer_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -995,10 +999,9 @@ def test_device_manufacturer_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1034,10 +1037,9 @@ def test_device_manufacturer_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_entity_signals_mapping_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_entity_signals_mapping_service.py index 8823da6c4329..78beef296006 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_entity_signals_mapping_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_entity_signals_mapping_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.ads.admanager_v1.services.entity_signals_mapping_service import ( EntitySignalsMappingServiceClient, @@ -972,10 +977,9 @@ def test_entity_signals_mapping_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1020,10 +1024,9 @@ def test_entity_signals_mapping_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1062,9 @@ def test_entity_signals_mapping_service_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_geo_target_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_geo_target_service.py index 5e8cdbf62306..3b1821706c81 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_geo_target_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_geo_target_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -911,10 +916,9 @@ def test_geo_target_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +963,9 @@ def test_geo_target_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +1001,9 @@ def test_geo_target_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1359,9 +1361,9 @@ def test_list_geo_targets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_geo_targets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_geo_targets] = ( + mock_rpc + ) request = {} client.list_geo_targets(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_line_item_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_line_item_service.py index 1d672fe0a353..1d8115792785 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_line_item_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_line_item_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.money_pb2 as money_pb2 # type: ignore from google.ads.admanager_v1.services.line_item_service import ( LineItemServiceClient, @@ -918,10 +923,9 @@ def test_line_item_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -966,10 +970,9 @@ def test_line_item_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1005,10 +1008,9 @@ def test_line_item_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_carrier_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_carrier_service.py index c8e81d11099e..75bcf1ec42d9 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_carrier_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_carrier_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -932,10 +937,9 @@ def test_mobile_carrier_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -980,10 +984,9 @@ def test_mobile_carrier_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1022,9 @@ def test_mobile_carrier_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1210,9 +1212,9 @@ def test_get_mobile_carrier_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_mobile_carrier - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_mobile_carrier] = ( + mock_rpc + ) request = {} client.get_mobile_carrier(request) @@ -1390,9 +1392,9 @@ def test_list_mobile_carriers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_mobile_carriers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_mobile_carriers] = ( + mock_rpc + ) request = {} client.list_mobile_carriers(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_service.py index aa51a2bd5f91..d1cf55d78073 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -929,10 +934,9 @@ def test_mobile_device_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +981,9 @@ def test_mobile_device_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1019,9 @@ def test_mobile_device_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1205,9 +1207,9 @@ def test_get_mobile_device_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_mobile_device - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_mobile_device] = ( + mock_rpc + ) request = {} client.get_mobile_device(request) @@ -1385,9 +1387,9 @@ def test_list_mobile_devices_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_mobile_devices - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_mobile_devices] = ( + mock_rpc + ) request = {} client.list_mobile_devices(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_submodel_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_submodel_service.py index beb734e467c0..b25634011654 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_submodel_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_submodel_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -971,10 +976,9 @@ def test_mobile_device_submodel_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1023,9 @@ def test_mobile_device_submodel_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1061,9 @@ def test_mobile_device_submodel_service_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_network_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_network_service.py index 8752a70feb83..949259c49110 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_network_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_network_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -896,10 +901,9 @@ def test_network_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -944,10 +948,9 @@ def test_network_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +986,9 @@ def test_network_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_service.py index 1014e2e31523..ea5b4afdfd17 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -938,10 +943,9 @@ def test_operating_system_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +990,9 @@ def test_operating_system_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1028,9 @@ def test_operating_system_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1216,9 +1218,9 @@ def test_get_operating_system_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_operating_system - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_operating_system] = ( + mock_rpc + ) request = {} client.get_operating_system(request) @@ -1398,9 +1400,9 @@ def test_list_operating_systems_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_operating_systems - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_operating_systems] = ( + mock_rpc + ) request = {} client.list_operating_systems(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_version_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_version_service.py index 8b37cafe2363..c8e78da942c5 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_version_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_version_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -984,10 +989,9 @@ def test_operating_system_version_service_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1036,9 @@ def test_operating_system_version_service_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1071,10 +1074,9 @@ def test_operating_system_version_service_client_get_mtls_endpoint_and_cert_sour "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_order_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_order_service.py index 2ee410aa3cbd..b69ab4c204ad 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_order_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_order_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.order_service import ( OrderServiceClient, @@ -886,10 +891,9 @@ def test_order_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -934,10 +938,9 @@ def test_order_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +976,9 @@ def test_order_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_placement_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_placement_service.py index 682c49f05e13..9927c6d0113a 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_placement_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_placement_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.placement_service import ( PlacementServiceClient, @@ -917,10 +922,9 @@ def test_placement_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +969,9 @@ def test_placement_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1007,9 @@ def test_placement_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1625,9 +1627,9 @@ def test_create_placement_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_placement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_placement] = ( + mock_rpc + ) request = {} client.create_placement(request) @@ -1814,9 +1816,9 @@ def test_update_placement_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_placement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_placement] = ( + mock_rpc + ) request = {} client.update_placement(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_deal_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_deal_service.py index ae3cf0e4fdf9..c16bc4e25dba 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_deal_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_deal_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.money_pb2 as money_pb2 # type: ignore from google.ads.admanager_v1.services.private_auction_deal_service import ( PrivateAuctionDealServiceClient, @@ -958,10 +963,9 @@ def test_private_auction_deal_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1010,9 @@ def test_private_auction_deal_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1048,9 @@ def test_private_auction_deal_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_service.py index 3f171296920f..5e24177e1f65 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.private_auction_service import ( PrivateAuctionServiceClient, @@ -936,10 +941,9 @@ def test_private_auction_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +988,9 @@ def test_private_auction_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1026,9 @@ def test_private_auction_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1214,9 +1216,9 @@ def test_get_private_auction_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_private_auction - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_private_auction] = ( + mock_rpc + ) request = {} client.get_private_auction(request) @@ -1396,9 +1398,9 @@ def test_list_private_auctions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_private_auctions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_private_auctions] = ( + mock_rpc + ) request = {} client.list_private_auctions(request) @@ -1669,9 +1671,9 @@ def test_create_private_auction_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_private_auction - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_private_auction] = ( + mock_rpc + ) request = {} client.create_private_auction(request) @@ -1862,9 +1864,9 @@ def test_update_private_auction_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_private_auction - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_private_auction] = ( + mock_rpc + ) request = {} client.update_private_auction(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_programmatic_buyer_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_programmatic_buyer_service.py index c691053ae41c..2eaafb495eef 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_programmatic_buyer_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_programmatic_buyer_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -942,10 +947,9 @@ def test_programmatic_buyer_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -990,10 +994,9 @@ def test_programmatic_buyer_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1029,10 +1032,9 @@ def test_programmatic_buyer_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1221,9 +1223,9 @@ def test_get_programmatic_buyer_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_programmatic_buyer - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_programmatic_buyer] = ( + mock_rpc + ) request = {} client.get_programmatic_buyer(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_report_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_report_service.py index 8c15d3b74593..f729ebf12843 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_report_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_report_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +60,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.date_pb2 as date_pb2 # type: ignore -import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore -import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.ads.admanager_v1.services.report_service import ( ReportServiceClient, @@ -911,10 +911,9 @@ def test_report_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +958,9 @@ def test_report_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +996,9 @@ def test_report_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_role_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_role_service.py index 33b85c82231d..b597adcbf7a2 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_role_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_role_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -875,10 +880,9 @@ def test_role_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -923,10 +927,9 @@ def test_role_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -962,10 +965,9 @@ def test_role_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_site_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_site_service.py index 52685ab501cf..2019ef756959 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_site_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_site_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.site_service import ( SiteServiceClient, @@ -877,10 +882,9 @@ def test_site_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +929,9 @@ def test_site_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +967,9 @@ def test_site_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1761,9 +1763,9 @@ def test_batch_create_sites_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_sites] = ( + mock_rpc + ) request = {} client.batch_create_sites(request) @@ -2135,9 +2137,9 @@ def test_batch_update_sites_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_sites] = ( + mock_rpc + ) request = {} client.batch_update_sites(request) @@ -2336,9 +2338,9 @@ def test_batch_deactivate_sites_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_deactivate_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_deactivate_sites] = ( + mock_rpc + ) request = {} client.batch_deactivate_sites(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_taxonomy_category_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_taxonomy_category_service.py index b0da830a2c49..2956d8e900e7 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_taxonomy_category_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_taxonomy_category_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -939,10 +944,9 @@ def test_taxonomy_category_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -987,10 +991,9 @@ def test_taxonomy_category_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1029,9 @@ def test_taxonomy_category_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1218,9 +1220,9 @@ def test_get_taxonomy_category_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_taxonomy_category - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_taxonomy_category] = ( + mock_rpc + ) request = {} client.get_taxonomy_category(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_team_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_team_service.py index 877bff9ea0d9..5886b5c1fdde 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_team_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_team_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.ads.admanager_v1.services.team_service import ( TeamServiceClient, @@ -876,10 +881,9 @@ def test_team_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -924,10 +928,9 @@ def test_team_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -963,10 +966,9 @@ def test_team_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1760,9 +1762,9 @@ def test_batch_create_teams_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_teams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_teams] = ( + mock_rpc + ) request = {} client.batch_create_teams(request) @@ -2134,9 +2136,9 @@ def test_batch_update_teams_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_teams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_teams] = ( + mock_rpc + ) request = {} client.batch_update_teams(request) @@ -2334,9 +2336,9 @@ def test_batch_activate_teams_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_activate_teams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_activate_teams] = ( + mock_rpc + ) request = {} client.batch_activate_teams(request) @@ -2531,9 +2533,9 @@ def test_batch_deactivate_teams_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_deactivate_teams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_deactivate_teams] = ( + mock_rpc + ) request = {} client.batch_deactivate_teams(request) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_user_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_user_service.py index 4ca4648880fa..6be67f08aaa5 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_user_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_user_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -871,10 +876,9 @@ def test_user_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -919,10 +923,9 @@ def test_user_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +961,9 @@ def test_user_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/__init__.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/__init__.py index 94085fe79bae..27d459bc22cf 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/__init__.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.ingestion_service import ( IngestionServiceAsyncClient, IngestionServiceClient, diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/async_client.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/async_client.py index f716e5a30ea4..d545d500ec0f 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/async_client.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.datamanager_v1 import gapic_version as package_version @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IngestionServiceAsyncClient: The constructed client. """ - return IngestionServiceClient.from_service_account_info.__func__(IngestionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + IngestionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(IngestionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IngestionServiceAsyncClient: The constructed client. """ - return IngestionServiceClient.from_service_account_file.__func__(IngestionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + IngestionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(IngestionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/client.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/client.py index b0c173fe6db8..4fa517fa7a63 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/client.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.datamanager_v1 import gapic_version as package_version @@ -80,9 +80,7 @@ class IngestionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[IngestionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[IngestionServiceTransport]] _transport_registry["grpc"] = IngestionServiceGrpcTransport _transport_registry["grpc_asyncio"] = IngestionServiceGrpcAsyncIOTransport _transport_registry["rest"] = IngestionServiceRestTransport @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IngestionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IngestionServiceClient._read_environment_variables() + ) self._client_cert_source = IngestionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IngestionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/base.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/base.py index c35f4d76210b..f9643c305549 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/base.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.datamanager_v1 import gapic_version as package_version from google.ads.datamanager_v1.types import ingestion_service diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc.py index f474cbfa3a9d..00603b147821 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.ads.datamanager_v1.types import ingestion_service diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc_asyncio.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc_asyncio.py index 244dd0e87126..1712ec86a94b 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc_asyncio.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ads.datamanager_v1.types import ingestion_service diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/rest.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/rest.py index 0aa91d1efa3c..16456968ba8f 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/rest.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -464,9 +464,7 @@ def __call__( """ - http_options = ( - _BaseIngestionServiceRestTransport._BaseIngestAudienceMembers._get_http_options() - ) + http_options = _BaseIngestionServiceRestTransport._BaseIngestAudienceMembers._get_http_options() request, metadata = self._interceptor.pre_ingest_audience_members( request, metadata @@ -783,9 +781,7 @@ def __call__( """ - http_options = ( - _BaseIngestionServiceRestTransport._BaseRemoveAudienceMembers._get_http_options() - ) + http_options = _BaseIngestionServiceRestTransport._BaseRemoveAudienceMembers._get_http_options() request, metadata = self._interceptor.pre_remove_audience_members( request, metadata @@ -945,9 +941,7 @@ def __call__( """ - http_options = ( - _BaseIngestionServiceRestTransport._BaseRetrieveRequestStatus._get_http_options() - ) + http_options = _BaseIngestionServiceRestTransport._BaseRetrieveRequestStatus._get_http_options() request, metadata = self._interceptor.pre_retrieve_request_status( request, metadata diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/__init__.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/__init__.py index 88a8ff301d39..6786c28fbb18 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/__init__.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/__init__.py @@ -13,15 +13,45 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .audience import AudienceMember, MobileData, PairData -from .cart_data import CartData, Item -from .consent import Consent, ConsentStatus -from .destination import Destination, Product, ProductAccount -from .device_info import DeviceInfo -from .encryption_info import AwsWrappedKeyInfo, EncryptionInfo, GcpWrappedKeyInfo -from .error import ErrorReason -from .event import AdIdentifiers, CustomVariable, Event, EventParameter, EventSource -from .experimental_field import ExperimentalField +from .audience import ( + AudienceMember, + MobileData, + PairData, +) +from .cart_data import ( + CartData, + Item, +) +from .consent import ( + Consent, + ConsentStatus, +) +from .destination import ( + Destination, + Product, + ProductAccount, +) +from .device_info import ( + DeviceInfo, +) +from .encryption_info import ( + AwsWrappedKeyInfo, + EncryptionInfo, + GcpWrappedKeyInfo, +) +from .error import ( + ErrorReason, +) +from .event import ( + AdIdentifiers, + CustomVariable, + Event, + EventParameter, + EventSource, +) +from .experimental_field import ( + ExperimentalField, +) from .ingestion_service import ( Encoding, IngestAudienceMembersRequest, @@ -33,8 +63,12 @@ RetrieveRequestStatusRequest, RetrieveRequestStatusResponse, ) -from .item_parameter import ItemParameter -from .match_rate import MatchRateRange +from .item_parameter import ( + ItemParameter, +) +from .match_rate import ( + MatchRateRange, +) from .processing_errors import ( ErrorCount, ErrorInfo, @@ -43,9 +77,18 @@ WarningCount, WarningInfo, ) -from .request_status_per_destination import RequestStatusPerDestination -from .terms_of_service import TermsOfService, TermsOfServiceStatus -from .user_data import AddressInfo, UserData, UserIdentifier +from .request_status_per_destination import ( + RequestStatusPerDestination, +) +from .terms_of_service import ( + TermsOfService, + TermsOfServiceStatus, +) +from .user_data import ( + AddressInfo, + UserData, + UserIdentifier, +) from .user_properties import ( CustomerType, CustomerValueBucket, diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/cart_data.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/cart_data.py index 95b1b3b502cc..600b7e6d08f9 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/cart_data.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/cart_data.py @@ -114,12 +114,12 @@ class Item(proto.Message): proto.STRING, number=4, ) - additional_item_parameters: MutableSequence[ - item_parameter.ItemParameter - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=item_parameter.ItemParameter, + additional_item_parameters: MutableSequence[item_parameter.ItemParameter] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=item_parameter.ItemParameter, + ) ) diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/consent.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/consent.py index 0a418036393c..483aa35ff542 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/consent.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/consent.py @@ -40,6 +40,7 @@ class ConsentStatus(proto.Enum): CONSENT_DENIED (2): Denied. """ + CONSENT_STATUS_UNSPECIFIED = 0 CONSENT_GRANTED = 1 CONSENT_DENIED = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/destination.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/destination.py index aaa0c8e07660..e6a1e424cf9b 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/destination.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/destination.py @@ -46,6 +46,7 @@ class Product(proto.Enum): DATA_PARTNER (4): Data Partner. """ + _pb_options = {"deprecated": True} PRODUCT_UNSPECIFIED = 0 GOOGLE_ADS = 1 @@ -154,6 +155,7 @@ class AccountType(proto.Enum): GOOGLE_ANALYTICS_PROPERTY (5): Google Analytics. """ + ACCOUNT_TYPE_UNSPECIFIED = 0 GOOGLE_ADS = 1 DISPLAY_VIDEO_PARTNER = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/encryption_info.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/encryption_info.py index 425789f9f955..dbd45a28db44 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/encryption_info.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/encryption_info.py @@ -99,6 +99,7 @@ class KeyType(proto.Enum): XCHACHA20_POLY1305 (1): Algorithm XChaCha20-Poly1305 """ + KEY_TYPE_UNSPECIFIED = 0 XCHACHA20_POLY1305 = 1 @@ -152,6 +153,7 @@ class KeyType(proto.Enum): XCHACHA20_POLY1305 (1): Algorithm XChaCha20-Poly1305 """ + KEY_TYPE_UNSPECIFIED = 0 XCHACHA20_POLY1305 = 1 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/error.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/error.py index 3f04e40b7317..ab5b7d2e1bcf 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/error.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/error.py @@ -163,6 +163,7 @@ class ErrorReason(proto.Enum): TOO_MANY_ELEMENTS (51): Too many elements in a list in the request. """ + ERROR_REASON_UNSPECIFIED = 0 INTERNAL_ERROR = 1 DEADLINE_EXCEEDED = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/event.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/event.py index 9a3665014453..ec95d47d8bfe 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/event.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/event.py @@ -20,11 +20,11 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore -from google.ads.datamanager_v1.types import user_properties as gad_user_properties from google.ads.datamanager_v1.types import cart_data as gad_cart_data from google.ads.datamanager_v1.types import consent as gad_consent from google.ads.datamanager_v1.types import device_info, experimental_field from google.ads.datamanager_v1.types import user_data as gad_user_data +from google.ads.datamanager_v1.types import user_properties as gad_user_properties __protobuf__ = proto.module( package="google.ads.datamanager.v1", @@ -57,6 +57,7 @@ class EventSource(proto.Enum): OTHER (5): The event was generated from other sources. """ + EVENT_SOURCE_UNSPECIFIED = 0 WEB = 1 APP = 2 @@ -202,12 +203,12 @@ class Event(proto.Message): number=13, message="CustomVariable", ) - experimental_fields: MutableSequence[ - experimental_field.ExperimentalField - ] = proto.RepeatedField( - proto.MESSAGE, - number=14, - message=experimental_field.ExperimentalField, + experimental_fields: MutableSequence[experimental_field.ExperimentalField] = ( + proto.RepeatedField( + proto.MESSAGE, + number=14, + message=experimental_field.ExperimentalField, + ) ) user_properties: gad_user_properties.UserProperties = proto.Field( proto.MESSAGE, @@ -226,12 +227,12 @@ class Event(proto.Message): proto.STRING, number=18, ) - additional_event_parameters: MutableSequence[ - "EventParameter" - ] = proto.RepeatedField( - proto.MESSAGE, - number=19, - message="EventParameter", + additional_event_parameters: MutableSequence["EventParameter"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=19, + message="EventParameter", + ) ) diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/ingestion_service.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/ingestion_service.py index 59bc54572d12..b040f3bf3702 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/ingestion_service.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/ingestion_service.py @@ -19,15 +19,13 @@ import proto # type: ignore +from google.ads.datamanager_v1.types import audience, destination, event +from google.ads.datamanager_v1.types import consent as gad_consent from google.ads.datamanager_v1.types import encryption_info as gad_encryption_info from google.ads.datamanager_v1.types import ( request_status_per_destination as gad_request_status_per_destination, ) from google.ads.datamanager_v1.types import terms_of_service as gad_terms_of_service -from google.ads.datamanager_v1.types import audience -from google.ads.datamanager_v1.types import consent as gad_consent -from google.ads.datamanager_v1.types import destination -from google.ads.datamanager_v1.types import event __protobuf__ = proto.module( package="google.ads.datamanager.v1", @@ -57,6 +55,7 @@ class Encoding(proto.Enum): BASE64 (2): Base 64 encoding. """ + ENCODING_UNSPECIFIED = 0 HEX = 1 BASE64 = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/match_rate.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/match_rate.py index 8afe7729a3aa..d26e7028541d 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/match_rate.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/match_rate.py @@ -63,6 +63,7 @@ class MatchRateRange(proto.Enum): The match rate range is between 91% and 100% (in the interval ``[91, 100]``). """ + MATCH_RATE_RANGE_UNKNOWN = 0 MATCH_RATE_RANGE_NOT_ELIGIBLE = 1 MATCH_RATE_RANGE_LESS_THAN_20 = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/processing_errors.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/processing_errors.py index 771a3ba68b4a..220c32318965 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/processing_errors.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/processing_errors.py @@ -114,6 +114,7 @@ class ProcessingErrorReason(proto.Enum): ad identifier that isn't from the operating account's ads. """ + PROCESSING_ERROR_REASON_UNSPECIFIED = 0 PROCESSING_ERROR_REASON_INVALID_CUSTOM_VARIABLE = 1 PROCESSING_ERROR_REASON_CUSTOM_VARIABLE_NOT_ENABLED = 2 @@ -128,9 +129,7 @@ class ProcessingErrorReason(proto.Enum): PROCESSING_ERROR_REASON_INVALID_MERCHANT_ID = 11 PROCESSING_ERROR_REASON_INVALID_WBRAID = 12 PROCESSING_ERROR_REASON_INTERNAL_ERROR = 13 - PROCESSING_ERROR_REASON_DESTINATION_ACCOUNT_ENHANCED_CONVERSIONS_TERMS_NOT_SIGNED = ( - 14 - ) + PROCESSING_ERROR_REASON_DESTINATION_ACCOUNT_ENHANCED_CONVERSIONS_TERMS_NOT_SIGNED = 14 PROCESSING_ERROR_REASON_INVALID_EVENT = 15 PROCESSING_ERROR_REASON_INSUFFICIENT_MATCHED_TRANSACTIONS = 16 PROCESSING_ERROR_REASON_INSUFFICIENT_TRANSACTIONS = 17 @@ -177,6 +176,7 @@ class ProcessingWarningReason(proto.Enum): PROCESSING_WARNING_REASON_AWS_AUTH_FAILED (9): The system failed to authenticate with AWS. """ + PROCESSING_WARNING_REASON_UNSPECIFIED = 0 PROCESSING_WARNING_REASON_KEK_PERMISSION_DENIED = 1 PROCESSING_WARNING_REASON_DEK_DECRYPTION_ERROR = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/request_status_per_destination.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/request_status_per_destination.py index 2ca22c1bfd5c..ac72fd032b34 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/request_status_per_destination.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/request_status_per_destination.py @@ -82,6 +82,7 @@ class RequestStatus(proto.Enum): PARTIAL_SUCCESS (4): The request partially succeeded. """ + REQUEST_STATUS_UNKNOWN = 0 SUCCESS = 1 PROCESSING = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/terms_of_service.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/terms_of_service.py index 5f2867a13d09..8aee6397f942 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/terms_of_service.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/terms_of_service.py @@ -42,6 +42,7 @@ class TermsOfServiceStatus(proto.Enum): Status indicating the caller has chosen to reject the terms of service. """ + TERMS_OF_SERVICE_STATUS_UNSPECIFIED = 0 ACCEPTED = 1 REJECTED = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/user_properties.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/user_properties.py index 97fc71b0f1bb..f0b7a5227bc5 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/user_properties.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/user_properties.py @@ -45,6 +45,7 @@ class CustomerType(proto.Enum): The customer has re-engaged with the advertiser. """ + CUSTOMER_TYPE_UNSPECIFIED = 0 NEW = 1 RETURNING = 2 @@ -65,6 +66,7 @@ class CustomerValueBucket(proto.Enum): HIGH (3): The customer is high value. """ + CUSTOMER_VALUE_BUCKET_UNSPECIFIED = 0 LOW = 1 MEDIUM = 2 diff --git a/packages/google-ads-datamanager/mypy.ini b/packages/google-ads-datamanager/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-ads-datamanager/mypy.ini +++ b/packages/google-ads-datamanager/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-ads-datamanager/noxfile.py b/packages/google-ads-datamanager/noxfile.py index fdfc161e3f0d..a53edb64160d 100644 --- a/packages/google-ads-datamanager/noxfile.py +++ b/packages/google-ads-datamanager/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-ads-datamanager/tests/unit/gapic/datamanager_v1/test_ingestion_service.py b/packages/google-ads-datamanager/tests/unit/gapic/datamanager_v1/test_ingestion_service.py index 05781770415b..de9225606b74 100644 --- a/packages/google-ads-datamanager/tests/unit/gapic/datamanager_v1/test_ingestion_service.py +++ b/packages/google-ads-datamanager/tests/unit/gapic/datamanager_v1/test_ingestion_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.ads.datamanager_v1.services.ingestion_service import ( IngestionServiceAsyncClient, @@ -985,10 +990,9 @@ def test_ingestion_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1037,9 @@ def test_ingestion_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1072,10 +1075,9 @@ def test_ingestion_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1327,9 +1329,7 @@ def test_ingestion_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/__init__.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/__init__.py index b41c7babdbed..44dd8836caf9 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/__init__.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.marketingplatform_admin_service import ( MarketingplatformAdminServiceAsyncClient, MarketingplatformAdminServiceClient, diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/async_client.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/async_client.py index 1416ba2380b8..83ad7c16b9f2 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/async_client.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.marketingplatform_admin_v1alpha import gapic_version as package_version @@ -146,7 +146,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MarketingplatformAdminServiceAsyncClient: The constructed client. """ - return MarketingplatformAdminServiceClient.from_service_account_info.__func__(MarketingplatformAdminServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + MarketingplatformAdminServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + MarketingplatformAdminServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -162,7 +167,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MarketingplatformAdminServiceAsyncClient: The constructed client. """ - return MarketingplatformAdminServiceClient.from_service_account_file.__func__(MarketingplatformAdminServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + MarketingplatformAdminServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + MarketingplatformAdminServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -200,7 +210,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return MarketingplatformAdminServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return MarketingplatformAdminServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> MarketingplatformAdminServiceTransport: diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/client.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/client.py index a9d1fc9dca1d..41f284f10fab 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/client.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.marketingplatform_admin_v1alpha import gapic_version as package_version @@ -83,13 +83,11 @@ class MarketingplatformAdminServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MarketingplatformAdminServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MarketingplatformAdminServiceTransport]] _transport_registry["grpc"] = MarketingplatformAdminServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = MarketingplatformAdminServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + MarketingplatformAdminServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = MarketingplatformAdminServiceRestTransport def get_transport_class( @@ -684,11 +682,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MarketingplatformAdminServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MarketingplatformAdminServiceClient._read_environment_variables() + ) self._client_cert_source = ( MarketingplatformAdminServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -729,8 +725,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MarketingplatformAdminServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/pagers.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/pagers.py index f31c78893a3a..4bff178620ce 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/pagers.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -314,7 +314,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/__init__.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/__init__.py index fbabd2c13a8d..b9501e450264 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/__init__.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[MarketingplatformAdminServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[MarketingplatformAdminServiceTransport]] _transport_registry["grpc"] = MarketingplatformAdminServiceGrpcTransport _transport_registry["grpc_asyncio"] = MarketingplatformAdminServiceGrpcAsyncIOTransport _transport_registry["rest"] = MarketingplatformAdminServiceRestTransport diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/base.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/base.py index 80fa9f7ce9a2..4295be260e8c 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/base.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ads.marketingplatform_admin_v1alpha import gapic_version as package_version from google.ads.marketingplatform_admin_v1alpha.types import ( diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc.py index 9a42224e2cc9..84563e709161 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.ads.marketingplatform_admin_v1alpha.types import ( marketingplatform_admin, @@ -412,12 +412,12 @@ def find_sales_partner_managed_clients( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "find_sales_partner_managed_clients" not in self._stubs: - self._stubs[ - "find_sales_partner_managed_clients" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/FindSalesPartnerManagedClients", - request_serializer=marketingplatform_admin.FindSalesPartnerManagedClientsRequest.serialize, - response_deserializer=marketingplatform_admin.FindSalesPartnerManagedClientsResponse.deserialize, + self._stubs["find_sales_partner_managed_clients"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/FindSalesPartnerManagedClients", + request_serializer=marketingplatform_admin.FindSalesPartnerManagedClientsRequest.serialize, + response_deserializer=marketingplatform_admin.FindSalesPartnerManagedClientsResponse.deserialize, + ) ) return self._stubs["find_sales_partner_managed_clients"] @@ -444,12 +444,12 @@ def list_analytics_account_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_analytics_account_links" not in self._stubs: - self._stubs[ - "list_analytics_account_links" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/ListAnalyticsAccountLinks", - request_serializer=marketingplatform_admin.ListAnalyticsAccountLinksRequest.serialize, - response_deserializer=marketingplatform_admin.ListAnalyticsAccountLinksResponse.deserialize, + self._stubs["list_analytics_account_links"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/ListAnalyticsAccountLinks", + request_serializer=marketingplatform_admin.ListAnalyticsAccountLinksRequest.serialize, + response_deserializer=marketingplatform_admin.ListAnalyticsAccountLinksResponse.deserialize, + ) ) return self._stubs["list_analytics_account_links"] @@ -482,12 +482,12 @@ def create_analytics_account_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_analytics_account_link" not in self._stubs: - self._stubs[ - "create_analytics_account_link" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/CreateAnalyticsAccountLink", - request_serializer=marketingplatform_admin.CreateAnalyticsAccountLinkRequest.serialize, - response_deserializer=resources.AnalyticsAccountLink.deserialize, + self._stubs["create_analytics_account_link"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/CreateAnalyticsAccountLink", + request_serializer=marketingplatform_admin.CreateAnalyticsAccountLinkRequest.serialize, + response_deserializer=resources.AnalyticsAccountLink.deserialize, + ) ) return self._stubs["create_analytics_account_link"] @@ -517,12 +517,12 @@ def delete_analytics_account_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_analytics_account_link" not in self._stubs: - self._stubs[ - "delete_analytics_account_link" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/DeleteAnalyticsAccountLink", - request_serializer=marketingplatform_admin.DeleteAnalyticsAccountLinkRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_analytics_account_link"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/DeleteAnalyticsAccountLink", + request_serializer=marketingplatform_admin.DeleteAnalyticsAccountLinkRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_analytics_account_link"] @@ -548,12 +548,12 @@ def set_property_service_level( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_property_service_level" not in self._stubs: - self._stubs[ - "set_property_service_level" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/SetPropertyServiceLevel", - request_serializer=marketingplatform_admin.SetPropertyServiceLevelRequest.serialize, - response_deserializer=marketingplatform_admin.SetPropertyServiceLevelResponse.deserialize, + self._stubs["set_property_service_level"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/SetPropertyServiceLevel", + request_serializer=marketingplatform_admin.SetPropertyServiceLevelRequest.serialize, + response_deserializer=marketingplatform_admin.SetPropertyServiceLevelResponse.deserialize, + ) ) return self._stubs["set_property_service_level"] diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc_asyncio.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc_asyncio.py index baa55456959f..f498f35f75e3 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc_asyncio.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ads.marketingplatform_admin_v1alpha.types import ( marketingplatform_admin, @@ -421,12 +421,12 @@ def find_sales_partner_managed_clients( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "find_sales_partner_managed_clients" not in self._stubs: - self._stubs[ - "find_sales_partner_managed_clients" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/FindSalesPartnerManagedClients", - request_serializer=marketingplatform_admin.FindSalesPartnerManagedClientsRequest.serialize, - response_deserializer=marketingplatform_admin.FindSalesPartnerManagedClientsResponse.deserialize, + self._stubs["find_sales_partner_managed_clients"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/FindSalesPartnerManagedClients", + request_serializer=marketingplatform_admin.FindSalesPartnerManagedClientsRequest.serialize, + response_deserializer=marketingplatform_admin.FindSalesPartnerManagedClientsResponse.deserialize, + ) ) return self._stubs["find_sales_partner_managed_clients"] @@ -453,12 +453,12 @@ def list_analytics_account_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_analytics_account_links" not in self._stubs: - self._stubs[ - "list_analytics_account_links" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/ListAnalyticsAccountLinks", - request_serializer=marketingplatform_admin.ListAnalyticsAccountLinksRequest.serialize, - response_deserializer=marketingplatform_admin.ListAnalyticsAccountLinksResponse.deserialize, + self._stubs["list_analytics_account_links"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/ListAnalyticsAccountLinks", + request_serializer=marketingplatform_admin.ListAnalyticsAccountLinksRequest.serialize, + response_deserializer=marketingplatform_admin.ListAnalyticsAccountLinksResponse.deserialize, + ) ) return self._stubs["list_analytics_account_links"] @@ -491,12 +491,12 @@ def create_analytics_account_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_analytics_account_link" not in self._stubs: - self._stubs[ - "create_analytics_account_link" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/CreateAnalyticsAccountLink", - request_serializer=marketingplatform_admin.CreateAnalyticsAccountLinkRequest.serialize, - response_deserializer=resources.AnalyticsAccountLink.deserialize, + self._stubs["create_analytics_account_link"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/CreateAnalyticsAccountLink", + request_serializer=marketingplatform_admin.CreateAnalyticsAccountLinkRequest.serialize, + response_deserializer=resources.AnalyticsAccountLink.deserialize, + ) ) return self._stubs["create_analytics_account_link"] @@ -527,12 +527,12 @@ def delete_analytics_account_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_analytics_account_link" not in self._stubs: - self._stubs[ - "delete_analytics_account_link" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/DeleteAnalyticsAccountLink", - request_serializer=marketingplatform_admin.DeleteAnalyticsAccountLinkRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_analytics_account_link"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/DeleteAnalyticsAccountLink", + request_serializer=marketingplatform_admin.DeleteAnalyticsAccountLinkRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_analytics_account_link"] @@ -558,12 +558,12 @@ def set_property_service_level( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_property_service_level" not in self._stubs: - self._stubs[ - "set_property_service_level" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/SetPropertyServiceLevel", - request_serializer=marketingplatform_admin.SetPropertyServiceLevelRequest.serialize, - response_deserializer=marketingplatform_admin.SetPropertyServiceLevelResponse.deserialize, + self._stubs["set_property_service_level"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/SetPropertyServiceLevel", + request_serializer=marketingplatform_admin.SetPropertyServiceLevelRequest.serialize, + response_deserializer=marketingplatform_admin.SetPropertyServiceLevelResponse.deserialize, + ) ) return self._stubs["set_property_service_level"] diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest.py index 74c2f8fbb59b..804df0facb5e 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.ads.marketingplatform_admin_v1alpha.types import ( @@ -672,9 +672,7 @@ def __call__( """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseCreateAnalyticsAccountLink._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseCreateAnalyticsAccountLink._get_http_options() request, metadata = self._interceptor.pre_create_analytics_account_link( request, metadata @@ -743,11 +741,10 @@ def __call__( resp = self._interceptor.post_create_analytics_account_link(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_analytics_account_link_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_analytics_account_link_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -827,9 +824,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseDeleteAnalyticsAccountLink._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseDeleteAnalyticsAccountLink._get_http_options() request, metadata = self._interceptor.pre_delete_analytics_account_link( request, metadata @@ -947,15 +942,12 @@ def __call__( """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseFindSalesPartnerManagedClients._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseFindSalesPartnerManagedClients._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_find_sales_partner_managed_clients( - request, metadata + request, metadata = ( + self._interceptor.pre_find_sales_partner_managed_clients( + request, metadata + ) ) transcoded_request = _BaseMarketingplatformAdminServiceRestTransport._BaseFindSalesPartnerManagedClients._get_transcoded_request( http_options, request @@ -1023,11 +1015,10 @@ def __call__( resp = self._interceptor.post_find_sales_partner_managed_clients(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_find_sales_partner_managed_clients_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_find_sales_partner_managed_clients_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1112,9 +1103,7 @@ def __call__( """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseGetOrganization._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseGetOrganization._get_http_options() request, metadata = self._interceptor.pre_get_organization( request, metadata @@ -1265,9 +1254,7 @@ def __call__( """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseListAnalyticsAccountLinks._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseListAnalyticsAccountLinks._get_http_options() request, metadata = self._interceptor.pre_list_analytics_account_links( request, metadata @@ -1417,9 +1404,7 @@ def __call__( """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseListOrganizations._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseListOrganizations._get_http_options() request, metadata = self._interceptor.pre_list_organizations( request, metadata @@ -1574,9 +1559,7 @@ def __call__( """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseReportPropertyUsage._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseReportPropertyUsage._get_http_options() request, metadata = self._interceptor.pre_report_property_usage( request, metadata @@ -1737,9 +1720,7 @@ def __call__( """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseSetPropertyServiceLevel._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseSetPropertyServiceLevel._get_http_options() request, metadata = self._interceptor.pre_set_property_service_level( request, metadata @@ -1847,7 +1828,9 @@ def create_analytics_account_link( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateAnalyticsAccountLink(self._session, self._host, self._interceptor) # type: ignore + return self._CreateAnalyticsAccountLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_analytics_account_link( @@ -1857,7 +1840,9 @@ def delete_analytics_account_link( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteAnalyticsAccountLink(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteAnalyticsAccountLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def find_sales_partner_managed_clients( @@ -1868,7 +1853,9 @@ def find_sales_partner_managed_clients( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FindSalesPartnerManagedClients(self._session, self._host, self._interceptor) # type: ignore + return self._FindSalesPartnerManagedClients( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_organization( @@ -1889,7 +1876,9 @@ def list_analytics_account_links( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListAnalyticsAccountLinks(self._session, self._host, self._interceptor) # type: ignore + return self._ListAnalyticsAccountLinks( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_organizations( @@ -1922,7 +1911,9 @@ def set_property_service_level( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetPropertyServiceLevel(self._session, self._host, self._interceptor) # type: ignore + return self._SetPropertyServiceLevel( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest_base.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest_base.py index f5b655ca9084..7204336d70c9 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest_base.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ads.marketingplatform_admin_v1alpha.types import ( marketingplatform_admin, diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/marketingplatform_admin.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/marketingplatform_admin.py index ebe6d3009b09..b0d708f94975 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/marketingplatform_admin.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/marketingplatform_admin.py @@ -243,12 +243,12 @@ class ListAnalyticsAccountLinksResponse(proto.Message): def raw_page(self): return self - analytics_account_links: MutableSequence[ - resources.AnalyticsAccountLink - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.AnalyticsAccountLink, + analytics_account_links: MutableSequence[resources.AnalyticsAccountLink] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.AnalyticsAccountLink, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/resources.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/resources.py index 4dab191fa07d..f173b8732e31 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/resources.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/resources.py @@ -44,6 +44,7 @@ class LinkVerificationState(proto.Enum): The link is requested, but hasn't been approved by the product account admin. """ + LINK_VERIFICATION_STATE_UNSPECIFIED = 0 LINK_VERIFICATION_STATE_VERIFIED = 1 LINK_VERIFICATION_STATE_NOT_VERIFIED = 2 @@ -60,6 +61,7 @@ class AnalyticsServiceLevel(proto.Enum): ANALYTICS_SERVICE_LEVEL_360 (2): The premium version of Google Analytics. """ + ANALYTICS_SERVICE_LEVEL_UNSPECIFIED = 0 ANALYTICS_SERVICE_LEVEL_STANDARD = 1 ANALYTICS_SERVICE_LEVEL_360 = 2 @@ -78,6 +80,7 @@ class AnalyticsPropertyType(proto.Enum): ANALYTICS_PROPERTY_TYPE_ROLLUP (3): Google Analytics rollup property """ + ANALYTICS_PROPERTY_TYPE_UNSPECIFIED = 0 ANALYTICS_PROPERTY_TYPE_ORDINARY = 1 ANALYTICS_PROPERTY_TYPE_SUBPROPERTY = 2 diff --git a/packages/google-ads-marketingplatform-admin/mypy.ini b/packages/google-ads-marketingplatform-admin/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-ads-marketingplatform-admin/mypy.ini +++ b/packages/google-ads-marketingplatform-admin/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-ads-marketingplatform-admin/noxfile.py b/packages/google-ads-marketingplatform-admin/noxfile.py index 0a8f35d7b244..2d3dc5c62ae8 100644 --- a/packages/google-ads-marketingplatform-admin/noxfile.py +++ b/packages/google-ads-marketingplatform-admin/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-ads-marketingplatform-admin/tests/unit/gapic/marketingplatform_admin_v1alpha/test_marketingplatform_admin_service.py b/packages/google-ads-marketingplatform-admin/tests/unit/gapic/marketingplatform_admin_v1alpha/test_marketingplatform_admin_service.py index 519c29c1b380..d1fd5b2a49f4 100644 --- a/packages/google-ads-marketingplatform-admin/tests/unit/gapic/marketingplatform_admin_v1alpha/test_marketingplatform_admin_service.py +++ b/packages/google-ads-marketingplatform-admin/tests/unit/gapic/marketingplatform_admin_v1alpha/test_marketingplatform_admin_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -1048,10 +1053,9 @@ def test_marketingplatform_admin_service_client_get_mtls_endpoint_and_cert_sourc client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1096,10 +1100,9 @@ def test_marketingplatform_admin_service_client_get_mtls_endpoint_and_cert_sourc client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1135,10 +1138,9 @@ def test_marketingplatform_admin_service_client_get_mtls_endpoint_and_cert_sourc "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1403,9 +1405,7 @@ def test_marketingplatform_admin_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1517,9 +1517,9 @@ def test_get_organization_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_organization - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_organization] = ( + mock_rpc + ) request = {} client.get_organization(request) @@ -1851,9 +1851,9 @@ def test_list_organizations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_organizations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_organizations] = ( + mock_rpc + ) request = {} client.list_organizations(request) @@ -4090,9 +4090,9 @@ def test_report_property_usage_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_property_usage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_property_usage] = ( + mock_rpc + ) request = {} client.report_property_usage(request) @@ -4359,9 +4359,9 @@ def test_get_organization_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_organization - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_organization] = ( + mock_rpc + ) request = {} client.get_organization(request) @@ -4539,9 +4539,9 @@ def test_list_organizations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_organizations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_organizations] = ( + mock_rpc + ) request = {} client.list_organizations(request) @@ -5621,9 +5621,9 @@ def test_report_property_usage_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_property_usage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_property_usage] = ( + mock_rpc + ) request = {} client.report_property_usage(request) diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/__init__.py index 9688340148bc..554b46bdd983 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.generative_service import ( GenerativeServiceAsyncClient, GenerativeServiceClient, diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/async_client.py index 3e45acb1ff5f..f3d7a15e5ff3 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, Awaitable, @@ -31,13 +31,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1 import gapic_version as package_version @@ -48,9 +48,8 @@ from google.longrunning import operations_pb2 # type: ignore -from google.ai.generativelanguage_v1.types import content +from google.ai.generativelanguage_v1.types import content, generative_service from google.ai.generativelanguage_v1.types import content as gag_content -from google.ai.generativelanguage_v1.types import generative_service from .client import GenerativeServiceClient from .transports.base import DEFAULT_CLIENT_INFO, GenerativeServiceTransport @@ -120,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GenerativeServiceAsyncClient: The constructed client. """ - return GenerativeServiceClient.from_service_account_info.__func__(GenerativeServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GenerativeServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GenerativeServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GenerativeServiceAsyncClient: The constructed client. """ - return GenerativeServiceClient.from_service_account_file.__func__(GenerativeServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GenerativeServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(GenerativeServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/client.py index 5bc3dcac7b2a..f8ee1d5f4a0d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1 import gapic_version as package_version @@ -64,9 +64,8 @@ from google.longrunning import operations_pb2 # type: ignore -from google.ai.generativelanguage_v1.types import content +from google.ai.generativelanguage_v1.types import content, generative_service from google.ai.generativelanguage_v1.types import content as gag_content -from google.ai.generativelanguage_v1.types import generative_service from .transports.base import DEFAULT_CLIENT_INFO, GenerativeServiceTransport from .transports.grpc import GenerativeServiceGrpcTransport @@ -82,9 +81,7 @@ class GenerativeServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GenerativeServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GenerativeServiceTransport]] _transport_registry["grpc"] = GenerativeServiceGrpcTransport _transport_registry["grpc_asyncio"] = GenerativeServiceGrpcAsyncIOTransport _transport_registry["rest"] = GenerativeServiceRestTransport @@ -623,11 +620,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GenerativeServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GenerativeServiceClient._read_environment_variables() + ) self._client_cert_source = GenerativeServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -662,8 +657,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GenerativeServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/base.py index 62eb0ccd7d6f..610570f9e334 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1 import gapic_version as package_version from google.ai.generativelanguage_v1.types import generative_service @@ -322,13 +322,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc.py index bccb8dd9c309..867236a201ae 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1.types import generative_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc_asyncio.py index 73be0a1d1aaa..bbfc0cda4ffb 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1.types import generative_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/rest.py index b2c3671e4d67..b69bd7d87dce 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -616,9 +616,7 @@ def __call__( The response to a ``BatchEmbedContentsRequest``. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseBatchEmbedContents._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseBatchEmbedContents._get_http_options() request, metadata = self._interceptor.pre_batch_embed_contents( request, metadata @@ -931,9 +929,7 @@ def __call__( The response to an ``EmbedContentRequest``. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_http_options() request, metadata = self._interceptor.pre_embed_content(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_transcoded_request( @@ -1101,9 +1097,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGenerateContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGenerateContent._get_http_options() request, metadata = self._interceptor.pre_generate_content( request, metadata @@ -1274,9 +1268,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseStreamGenerateContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseStreamGenerateContent._get_http_options() request, metadata = self._interceptor.pre_stream_generate_content( request, metadata @@ -1477,9 +1469,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1597,9 +1587,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1714,9 +1702,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1855,9 +1841,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/async_client.py index a76d8be7ba3c..4b44d409c33b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1 import gapic_version as package_version @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_info.__func__(ModelServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ModelServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ModelServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_file.__func__(ModelServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ModelServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ModelServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/client.py index 411978fb7ad8..b165582fcad2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1 import gapic_version as package_version @@ -615,11 +615,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ModelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ModelServiceClient._read_environment_variables() + ) self._client_cert_source = ModelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -654,8 +652,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ModelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/pagers.py index 6c8c1af02a95..402b5b8cbf49 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/base.py index de8ca8fc7a90..70e99fb853b7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1 import gapic_version as package_version from google.ai.generativelanguage_v1.types import model, model_service @@ -222,13 +222,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc.py index 3fb9c479294e..28389c947afa 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1.types import model, model_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc_asyncio.py index 14d772f49f1d..55e393855f47 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1.types import model, model_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/rest.py index 9dd9959c1b3b..c7084942d166 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/__init__.py index ab08a24b6999..3aa277b3252a 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/__init__.py @@ -13,8 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .citation import CitationMetadata, CitationSource -from .content import Blob, Content, Modality, ModalityTokenCount, Part, VideoMetadata +from .citation import ( + CitationMetadata, + CitationSource, +) +from .content import ( + Blob, + Content, + Modality, + ModalityTokenCount, + Part, + VideoMetadata, +) from .generative_service import ( BatchEmbedContentsRequest, BatchEmbedContentsResponse, @@ -38,9 +48,19 @@ UrlContextMetadata, UrlMetadata, ) -from .model import Model -from .model_service import GetModelRequest, ListModelsRequest, ListModelsResponse -from .safety import HarmCategory, SafetyRating, SafetySetting +from .model import ( + Model, +) +from .model_service import ( + GetModelRequest, + ListModelsRequest, + ListModelsResponse, +) +from .safety import ( + HarmCategory, + SafetyRating, + SafetySetting, +) __all__ = ( "CitationMetadata", diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/content.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/content.py index c06063df329e..78aced31aff1 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/content.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/content.py @@ -50,6 +50,7 @@ class Modality(proto.Enum): DOCUMENT (5): Document, e.g. PDF. """ + MODALITY_UNSPECIFIED = 0 TEXT = 1 IMAGE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/generative_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/generative_service.py index 58a4e3170896..aee65cfad595 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/generative_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/generative_service.py @@ -20,9 +20,8 @@ import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.ai.generativelanguage_v1.types import citation +from google.ai.generativelanguage_v1.types import citation, safety from google.ai.generativelanguage_v1.types import content as gag_content -from google.ai.generativelanguage_v1.types import safety __protobuf__ = proto.module( package="google.ai.generativelanguage.v1", @@ -84,6 +83,7 @@ class TaskType(proto.Enum): Specifies that the given text will be used for code retrieval. """ + TASK_TYPE_UNSPECIFIED = 0 RETRIEVAL_QUERY = 1 RETRIEVAL_DOCUMENT = 2 @@ -439,6 +439,7 @@ class BlockReason(proto.Enum): Candidates blocked due to unsafe image generation content. """ + BLOCK_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -513,26 +514,26 @@ class UsageMetadata(proto.Message): proto.INT32, number=3, ) - prompt_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=gag_content.ModalityTokenCount, + prompt_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=gag_content.ModalityTokenCount, + ) ) - cache_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=gag_content.ModalityTokenCount, + cache_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=gag_content.ModalityTokenCount, + ) ) - candidates_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gag_content.ModalityTokenCount, + candidates_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gag_content.ModalityTokenCount, + ) ) tool_use_prompt_tokens_details: MutableSequence[ gag_content.ModalityTokenCount @@ -678,6 +679,7 @@ class FinishReason(proto.Enum): Model called too many tools consecutively, thus the system exited execution. """ + FINISH_REASON_UNSPECIFIED = 0 STOP = 1 MAX_TOKENS = 2 @@ -794,6 +796,7 @@ class UrlRetrievalStatus(proto.Enum): Url retrieval is failed because the content is unsafe. """ + URL_RETRIEVAL_STATUS_UNSPECIFIED = 0 URL_RETRIEVAL_STATUS_SUCCESS = 1 URL_RETRIEVAL_STATUS_ERROR = 2 @@ -1342,19 +1345,19 @@ class CountTokensResponse(proto.Message): proto.INT32, number=1, ) - prompt_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=gag_content.ModalityTokenCount, + prompt_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=gag_content.ModalityTokenCount, + ) ) - cache_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gag_content.ModalityTokenCount, + cache_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gag_content.ModalityTokenCount, + ) ) diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/safety.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/safety.py index 3ee9897b889f..8c35cca3db8e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/safety.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/safety.py @@ -67,6 +67,7 @@ class HarmCategory(proto.Enum): integrity. DEPRECATED: use enable_enhanced_civic_answers instead. """ + HARM_CATEGORY_UNSPECIFIED = 0 HARM_CATEGORY_DEROGATORY = 1 HARM_CATEGORY_TOXICITY = 2 @@ -121,6 +122,7 @@ class HarmProbability(proto.Enum): HIGH (4): Content has a high chance of being unsafe. """ + HARM_PROBABILITY_UNSPECIFIED = 0 NEGLIGIBLE = 1 LOW = 2 @@ -176,6 +178,7 @@ class HarmBlockThreshold(proto.Enum): OFF (5): Turn off the safety filter. """ + HARM_BLOCK_THRESHOLD_UNSPECIFIED = 0 BLOCK_LOW_AND_ABOVE = 1 BLOCK_MEDIUM_AND_ABOVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/__init__.py index f32046b1e50a..2c6521348b44 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cache_service import CacheServiceAsyncClient, CacheServiceClient from .services.discuss_service import DiscussServiceAsyncClient, DiscussServiceClient from .services.file_service import FileServiceAsyncClient, FileServiceClient diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/async_client.py index 9316e77be54e..168980eb63f3 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -44,18 +44,20 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_pb2 # type: ignore 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 google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.cache_service import pagers +from google.ai.generativelanguage_v1alpha.types import ( + cache_service, + cached_content, + content, +) from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content -from google.ai.generativelanguage_v1alpha.types import content from .client import CacheServiceClient from .transports.base import DEFAULT_CLIENT_INFO, CacheServiceTransport @@ -128,7 +130,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CacheServiceAsyncClient: The constructed client. """ - return CacheServiceClient.from_service_account_info.__func__(CacheServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CacheServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CacheServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +149,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CacheServiceAsyncClient: The constructed client. """ - return CacheServiceClient.from_service_account_file.__func__(CacheServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CacheServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CacheServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/client.py index c6c0ac5f281e..1e5037dbb092 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -61,18 +61,20 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore 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 google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.cache_service import pagers +from google.ai.generativelanguage_v1alpha.types import ( + cache_service, + cached_content, + content, +) from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content -from google.ai.generativelanguage_v1alpha.types import content from .transports.base import DEFAULT_CLIENT_INFO, CacheServiceTransport from .transports.grpc import CacheServiceGrpcTransport @@ -641,11 +643,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CacheServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CacheServiceClient._read_environment_variables() + ) self._client_cert_source = CacheServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -680,8 +680,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CacheServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/pagers.py index 3e071c9be7cb..71239b8fdcd8 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/base.py index 587f2b4a11e0..f1cba36ad441 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/base.py @@ -17,22 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1alpha import gapic_version as package_version +from google.ai.generativelanguage_v1alpha.types import cache_service, cached_content from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc.py index 28e6b9dbf0de..be19b0b09c22 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc.py @@ -16,25 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from google.ai.generativelanguage_v1alpha.types import cache_service, cached_content from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content from .base import DEFAULT_CLIENT_INFO, CacheServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc_asyncio.py index dc9eb5163cb1..4c44c9406267 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc_asyncio.py @@ -17,27 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1alpha.types import cache_service, cached_content from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content from .base import DEFAULT_CLIENT_INFO, CacheServiceTransport from .grpc import CacheServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest.py index 888052541066..7b78e7cee041 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest.py @@ -16,25 +16,24 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.ai.generativelanguage_v1alpha.types import cache_service, cached_content from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseCacheServiceRestTransport @@ -539,9 +538,7 @@ def __call__( """ - http_options = ( - _BaseCacheServiceRestTransport._BaseCreateCachedContent._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseCreateCachedContent._get_http_options() request, metadata = self._interceptor.pre_create_cached_content( request, metadata @@ -688,9 +685,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCacheServiceRestTransport._BaseDeleteCachedContent._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseDeleteCachedContent._get_http_options() request, metadata = self._interceptor.pre_delete_cached_content( request, metadata @@ -952,9 +947,7 @@ def __call__( Response with CachedContents list. """ - http_options = ( - _BaseCacheServiceRestTransport._BaseListCachedContents._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseListCachedContents._get_http_options() request, metadata = self._interceptor.pre_list_cached_contents( request, metadata @@ -1107,9 +1100,7 @@ def __call__( """ - http_options = ( - _BaseCacheServiceRestTransport._BaseUpdateCachedContent._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseUpdateCachedContent._get_http_options() request, metadata = self._interceptor.pre_update_cached_content( request, metadata diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest_base.py index b1650d010467..54dfecf52a12 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest_base.py @@ -17,16 +17,15 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.ai.generativelanguage_v1alpha.types import cache_service, cached_content from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content from .base import DEFAULT_CLIENT_INFO, CacheServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/async_client.py index 37b51ed4ca2d..ea36ce94a7d6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -118,7 +118,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_info.__func__(DiscussServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DiscussServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DiscussServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +137,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_file.__func__(DiscussServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DiscussServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DiscussServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/client.py index ab67d3357f23..80ba135a273b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -79,9 +79,7 @@ class DiscussServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DiscussServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DiscussServiceTransport]] _transport_registry["grpc"] = DiscussServiceGrpcTransport _transport_registry["grpc_asyncio"] = DiscussServiceGrpcAsyncIOTransport _transport_registry["rest"] = DiscussServiceRestTransport @@ -618,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DiscussServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DiscussServiceClient._read_environment_variables() + ) self._client_cert_source = DiscussServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -657,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DiscussServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/base.py index f64aab9c5d67..bcfbe14b8aef 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version from google.ai.generativelanguage_v1alpha.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc.py index 6089a7344940..4e9f8671a9e7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc_asyncio.py index 0ada5c47f361..2ca51546d8c2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/rest.py index ebbdc5714bc5..8bc496d6e83d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -401,9 +401,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() request, metadata = self._interceptor.pre_count_message_tokens( request, metadata @@ -561,9 +559,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() request, metadata = self._interceptor.pre_generate_message( request, metadata diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/async_client.py index c4f83bb92b44..47136c5f79d8 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.file_service import pagers from google.ai.generativelanguage_v1alpha.types import file, file_service @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FileServiceAsyncClient: The constructed client. """ - return FileServiceClient.from_service_account_info.__func__(FileServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + FileServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(FileServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FileServiceAsyncClient: The constructed client. """ - return FileServiceClient.from_service_account_file.__func__(FileServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + FileServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(FileServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/client.py index 2cf72490eaf1..69248864b065 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.file_service import pagers from google.ai.generativelanguage_v1alpha.types import file, file_service @@ -615,11 +615,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FileServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FileServiceClient._read_environment_variables() + ) self._client_cert_source = FileServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -654,8 +652,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FileServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/pagers.py index 7d371a7ec005..0f6b270fbeb9 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/base.py index b51e306e78a3..fdcb2e36359b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1alpha import gapic_version as package_version from google.ai.generativelanguage_v1alpha.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc.py index 98fc710c5c25..51aaaac0d30d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.ai.generativelanguage_v1alpha.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc_asyncio.py index bc354d94c5e7..b960b757abe4 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest.py index 8a3c3f3ec349..ad180c33d302 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.ai.generativelanguage_v1alpha.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest_base.py index 140cf23984bf..5db41dd04f9e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/async_client.py index c27a4f42f77d..4880851a2ce1 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -49,8 +49,11 @@ from google.longrunning import operations_pb2 # type: ignore -from google.ai.generativelanguage_v1alpha.types import generative_service, safety -from google.ai.generativelanguage_v1alpha.types import content +from google.ai.generativelanguage_v1alpha.types import ( + content, + generative_service, + safety, +) from google.ai.generativelanguage_v1alpha.types import content as gag_content from .client import GenerativeServiceClient @@ -125,7 +128,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GenerativeServiceAsyncClient: The constructed client. """ - return GenerativeServiceClient.from_service_account_info.__func__(GenerativeServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GenerativeServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GenerativeServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +147,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GenerativeServiceAsyncClient: The constructed client. """ - return GenerativeServiceClient.from_service_account_file.__func__(GenerativeServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GenerativeServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(GenerativeServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/client.py index 7bcdd61b6860..540ff8acbc8e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -65,8 +65,11 @@ from google.longrunning import operations_pb2 # type: ignore -from google.ai.generativelanguage_v1alpha.types import generative_service, safety -from google.ai.generativelanguage_v1alpha.types import content +from google.ai.generativelanguage_v1alpha.types import ( + content, + generative_service, + safety, +) from google.ai.generativelanguage_v1alpha.types import content as gag_content from .transports.base import DEFAULT_CLIENT_INFO, GenerativeServiceTransport @@ -83,9 +86,7 @@ class GenerativeServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GenerativeServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GenerativeServiceTransport]] _transport_registry["grpc"] = GenerativeServiceGrpcTransport _transport_registry["grpc_asyncio"] = GenerativeServiceGrpcAsyncIOTransport _transport_registry["rest"] = GenerativeServiceRestTransport @@ -639,11 +640,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GenerativeServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GenerativeServiceClient._read_environment_variables() + ) self._client_cert_source = GenerativeServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -678,8 +677,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GenerativeServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/base.py index ba835750e8a4..37178747ac27 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version from google.ai.generativelanguage_v1alpha.types import generative_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc.py index 58e2722e712f..01844baf2a90 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import generative_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc_asyncio.py index 11b7486809ec..4913a0d8e331 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import generative_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/rest.py index 72bc3a9407e2..aca07307507b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -630,9 +630,7 @@ def __call__( The response to a ``BatchEmbedContentsRequest``. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseBatchEmbedContents._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseBatchEmbedContents._get_http_options() request, metadata = self._interceptor.pre_batch_embed_contents( request, metadata @@ -964,9 +962,7 @@ def __call__( The response to an ``EmbedContentRequest``. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_http_options() request, metadata = self._interceptor.pre_embed_content(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_transcoded_request( @@ -1120,9 +1116,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGenerateAnswer._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGenerateAnswer._get_http_options() request, metadata = self._interceptor.pre_generate_answer(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseGenerateAnswer._get_transcoded_request( @@ -1290,9 +1284,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGenerateContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGenerateContent._get_http_options() request, metadata = self._interceptor.pre_generate_content( request, metadata @@ -1463,9 +1455,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseStreamGenerateContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseStreamGenerateContent._get_http_options() request, metadata = self._interceptor.pre_stream_generate_content( request, metadata @@ -1689,9 +1679,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1830,9 +1818,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/async_client.py index 684455d7a11e..c92a21853623 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -46,14 +46,13 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.model_service import pagers +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model from .client import ModelServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ModelServiceTransport @@ -121,7 +120,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_info.__func__(ModelServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ModelServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ModelServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +139,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_file.__func__(ModelServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ModelServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ModelServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/client.py index 4eaf31673890..3ac1b4aaf62e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -63,14 +63,13 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.model_service import pagers +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model from .transports.base import DEFAULT_CLIENT_INFO, ModelServiceTransport from .transports.grpc import ModelServiceGrpcTransport @@ -636,11 +635,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ModelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ModelServiceClient._read_environment_variables() + ) self._client_cert_source = ModelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -675,8 +672,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ModelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/pagers.py index 93f31ab417eb..eb988212bbf6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/base.py index 11448aa1078e..4dd5cd28d329 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1alpha import gapic_version as package_version +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc.py index a6e9e3b87d05..0e7ae105d85a 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc_asyncio.py index e2f64adc6d09..200c5378ef64 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc_asyncio.py @@ -17,25 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport from .grpc import ModelServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest.py index da3eee8b0e78..211c0db60e06 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseModelServiceRestTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest_base.py index f3bd6c5c3177..557100fb6191 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest_base.py @@ -17,14 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/async_client.py index 6c9e0d0544b2..004b590d02cc 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -44,13 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.permission_service import pagers +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service from .client import PermissionServiceClient from .transports.base import DEFAULT_CLIENT_INFO, PermissionServiceTransport @@ -120,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PermissionServiceAsyncClient: The constructed client. """ - return PermissionServiceClient.from_service_account_info.__func__(PermissionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PermissionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PermissionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PermissionServiceAsyncClient: The constructed client. """ - return PermissionServiceClient.from_service_account_file.__func__(PermissionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PermissionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PermissionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/client.py index 346c74371020..8599fa46e1b9 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -61,13 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.permission_service import pagers +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service from .transports.base import DEFAULT_CLIENT_INFO, PermissionServiceTransport from .transports.grpc import PermissionServiceGrpcTransport @@ -83,9 +82,7 @@ class PermissionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PermissionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PermissionServiceTransport]] _transport_registry["grpc"] = PermissionServiceGrpcTransport _transport_registry["grpc_asyncio"] = PermissionServiceGrpcAsyncIOTransport _transport_registry["rest"] = PermissionServiceRestTransport @@ -628,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PermissionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PermissionServiceClient._read_environment_variables() + ) self._client_cert_source = PermissionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PermissionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/pagers.py index 353548184a06..e5cf1b12b870 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/base.py index 94884673500e..e32a04cbf2dc 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1alpha import gapic_version as package_version +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc.py index ad504fbdae0a..433187a53863 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc_asyncio.py index 79012f0a61d2..63f6784464f5 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc_asyncio.py @@ -17,25 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport from .grpc import PermissionServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest.py index e2f8c2912ca3..567bf9b08c5c 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BasePermissionServiceRestTransport @@ -609,9 +608,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseCreatePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseCreatePermission._get_http_options() request, metadata = self._interceptor.pre_create_permission( request, metadata @@ -757,9 +754,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseDeletePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseDeletePermission._get_http_options() request, metadata = self._interceptor.pre_delete_permission( request, metadata @@ -894,9 +889,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseGetPermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseGetPermission._get_http_options() request, metadata = self._interceptor.pre_get_permission(request, metadata) transcoded_request = _BasePermissionServiceRestTransport._BaseGetPermission._get_transcoded_request( @@ -1041,9 +1034,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseListPermissions._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseListPermissions._get_http_options() request, metadata = self._interceptor.pre_list_permissions( request, metadata @@ -1192,9 +1183,7 @@ def __call__( Response from ``TransferOwnership``. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseTransferOwnership._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseTransferOwnership._get_http_options() request, metadata = self._interceptor.pre_transfer_ownership( request, metadata @@ -1370,9 +1359,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseUpdatePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseUpdatePermission._get_http_options() request, metadata = self._interceptor.pre_update_permission( request, metadata @@ -1582,9 +1569,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePermissionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1723,9 +1708,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BasePermissionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest_base.py index b54e4351222e..3c36f153f810 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest_base.py @@ -17,14 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/async_client.py index 4ce1225c6ba4..581ae4a7b901 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.types import prediction_service @@ -115,7 +115,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_info.__func__(PredictionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PredictionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PredictionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +134,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_file.__func__(PredictionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PredictionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PredictionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/client.py index 5619628a6fc1..93e177122c25 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.types import prediction_service @@ -80,9 +80,7 @@ class PredictionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PredictionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PredictionServiceTransport]] _transport_registry["grpc"] = PredictionServiceGrpcTransport _transport_registry["grpc_asyncio"] = PredictionServiceGrpcAsyncIOTransport _transport_registry["rest"] = PredictionServiceRestTransport @@ -619,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PredictionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PredictionServiceClient._read_environment_variables() + ) self._client_cert_source = PredictionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -658,8 +654,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PredictionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/base.py index 62dad853153b..84f4719fa1f8 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version from google.ai.generativelanguage_v1alpha.types import prediction_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc.py index 34281a3cbfd3..4f92c9e383b5 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import prediction_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc_asyncio.py index fbf6a4a446fb..6cf47c7823e0 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import prediction_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/rest.py index ebd400a229d5..e5b9b9b22e07 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -499,9 +499,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePredictionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePredictionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -640,9 +638,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BasePredictionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BasePredictionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/async_client.py index 0a671731c76b..a974a0e07227 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.retriever_service import pagers from google.ai.generativelanguage_v1alpha.types import retriever, retriever_service @@ -123,7 +123,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RetrieverServiceAsyncClient: The constructed client. """ - return RetrieverServiceClient.from_service_account_info.__func__(RetrieverServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + RetrieverServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(RetrieverServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +142,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RetrieverServiceAsyncClient: The constructed client. """ - return RetrieverServiceClient.from_service_account_file.__func__(RetrieverServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + RetrieverServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(RetrieverServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/client.py index 7f5dc9365a04..b3d91ffaa4ee 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.retriever_service import pagers from google.ai.generativelanguage_v1alpha.types import retriever, retriever_service @@ -82,9 +82,7 @@ class RetrieverServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RetrieverServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RetrieverServiceTransport]] _transport_registry["grpc"] = RetrieverServiceGrpcTransport _transport_registry["grpc_asyncio"] = RetrieverServiceGrpcAsyncIOTransport _transport_registry["rest"] = RetrieverServiceRestTransport @@ -660,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RetrieverServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RetrieverServiceClient._read_environment_variables() + ) self._client_cert_source = RetrieverServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -699,8 +695,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RetrieverServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/pagers.py index 04cde8d0c694..4012702a6c76 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/base.py index 2f5ae83024af..7089cd715a22 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1alpha import gapic_version as package_version from google.ai.generativelanguage_v1alpha.types import retriever, retriever_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc.py index fa550f2d26fc..1aad5afee930 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.ai.generativelanguage_v1alpha.types import retriever, retriever_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc_asyncio.py index 4efd2b3cd6f6..222a1c624fc6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import retriever, retriever_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest.py index 412484118cd8..00260c0ebcd4 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.ai.generativelanguage_v1alpha.types import retriever, retriever_service @@ -1246,9 +1246,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseBatchCreateChunks._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseBatchCreateChunks._get_http_options() request, metadata = self._interceptor.pre_batch_create_chunks( request, metadata @@ -1397,9 +1395,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseBatchDeleteChunks._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseBatchDeleteChunks._get_http_options() request, metadata = self._interceptor.pre_batch_delete_chunks( request, metadata @@ -1518,9 +1514,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseBatchUpdateChunks._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseBatchUpdateChunks._get_http_options() request, metadata = self._interceptor.pre_batch_update_chunks( request, metadata @@ -1980,9 +1974,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseCreateDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseCreateDocument._get_http_options() request, metadata = self._interceptor.pre_create_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseCreateDocument._get_transcoded_request( @@ -2337,9 +2329,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseDeleteDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseDeleteDocument._get_http_options() request, metadata = self._interceptor.pre_delete_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseDeleteDocument._get_transcoded_request( @@ -3193,9 +3183,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseListDocuments._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseListDocuments._get_http_options() request, metadata = self._interceptor.pre_list_documents(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseListDocuments._get_transcoded_request( @@ -3496,9 +3484,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseQueryDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseQueryDocument._get_http_options() request, metadata = self._interceptor.pre_query_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseQueryDocument._get_transcoded_request( @@ -3956,9 +3942,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseUpdateDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseUpdateDocument._get_http_options() request, metadata = self._interceptor.pre_update_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseUpdateDocument._get_transcoded_request( @@ -4426,9 +4410,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest_base.py index 82c9cf3885e6..6328b067535a 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.types import retriever, retriever_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/async_client.py index d894955d43c7..684f5e71382a 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -114,7 +114,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_info.__func__(TextServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + TextServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(TextServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +133,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_file.__func__(TextServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + TextServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(TextServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/client.py index 8cadd3871ba9..ccd9784700e8 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -616,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TextServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TextServiceClient._read_environment_variables() + ) self._client_cert_source = TextServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -655,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TextServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/base.py index cc2793bb396c..95697a1b96c0 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version from google.ai.generativelanguage_v1alpha.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc.py index c7df4e3818a2..ae8225915ed7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc_asyncio.py index dd70ea47c597..ba59257daf06 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/rest.py index 3ef2152e1798..b4a9f2e561e0 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/__init__.py index cdc32c4c9227..8e659c0a6717 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/__init__.py @@ -21,8 +21,13 @@ ListCachedContentsResponse, UpdateCachedContentRequest, ) -from .cached_content import CachedContent -from .citation import CitationMetadata, CitationSource +from .cached_content import ( + CachedContent, +) +from .citation import ( + CitationMetadata, + CitationSource, +) from .content import ( Blob, CodeExecution, @@ -53,7 +58,10 @@ Message, MessagePrompt, ) -from .file import File, VideoMetadata +from .file import ( + File, + VideoMetadata, +) from .file_service import ( CreateFileRequest, CreateFileResponse, @@ -101,7 +109,9 @@ TaskType, VoiceConfig, ) -from .model import Model +from .model import ( + Model, +) from .model_service import ( CreateTunedModelMetadata, CreateTunedModelRequest, @@ -114,7 +124,9 @@ ListTunedModelsResponse, UpdateTunedModelRequest, ) -from .permission import Permission +from .permission import ( + Permission, +) from .permission_service import ( CreatePermissionRequest, DeletePermissionRequest, @@ -125,7 +137,10 @@ TransferOwnershipResponse, UpdatePermissionRequest, ) -from .prediction_service import PredictRequest, PredictResponse +from .prediction_service import ( + PredictRequest, + PredictResponse, +) from .retriever import ( Chunk, ChunkData, diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/cache_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/cache_service.py index fa7a891114ff..00cea4440594 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/cache_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/cache_service.py @@ -84,12 +84,12 @@ class ListCachedContentsResponse(proto.Message): def raw_page(self): return self - cached_contents: MutableSequence[ - gag_cached_content.CachedContent - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gag_cached_content.CachedContent, + cached_contents: MutableSequence[gag_cached_content.CachedContent] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gag_cached_content.CachedContent, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/content.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/content.py index d600a2f9617d..5965414b115f 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/content.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/content.py @@ -66,6 +66,7 @@ class Type(proto.Enum): OBJECT (6): Object type. """ + TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -280,6 +281,7 @@ class Language(proto.Enum): Python >= 3.10, with numpy and simpy available. """ + LANGUAGE_UNSPECIFIED = 0 PYTHON = 1 @@ -326,6 +328,7 @@ class Outcome(proto.Enum): cancelled. There may or may not be a partial output present. """ + OUTCOME_UNSPECIFIED = 0 OUTCOME_OK = 1 OUTCOME_FAILED = 2 @@ -449,6 +452,7 @@ class Mode(proto.Enum): Run retrieval only when system decides it is necessary. """ + MODE_UNSPECIFIED = 0 MODE_DYNAMIC = 1 @@ -531,6 +535,7 @@ class Mode(proto.Enum): Model behavior is same as when not passing any function declarations. """ + MODE_UNSPECIFIED = 0 AUTO = 1 ANY = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/file.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/file.py index c80f13cfa94f..2aadedb27a2e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/file.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/file.py @@ -94,6 +94,7 @@ class State(proto.Enum): FAILED (10): File failed processing. """ + STATE_UNSPECIFIED = 0 PROCESSING = 1 ACTIVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/generative_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/generative_service.py index e27d44c9d460..a1dadec6ed33 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/generative_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/generative_service.py @@ -19,9 +19,8 @@ import proto # type: ignore -from google.ai.generativelanguage_v1alpha.types import citation +from google.ai.generativelanguage_v1alpha.types import citation, retriever, safety from google.ai.generativelanguage_v1alpha.types import content as gag_content -from google.ai.generativelanguage_v1alpha.types import retriever, safety __protobuf__ = proto.module( package="google.ai.generativelanguage.v1alpha", @@ -96,6 +95,7 @@ class TaskType(proto.Enum): Specifies that the given text will be used for fact verification. """ + TASK_TYPE_UNSPECIFIED = 0 RETRIEVAL_QUERY = 1 RETRIEVAL_DOCUMENT = 2 @@ -469,6 +469,7 @@ class Modality(proto.Enum): AUDIO (3): Indicates the model should return audio. """ + MODALITY_UNSPECIFIED = 0 TEXT = 1 IMAGE = 2 @@ -666,6 +667,7 @@ class BlockReason(proto.Enum): Candidates blocked due to unsafe image generation content. """ + BLOCK_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -833,6 +835,7 @@ class FinishReason(proto.Enum): Token generation stopped because generated images contain safety violations. """ + FINISH_REASON_UNSPECIFIED = 0 STOP = 1 MAX_TOKENS = 2 @@ -875,12 +878,12 @@ class FinishReason(proto.Enum): proto.INT32, number=7, ) - grounding_attributions: MutableSequence[ - "GroundingAttribution" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="GroundingAttribution", + grounding_attributions: MutableSequence["GroundingAttribution"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="GroundingAttribution", + ) ) grounding_metadata: "GroundingMetadata" = proto.Field( proto.MESSAGE, @@ -1385,6 +1388,7 @@ class AnswerStyle(proto.Enum): paragraph, multiple paragraphs, or bullet points, etc. """ + ANSWER_STYLE_UNSPECIFIED = 0 ABSTRACTIVE = 1 EXTRACTIVE = 2 @@ -1509,6 +1513,7 @@ class BlockReason(proto.Enum): OTHER (2): Input was blocked due to other reasons. """ + BLOCK_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -1906,12 +1911,12 @@ class BidiGenerateContentToolResponse(proto.Message): Optional. The response to the function calls. """ - function_responses: MutableSequence[ - gag_content.FunctionResponse - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gag_content.FunctionResponse, + function_responses: MutableSequence[gag_content.FunctionResponse] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gag_content.FunctionResponse, + ) ) diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/model_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/model_service.py index 2479cd30d64d..b73a2cdab277 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/model_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/model_service.py @@ -20,8 +20,8 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model from google.ai.generativelanguage_v1alpha.types import model +from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model __protobuf__ = proto.module( package="google.ai.generativelanguage.v1alpha", diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/permission.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/permission.py index e337fce9fbd0..6251850fc925 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/permission.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/permission.py @@ -90,6 +90,7 @@ class GranteeType(proto.Enum): Represents access to everyone. No extra information is required. """ + GRANTEE_TYPE_UNSPECIFIED = 0 USER = 1 GROUP = 2 @@ -110,6 +111,7 @@ class Role(proto.Enum): READER (3): Reader can use the resource. """ + ROLE_UNSPECIFIED = 0 OWNER = 1 WRITER = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/retriever.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/retriever.py index ec4e31d7d19d..a889910b88b0 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/retriever.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/retriever.py @@ -280,6 +280,7 @@ class Operator(proto.Enum): Supported by string only when ``CustomMetadata`` value type for the given key has a ``string_list_value``. """ + OPERATOR_UNSPECIFIED = 0 LESS = 1 LESS_EQUAL = 2 @@ -352,6 +353,7 @@ class State(proto.Enum): STATE_FAILED (10): ``Chunk`` failed processing. """ + STATE_UNSPECIFIED = 0 STATE_PENDING_PROCESSING = 1 STATE_ACTIVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/safety.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/safety.py index 09122f754c61..a893524b7b81 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/safety.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/safety.py @@ -68,6 +68,7 @@ class HarmCategory(proto.Enum): **Gemini** - Content that may be used to harm civic integrity. """ + HARM_CATEGORY_UNSPECIFIED = 0 HARM_CATEGORY_DEROGATORY = 1 HARM_CATEGORY_TOXICITY = 2 @@ -114,6 +115,7 @@ class BlockedReason(proto.Enum): Content was blocked, but the reason is uncategorized. """ + BLOCKED_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -199,6 +201,7 @@ class HarmProbability(proto.Enum): HIGH (4): Content has a high chance of being unsafe. """ + HARM_PROBABILITY_UNSPECIFIED = 0 NEGLIGIBLE = 1 LOW = 2 @@ -254,6 +257,7 @@ class HarmBlockThreshold(proto.Enum): OFF (5): Turn off the safety filter. """ + HARM_BLOCK_THRESHOLD_UNSPECIFIED = 0 BLOCK_LOW_AND_ABOVE = 1 BLOCK_MEDIUM_AND_ABOVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/tuned_model.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/tuned_model.py index b9c5f8f77486..e31fe8197fb3 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/tuned_model.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/tuned_model.py @@ -139,6 +139,7 @@ class State(proto.Enum): FAILED (3): The model failed to be created. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/__init__.py index 832e33cf40c4..9d5d480bd819 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cache_service import CacheServiceAsyncClient, CacheServiceClient from .services.discuss_service import DiscussServiceAsyncClient, DiscussServiceClient from .services.file_service import FileServiceAsyncClient, FileServiceClient diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/async_client.py index b99cb7d21a82..68972b87a6b8 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -44,18 +44,20 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_pb2 # type: ignore 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 google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.cache_service import pagers +from google.ai.generativelanguage_v1beta.types import ( + cache_service, + cached_content, + content, +) from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content -from google.ai.generativelanguage_v1beta.types import content from .client import CacheServiceClient from .transports.base import DEFAULT_CLIENT_INFO, CacheServiceTransport @@ -128,7 +130,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CacheServiceAsyncClient: The constructed client. """ - return CacheServiceClient.from_service_account_info.__func__(CacheServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CacheServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CacheServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +149,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CacheServiceAsyncClient: The constructed client. """ - return CacheServiceClient.from_service_account_file.__func__(CacheServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CacheServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CacheServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/client.py index 0f30ca77d3a8..67ec765d0526 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -61,18 +61,20 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore 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 google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.cache_service import pagers +from google.ai.generativelanguage_v1beta.types import ( + cache_service, + cached_content, + content, +) from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content -from google.ai.generativelanguage_v1beta.types import content from .transports.base import DEFAULT_CLIENT_INFO, CacheServiceTransport from .transports.grpc import CacheServiceGrpcTransport @@ -641,11 +643,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CacheServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CacheServiceClient._read_environment_variables() + ) self._client_cert_source = CacheServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -680,8 +680,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CacheServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/pagers.py index 96ccf7334f22..4683a61ff65c 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/base.py index 72a9cca3ce2f..716efa9f0b59 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/base.py @@ -17,22 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta import gapic_version as package_version +from google.ai.generativelanguage_v1beta.types import cache_service, cached_content from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -276,13 +275,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc.py index f9c83ffcdd8c..e57fdab3357f 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc.py @@ -16,25 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from google.ai.generativelanguage_v1beta.types import cache_service, cached_content from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content from .base import DEFAULT_CLIENT_INFO, CacheServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc_asyncio.py index 1fcb9ee13928..fc504ee02930 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc_asyncio.py @@ -17,27 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1beta.types import cache_service, cached_content from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content from .base import DEFAULT_CLIENT_INFO, CacheServiceTransport from .grpc import CacheServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest.py index cad9f6ecc16a..bc9bf95f02e6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest.py @@ -16,25 +16,24 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.ai.generativelanguage_v1beta.types import cache_service, cached_content from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseCacheServiceRestTransport @@ -585,9 +584,7 @@ def __call__( """ - http_options = ( - _BaseCacheServiceRestTransport._BaseCreateCachedContent._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseCreateCachedContent._get_http_options() request, metadata = self._interceptor.pre_create_cached_content( request, metadata @@ -734,9 +731,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCacheServiceRestTransport._BaseDeleteCachedContent._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseDeleteCachedContent._get_http_options() request, metadata = self._interceptor.pre_delete_cached_content( request, metadata @@ -998,9 +993,7 @@ def __call__( Response with CachedContents list. """ - http_options = ( - _BaseCacheServiceRestTransport._BaseListCachedContents._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseListCachedContents._get_http_options() request, metadata = self._interceptor.pre_list_cached_contents( request, metadata @@ -1153,9 +1146,7 @@ def __call__( """ - http_options = ( - _BaseCacheServiceRestTransport._BaseUpdateCachedContent._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseUpdateCachedContent._get_http_options() request, metadata = self._interceptor.pre_update_cached_content( request, metadata diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest_base.py index fcadba86da19..28933fdca796 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest_base.py @@ -17,16 +17,15 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.ai.generativelanguage_v1beta.types import cache_service, cached_content from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content from .base import DEFAULT_CLIENT_INFO, CacheServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/async_client.py index fb69a8f75736..e5312c72e11d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -118,7 +118,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_info.__func__(DiscussServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DiscussServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DiscussServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +137,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_file.__func__(DiscussServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DiscussServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DiscussServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/client.py index 25c3cef5e580..0b68cb56cdec 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class DiscussServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DiscussServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DiscussServiceTransport]] _transport_registry["grpc"] = DiscussServiceGrpcTransport _transport_registry["grpc_asyncio"] = DiscussServiceGrpcAsyncIOTransport _transport_registry["rest"] = DiscussServiceRestTransport @@ -618,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DiscussServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DiscussServiceClient._read_environment_variables() + ) self._client_cert_source = DiscussServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -657,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DiscussServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/base.py index c13b8f3131a1..1bb7a5000105 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version from google.ai.generativelanguage_v1beta.types import discuss_service @@ -244,13 +244,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc.py index c67b3071f851..8596345cd1d1 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc_asyncio.py index 45a93b84e891..b695c5238cb0 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/rest.py index d25b5061f1ad..bf6d5458d97d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -447,9 +447,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() request, metadata = self._interceptor.pre_count_message_tokens( request, metadata @@ -607,9 +605,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() request, metadata = self._interceptor.pre_generate_message( request, metadata @@ -782,9 +778,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -896,9 +890,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/async_client.py index bc25fd04ed5a..3506cf925eca 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.file_service import pagers from google.ai.generativelanguage_v1beta.types import file, file_service @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FileServiceAsyncClient: The constructed client. """ - return FileServiceClient.from_service_account_info.__func__(FileServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + FileServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(FileServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FileServiceAsyncClient: The constructed client. """ - return FileServiceClient.from_service_account_file.__func__(FileServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + FileServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(FileServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/client.py index 2d6b4a769681..b60d8b89cacf 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.file_service import pagers from google.ai.generativelanguage_v1beta.types import file, file_service @@ -615,11 +615,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FileServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FileServiceClient._read_environment_variables() + ) self._client_cert_source = FileServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -654,8 +652,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FileServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/pagers.py index 936db03f4e3b..dcf08ed4e59e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/base.py index b326a4d0c87c..5a640f4263d6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta import gapic_version as package_version from google.ai.generativelanguage_v1beta.types import file, file_service @@ -269,13 +269,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc.py index 306e2b0c0f39..466314c53dd2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.ai.generativelanguage_v1beta.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc_asyncio.py index 7daabc6fb68b..ebb43446a383 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest.py index 7fac0e1e4bee..eb834e9e42c2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.ai.generativelanguage_v1beta.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest_base.py index f54506ad8103..9716c19e68de 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/async_client.py index 32e26bf6bbbf..5907fb4de758 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -49,8 +49,11 @@ from google.longrunning import operations_pb2 # type: ignore -from google.ai.generativelanguage_v1beta.types import generative_service, safety -from google.ai.generativelanguage_v1beta.types import content +from google.ai.generativelanguage_v1beta.types import ( + content, + generative_service, + safety, +) from google.ai.generativelanguage_v1beta.types import content as gag_content from .client import GenerativeServiceClient @@ -125,7 +128,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GenerativeServiceAsyncClient: The constructed client. """ - return GenerativeServiceClient.from_service_account_info.__func__(GenerativeServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GenerativeServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GenerativeServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +147,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GenerativeServiceAsyncClient: The constructed client. """ - return GenerativeServiceClient.from_service_account_file.__func__(GenerativeServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GenerativeServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(GenerativeServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/client.py index d63d617683b9..42e70b35a2e3 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -65,8 +65,11 @@ from google.longrunning import operations_pb2 # type: ignore -from google.ai.generativelanguage_v1beta.types import generative_service, safety -from google.ai.generativelanguage_v1beta.types import content +from google.ai.generativelanguage_v1beta.types import ( + content, + generative_service, + safety, +) from google.ai.generativelanguage_v1beta.types import content as gag_content from .transports.base import DEFAULT_CLIENT_INFO, GenerativeServiceTransport @@ -83,9 +86,7 @@ class GenerativeServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GenerativeServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GenerativeServiceTransport]] _transport_registry["grpc"] = GenerativeServiceGrpcTransport _transport_registry["grpc_asyncio"] = GenerativeServiceGrpcAsyncIOTransport _transport_registry["rest"] = GenerativeServiceRestTransport @@ -639,11 +640,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GenerativeServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GenerativeServiceClient._read_environment_variables() + ) self._client_cert_source = GenerativeServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -678,8 +677,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GenerativeServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/base.py index a68b9cc5c925..fe97259b4ea1 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version from google.ai.generativelanguage_v1beta.types import generative_service @@ -365,13 +365,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc.py index 572e133e617e..b2f27e3e6867 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import generative_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc_asyncio.py index ee8921cee45c..296cbd7a25b7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import generative_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/rest.py index ae4804cac76f..495d090e0bd1 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -676,9 +676,7 @@ def __call__( The response to a ``BatchEmbedContentsRequest``. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseBatchEmbedContents._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseBatchEmbedContents._get_http_options() request, metadata = self._interceptor.pre_batch_embed_contents( request, metadata @@ -1010,9 +1008,7 @@ def __call__( The response to an ``EmbedContentRequest``. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_http_options() request, metadata = self._interceptor.pre_embed_content(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_transcoded_request( @@ -1166,9 +1162,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGenerateAnswer._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGenerateAnswer._get_http_options() request, metadata = self._interceptor.pre_generate_answer(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseGenerateAnswer._get_transcoded_request( @@ -1336,9 +1330,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGenerateContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGenerateContent._get_http_options() request, metadata = self._interceptor.pre_generate_content( request, metadata @@ -1509,9 +1501,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseStreamGenerateContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseStreamGenerateContent._get_http_options() request, metadata = self._interceptor.pre_stream_generate_content( request, metadata @@ -1733,9 +1723,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1848,9 +1836,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1965,9 +1951,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2106,9 +2090,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/async_client.py index ce2a1b68978f..e193eebe7490 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -46,14 +46,13 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.model_service import pagers +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model from .client import ModelServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ModelServiceTransport @@ -121,7 +120,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_info.__func__(ModelServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ModelServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ModelServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +139,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_file.__func__(ModelServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ModelServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ModelServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/client.py index d36e9759d09a..0214f443f01f 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -63,14 +63,13 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.model_service import pagers +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model from .transports.base import DEFAULT_CLIENT_INFO, ModelServiceTransport from .transports.grpc import ModelServiceGrpcTransport @@ -636,11 +635,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ModelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ModelServiceClient._read_environment_variables() + ) self._client_cert_source = ModelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -675,8 +672,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ModelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/pagers.py index f688265b42e6..1ab764385e69 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/base.py index 412fe51d41b4..bd3a40263803 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta import gapic_version as package_version +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -366,13 +365,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc.py index 48699f5e9fe2..4ec8f4e8d2a2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc_asyncio.py index 34a159ed830d..3eba6c7a5a27 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc_asyncio.py @@ -17,25 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport from .grpc import ModelServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest.py index 867a5e1bab81..7b6a568a88e3 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseModelServiceRestTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest_base.py index 0a5e592d9e14..72703a369cae 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest_base.py @@ -17,14 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/async_client.py index a4617bf384bc..20ad604ff73e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -44,13 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.permission_service import pagers +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service from .client import PermissionServiceClient from .transports.base import DEFAULT_CLIENT_INFO, PermissionServiceTransport @@ -120,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PermissionServiceAsyncClient: The constructed client. """ - return PermissionServiceClient.from_service_account_info.__func__(PermissionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PermissionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PermissionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PermissionServiceAsyncClient: The constructed client. """ - return PermissionServiceClient.from_service_account_file.__func__(PermissionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PermissionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PermissionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/client.py index 125f816142c1..02c98a0fa3f4 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -61,13 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.permission_service import pagers +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service from .transports.base import DEFAULT_CLIENT_INFO, PermissionServiceTransport from .transports.grpc import PermissionServiceGrpcTransport @@ -83,9 +82,7 @@ class PermissionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PermissionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PermissionServiceTransport]] _transport_registry["grpc"] = PermissionServiceGrpcTransport _transport_registry["grpc_asyncio"] = PermissionServiceGrpcAsyncIOTransport _transport_registry["rest"] = PermissionServiceRestTransport @@ -628,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PermissionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PermissionServiceClient._read_environment_variables() + ) self._client_cert_source = PermissionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PermissionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/pagers.py index 3fd5c4d66bce..84a2a5823902 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/base.py index fa2d842f2a3b..e61c1f04da79 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta import gapic_version as package_version +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -330,13 +329,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc.py index 533579a41fb6..2b1eab39784d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc_asyncio.py index 21e1b29cf2b3..e0704ff31d27 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc_asyncio.py @@ -17,25 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport from .grpc import PermissionServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest.py index 7ef3a13d7ac0..f3613b84d1e0 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BasePermissionServiceRestTransport @@ -655,9 +654,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseCreatePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseCreatePermission._get_http_options() request, metadata = self._interceptor.pre_create_permission( request, metadata @@ -803,9 +800,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseDeletePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseDeletePermission._get_http_options() request, metadata = self._interceptor.pre_delete_permission( request, metadata @@ -940,9 +935,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseGetPermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseGetPermission._get_http_options() request, metadata = self._interceptor.pre_get_permission(request, metadata) transcoded_request = _BasePermissionServiceRestTransport._BaseGetPermission._get_transcoded_request( @@ -1087,9 +1080,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseListPermissions._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseListPermissions._get_http_options() request, metadata = self._interceptor.pre_list_permissions( request, metadata @@ -1238,9 +1229,7 @@ def __call__( Response from ``TransferOwnership``. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseTransferOwnership._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseTransferOwnership._get_http_options() request, metadata = self._interceptor.pre_transfer_ownership( request, metadata @@ -1416,9 +1405,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseUpdatePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseUpdatePermission._get_http_options() request, metadata = self._interceptor.pre_update_permission( request, metadata @@ -1626,9 +1613,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1741,9 +1726,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1858,9 +1841,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePermissionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1999,9 +1980,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BasePermissionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest_base.py index 3c52516d595e..0cf4622f984f 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest_base.py @@ -17,14 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/async_client.py index e5739b27f492..87e32776ce84 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -46,8 +46,8 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta.types import prediction_service @@ -117,7 +117,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_info.__func__(PredictionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PredictionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PredictionServiceAsyncClient, 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: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_file.__func__(PredictionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PredictionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PredictionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/client.py index e7cad7fbd504..6a82f24d5410 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -63,8 +63,8 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta.types import prediction_service @@ -82,9 +82,7 @@ class PredictionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PredictionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PredictionServiceTransport]] _transport_registry["grpc"] = PredictionServiceGrpcTransport _transport_registry["grpc_asyncio"] = PredictionServiceGrpcAsyncIOTransport _transport_registry["rest"] = PredictionServiceRestTransport @@ -621,11 +619,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PredictionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PredictionServiceClient._read_environment_variables() + ) self._client_cert_source = PredictionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -660,8 +656,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PredictionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/base.py index f1bb8f5a14c7..c32c8839253c 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version from google.ai.generativelanguage_v1beta.types import prediction_service @@ -228,13 +228,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc.py index 814af605894a..8cd823435934 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import prediction_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc_asyncio.py index 18a459b67a5f..9e5ec35ee622 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import prediction_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/rest.py index 5d8c3740822b..194380b6a3ee 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -672,9 +672,7 @@ def __call__( """ - http_options = ( - _BasePredictionServiceRestTransport._BasePredictLongRunning._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BasePredictLongRunning._get_http_options() request, metadata = self._interceptor.pre_predict_long_running( request, metadata @@ -842,9 +840,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePredictionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -957,9 +953,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePredictionServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1074,9 +1068,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePredictionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePredictionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1215,9 +1207,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BasePredictionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BasePredictionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/async_client.py index bac1ce717c07..4dd9bf793817 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.retriever_service import pagers from google.ai.generativelanguage_v1beta.types import retriever, retriever_service @@ -123,7 +123,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RetrieverServiceAsyncClient: The constructed client. """ - return RetrieverServiceClient.from_service_account_info.__func__(RetrieverServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + RetrieverServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(RetrieverServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +142,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RetrieverServiceAsyncClient: The constructed client. """ - return RetrieverServiceClient.from_service_account_file.__func__(RetrieverServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + RetrieverServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(RetrieverServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/client.py index 75dada678832..75997e6b6d77 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.retriever_service import pagers from google.ai.generativelanguage_v1beta.types import retriever, retriever_service @@ -82,9 +82,7 @@ class RetrieverServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RetrieverServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RetrieverServiceTransport]] _transport_registry["grpc"] = RetrieverServiceGrpcTransport _transport_registry["grpc_asyncio"] = RetrieverServiceGrpcAsyncIOTransport _transport_registry["rest"] = RetrieverServiceRestTransport @@ -660,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RetrieverServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RetrieverServiceClient._read_environment_variables() + ) self._client_cert_source = RetrieverServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -699,8 +695,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RetrieverServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/pagers.py index 01502f265827..105be9d07d77 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/base.py index d5bcec1ee84c..efdc1b5af711 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta import gapic_version as package_version from google.ai.generativelanguage_v1beta.types import retriever, retriever_service @@ -638,13 +638,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc.py index 3a166803734f..5cd2b62688c6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.ai.generativelanguage_v1beta.types import retriever, retriever_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc_asyncio.py index 9d906eb20690..b415fc3b10c8 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import retriever, retriever_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest.py index 945d4e378de6..6ce456b39f06 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.ai.generativelanguage_v1beta.types import retriever, retriever_service @@ -1292,9 +1292,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseBatchCreateChunks._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseBatchCreateChunks._get_http_options() request, metadata = self._interceptor.pre_batch_create_chunks( request, metadata @@ -1443,9 +1441,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseBatchDeleteChunks._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseBatchDeleteChunks._get_http_options() request, metadata = self._interceptor.pre_batch_delete_chunks( request, metadata @@ -1564,9 +1560,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseBatchUpdateChunks._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseBatchUpdateChunks._get_http_options() request, metadata = self._interceptor.pre_batch_update_chunks( request, metadata @@ -2026,9 +2020,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseCreateDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseCreateDocument._get_http_options() request, metadata = self._interceptor.pre_create_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseCreateDocument._get_transcoded_request( @@ -2383,9 +2375,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseDeleteDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseDeleteDocument._get_http_options() request, metadata = self._interceptor.pre_delete_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseDeleteDocument._get_transcoded_request( @@ -3239,9 +3229,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseListDocuments._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseListDocuments._get_http_options() request, metadata = self._interceptor.pre_list_documents(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseListDocuments._get_transcoded_request( @@ -3542,9 +3530,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseQueryDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseQueryDocument._get_http_options() request, metadata = self._interceptor.pre_query_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseQueryDocument._get_transcoded_request( @@ -4002,9 +3988,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseUpdateDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseUpdateDocument._get_http_options() request, metadata = self._interceptor.pre_update_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseUpdateDocument._get_transcoded_request( @@ -4330,9 +4314,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -4445,9 +4427,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -4702,9 +4682,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest_base.py index 6e46fe8d1d56..b1c6bd0f3e2b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta.types import retriever, retriever_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/async_client.py index 1e4362c86c78..295fab4c4e01 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -114,7 +114,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_info.__func__(TextServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + TextServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(TextServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +133,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_file.__func__(TextServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + TextServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(TextServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/client.py index b6829c906687..b48f642e2bbc 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -616,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TextServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TextServiceClient._read_environment_variables() + ) self._client_cert_source = TextServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -655,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TextServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/base.py index 7c4bd96748ac..d08863e417d5 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version from google.ai.generativelanguage_v1beta.types import text_service @@ -295,13 +295,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc.py index 741421b1e6d0..8245b1aeb150 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc_asyncio.py index 046f02e4d0fd..38c85cd02c91 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/rest.py index 78f7ff669496..9a81ebabd11e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/__init__.py index 1e999f2f54b0..d0a03d5b83b0 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/__init__.py @@ -21,8 +21,13 @@ ListCachedContentsResponse, UpdateCachedContentRequest, ) -from .cached_content import CachedContent -from .citation import CitationMetadata, CitationSource +from .cached_content import ( + CachedContent, +) +from .citation import ( + CitationMetadata, + CitationSource, +) from .content import ( Blob, CodeExecution, @@ -62,7 +67,10 @@ Message, MessagePrompt, ) -from .file import File, VideoFileMetadata +from .file import ( + File, + VideoFileMetadata, +) from .file_service import ( CreateFileRequest, CreateFileResponse, @@ -126,7 +134,9 @@ UsageMetadata, VoiceConfig, ) -from .model import Model +from .model import ( + Model, +) from .model_service import ( CreateTunedModelMetadata, CreateTunedModelRequest, @@ -139,7 +149,9 @@ ListTunedModelsResponse, UpdateTunedModelRequest, ) -from .permission import Permission +from .permission import ( + Permission, +) from .permission_service import ( CreatePermissionRequest, DeletePermissionRequest, diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/cache_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/cache_service.py index 360d642ca5a9..65fdee002acc 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/cache_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/cache_service.py @@ -84,12 +84,12 @@ class ListCachedContentsResponse(proto.Message): def raw_page(self): return self - cached_contents: MutableSequence[ - gag_cached_content.CachedContent - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gag_cached_content.CachedContent, + cached_contents: MutableSequence[gag_cached_content.CachedContent] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gag_cached_content.CachedContent, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/content.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/content.py index 5b55cc4cafef..07cec4a0bec6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/content.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/content.py @@ -80,6 +80,7 @@ class Type(proto.Enum): NULL (7): Null type. """ + TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -107,6 +108,7 @@ class Modality(proto.Enum): DOCUMENT (5): Document, e.g. PDF. """ + MODALITY_UNSPECIFIED = 0 TEXT = 1 IMAGE = 2 @@ -448,6 +450,7 @@ class Language(proto.Enum): Python >= 3.10, with numpy and simpy available. """ + LANGUAGE_UNSPECIFIED = 0 PYTHON = 1 @@ -494,6 +497,7 @@ class Outcome(proto.Enum): cancelled. There may or may not be a partial output present. """ + OUTCOME_UNSPECIFIED = 0 OUTCOME_OK = 1 OUTCOME_FAILED = 2 @@ -609,6 +613,7 @@ class Environment(proto.Enum): ENVIRONMENT_BROWSER (1): Operates in a web browser. """ + ENVIRONMENT_UNSPECIFIED = 0 ENVIRONMENT_BROWSER = 1 @@ -800,6 +805,7 @@ class Mode(proto.Enum): Run retrieval only when system decides it is necessary. """ + MODE_UNSPECIFIED = 0 MODE_DYNAMIC = 1 @@ -919,6 +925,7 @@ class Mode(proto.Enum): "allowed_function_names", else the predicted function call will be any one of the provided "function_declarations". """ + MODE_UNSPECIFIED = 0 AUTO = 1 ANY = 2 @@ -1025,6 +1032,7 @@ class Behavior(proto.Enum): available while maintaining the conversation between the user and the model. """ + UNSPECIFIED = 0 BLOCKING = 1 NON_BLOCKING = 2 @@ -1176,6 +1184,7 @@ class Scheduling(proto.Enum): interrupt ongoing generation and prompt to generate output. """ + SCHEDULING_UNSPECIFIED = 0 SILENT = 1 WHEN_IDLE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/file.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/file.py index 217ec5ad3bab..e01aba255fa4 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/file.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/file.py @@ -98,6 +98,7 @@ class State(proto.Enum): FAILED (10): File failed processing. """ + STATE_UNSPECIFIED = 0 PROCESSING = 1 ACTIVE = 2 @@ -117,6 +118,7 @@ class Source(proto.Enum): Indicates the file is a registered, i.e. a Google Cloud Storage file. """ + SOURCE_UNSPECIFIED = 0 UPLOADED = 1 GENERATED = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/generative_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/generative_service.py index 00d97c7ed86b..d0baf328f248 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/generative_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/generative_service.py @@ -21,9 +21,8 @@ import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.ai.generativelanguage_v1beta.types import citation +from google.ai.generativelanguage_v1beta.types import citation, retriever, safety from google.ai.generativelanguage_v1beta.types import content as gag_content -from google.ai.generativelanguage_v1beta.types import retriever, safety __protobuf__ = proto.module( package="google.ai.generativelanguage.v1beta", @@ -115,6 +114,7 @@ class TaskType(proto.Enum): Specifies that the given text will be used for code retrieval. """ + TASK_TYPE_UNSPECIFIED = 0 RETRIEVAL_QUERY = 1 RETRIEVAL_DOCUMENT = 2 @@ -674,6 +674,7 @@ class Modality(proto.Enum): AUDIO (3): Indicates the model should return audio. """ + MODALITY_UNSPECIFIED = 0 TEXT = 1 IMAGE = 2 @@ -693,6 +694,7 @@ class MediaResolution(proto.Enum): Media resolution set to high (zoomed reframing with 256 tokens). """ + MEDIA_RESOLUTION_UNSPECIFIED = 0 MEDIA_RESOLUTION_LOW = 1 MEDIA_RESOLUTION_MEDIUM = 2 @@ -925,6 +927,7 @@ class BlockReason(proto.Enum): Candidates blocked due to unsafe image generation content. """ + BLOCK_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -1006,26 +1009,26 @@ class UsageMetadata(proto.Message): proto.INT32, number=3, ) - prompt_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=gag_content.ModalityTokenCount, + prompt_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=gag_content.ModalityTokenCount, + ) ) - cache_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=gag_content.ModalityTokenCount, + cache_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=gag_content.ModalityTokenCount, + ) ) - candidates_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gag_content.ModalityTokenCount, + candidates_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gag_content.ModalityTokenCount, + ) ) tool_use_prompt_tokens_details: MutableSequence[ gag_content.ModalityTokenCount @@ -1176,6 +1179,7 @@ class FinishReason(proto.Enum): Model called too many tools consecutively, thus the system exited execution. """ + FINISH_REASON_UNSPECIFIED = 0 STOP = 1 MAX_TOKENS = 2 @@ -1229,12 +1233,12 @@ class FinishReason(proto.Enum): proto.INT32, number=7, ) - grounding_attributions: MutableSequence[ - "GroundingAttribution" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="GroundingAttribution", + grounding_attributions: MutableSequence["GroundingAttribution"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="GroundingAttribution", + ) ) grounding_metadata: "GroundingMetadata" = proto.Field( proto.MESSAGE, @@ -1299,6 +1303,7 @@ class UrlRetrievalStatus(proto.Enum): Url retrieval is failed because the content is unsafe. """ + URL_RETRIEVAL_STATUS_UNSPECIFIED = 0 URL_RETRIEVAL_STATUS_SUCCESS = 1 URL_RETRIEVAL_STATUS_ERROR = 2 @@ -2012,6 +2017,7 @@ class AnswerStyle(proto.Enum): paragraph, multiple paragraphs, or bullet points, etc. """ + ANSWER_STYLE_UNSPECIFIED = 0 ABSTRACTIVE = 1 EXTRACTIVE = 2 @@ -2136,6 +2142,7 @@ class BlockReason(proto.Enum): OTHER (2): Input was blocked due to other reasons. """ + BLOCK_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -2390,19 +2397,19 @@ class CountTokensResponse(proto.Message): proto.INT32, number=5, ) - prompt_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=gag_content.ModalityTokenCount, + prompt_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=gag_content.ModalityTokenCount, + ) ) - cache_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gag_content.ModalityTokenCount, + cache_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gag_content.ModalityTokenCount, + ) ) @@ -2444,6 +2451,7 @@ class ActivityHandling(proto.Enum): NO_INTERRUPTION (2): The model's response will not be interrupted. """ + ACTIVITY_HANDLING_UNSPECIFIED = 0 START_OF_ACTIVITY_INTERRUPTS = 1 NO_INTERRUPTION = 2 @@ -2465,6 +2473,7 @@ class TurnCoverage(proto.Enum): since the last turn, including inactivity (e.g. silence on the audio stream). """ + TURN_COVERAGE_UNSPECIFIED = 0 TURN_INCLUDES_ONLY_ACTIVITY = 1 TURN_INCLUDES_ALL_INPUT = 2 @@ -2524,6 +2533,7 @@ class StartSensitivity(proto.Enum): Automatic detection will detect the start of speech less often. """ + START_SENSITIVITY_UNSPECIFIED = 0 START_SENSITIVITY_HIGH = 1 START_SENSITIVITY_LOW = 2 @@ -2539,6 +2549,7 @@ class EndSensitivity(proto.Enum): END_SENSITIVITY_LOW (2): Automatic detection ends speech less often. """ + END_SENSITIVITY_UNSPECIFIED = 0 END_SENSITIVITY_HIGH = 1 END_SENSITIVITY_LOW = 2 @@ -2966,12 +2977,12 @@ class BidiGenerateContentToolResponse(proto.Message): Optional. The response to the function calls. """ - function_responses: MutableSequence[ - gag_content.FunctionResponse - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gag_content.FunctionResponse, + function_responses: MutableSequence[gag_content.FunctionResponse] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gag_content.FunctionResponse, + ) ) @@ -3406,33 +3417,33 @@ class UsageMetadata(proto.Message): proto.INT32, number=3, ) - prompt_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=gag_content.ModalityTokenCount, + prompt_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=gag_content.ModalityTokenCount, + ) ) - cache_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=gag_content.ModalityTokenCount, + cache_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=gag_content.ModalityTokenCount, + ) ) - response_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gag_content.ModalityTokenCount, + response_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gag_content.ModalityTokenCount, + ) ) - tool_use_prompt_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message=gag_content.ModalityTokenCount, + tool_use_prompt_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message=gag_content.ModalityTokenCount, + ) ) diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/model_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/model_service.py index 8ba644667a71..962f47cb9c55 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/model_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/model_service.py @@ -20,8 +20,8 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model from google.ai.generativelanguage_v1beta.types import model +from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model __protobuf__ = proto.module( package="google.ai.generativelanguage.v1beta", diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/permission.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/permission.py index a6141133edcc..2f8c0e2a4533 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/permission.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/permission.py @@ -90,6 +90,7 @@ class GranteeType(proto.Enum): Represents access to everyone. No extra information is required. """ + GRANTEE_TYPE_UNSPECIFIED = 0 USER = 1 GROUP = 2 @@ -110,6 +111,7 @@ class Role(proto.Enum): READER (3): Reader can use the resource. """ + ROLE_UNSPECIFIED = 0 OWNER = 1 WRITER = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever.py index 78f205b15334..0ce523dde9d3 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever.py @@ -280,6 +280,7 @@ class Operator(proto.Enum): Supported by string only when ``CustomMetadata`` value type for the given key has a ``string_list_value``. """ + OPERATOR_UNSPECIFIED = 0 LESS = 1 LESS_EQUAL = 2 @@ -352,6 +353,7 @@ class State(proto.Enum): STATE_FAILED (10): ``Chunk`` failed processing. """ + STATE_UNSPECIFIED = 0 STATE_PENDING_PROCESSING = 1 STATE_ACTIVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/safety.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/safety.py index 19e1130e4089..028d0e0a3b11 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/safety.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/safety.py @@ -69,6 +69,7 @@ class HarmCategory(proto.Enum): integrity. DEPRECATED: use enable_enhanced_civic_answers instead. """ + HARM_CATEGORY_UNSPECIFIED = 0 HARM_CATEGORY_DEROGATORY = 1 HARM_CATEGORY_TOXICITY = 2 @@ -115,6 +116,7 @@ class BlockedReason(proto.Enum): Content was blocked, but the reason is uncategorized. """ + BLOCKED_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -200,6 +202,7 @@ class HarmProbability(proto.Enum): HIGH (4): Content has a high chance of being unsafe. """ + HARM_PROBABILITY_UNSPECIFIED = 0 NEGLIGIBLE = 1 LOW = 2 @@ -255,6 +258,7 @@ class HarmBlockThreshold(proto.Enum): OFF (5): Turn off the safety filter. """ + HARM_BLOCK_THRESHOLD_UNSPECIFIED = 0 BLOCK_LOW_AND_ABOVE = 1 BLOCK_MEDIUM_AND_ABOVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/tuned_model.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/tuned_model.py index 7e513230fafd..c62a4e9f516a 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/tuned_model.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/tuned_model.py @@ -136,6 +136,7 @@ class State(proto.Enum): FAILED (3): The model failed to be created. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/__init__.py index 472daf067e6c..974e5bda080f 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.discuss_service import DiscussServiceAsyncClient, DiscussServiceClient from .services.model_service import ModelServiceAsyncClient, ModelServiceClient from .services.text_service import TextServiceAsyncClient, TextServiceClient diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/async_client.py index 6f7f3fcb49ac..1b338cb83f47 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version @@ -116,7 +116,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_info.__func__(DiscussServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DiscussServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DiscussServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +135,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_file.__func__(DiscussServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DiscussServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DiscussServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/client.py index 8b8032c0728c..ab791843580d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version @@ -77,9 +77,7 @@ class DiscussServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DiscussServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DiscussServiceTransport]] _transport_registry["grpc"] = DiscussServiceGrpcTransport _transport_registry["grpc_asyncio"] = DiscussServiceGrpcAsyncIOTransport _transport_registry["rest"] = DiscussServiceRestTransport @@ -616,11 +614,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DiscussServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DiscussServiceClient._read_environment_variables() + ) self._client_cert_source = DiscussServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -655,8 +651,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DiscussServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/base.py index 27e48661c7df..530febbe252b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version from google.ai.generativelanguage_v1beta2.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc.py index c69c83485947..93cff3a6d79b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.ai.generativelanguage_v1beta2.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc_asyncio.py index 24ddec559b3f..41ab9fbdda60 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta2.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/rest.py index 2d2ff799ef69..e18f5054faac 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -350,9 +350,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() request, metadata = self._interceptor.pre_count_message_tokens( request, metadata @@ -510,9 +508,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() request, metadata = self._interceptor.pre_generate_message( request, metadata diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/async_client.py index 717411ebf158..f889fb6981a2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version @@ -111,7 +111,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_info.__func__(ModelServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ModelServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ModelServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -127,7 +130,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_file.__func__(ModelServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ModelServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ModelServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/client.py index 71f47835dbd1..4332aefa9df4 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version @@ -613,11 +613,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ModelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ModelServiceClient._read_environment_variables() + ) self._client_cert_source = ModelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -652,8 +650,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ModelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/pagers.py index 78e1890431dc..f6f8fce4ee07 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/base.py index 8b485e2a2205..06344c5dcd6d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version from google.ai.generativelanguage_v1beta2.types import model, model_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc.py index 74d4ab64ba01..325a39d32e3f 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.ai.generativelanguage_v1beta2.types import model, model_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc_asyncio.py index d4462838aca1..ac226a68b386 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta2.types import model, model_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/rest.py index b764cfa6e792..a0f437080112 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/async_client.py index 7814259f544e..d00cc46ef4b7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version @@ -112,7 +112,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_info.__func__(TextServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + TextServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(TextServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -128,7 +131,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_file.__func__(TextServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + TextServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(TextServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/client.py index 02a6f448489b..23a4ff286dd6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version @@ -614,11 +614,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TextServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TextServiceClient._read_environment_variables() + ) self._client_cert_source = TextServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -653,8 +651,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TextServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/base.py index 90ed393d6ca3..16df0db788f7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version from google.ai.generativelanguage_v1beta2.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc.py index 9f9c528913a8..611f5c9c60fd 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.ai.generativelanguage_v1beta2.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc_asyncio.py index 63d961bae14c..435c8ac5704e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta2.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/rest.py index e0cb4aa36655..9d70acf94493 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/__init__.py index 2f3df470c104..fa12b9dfdf87 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .citation import CitationMetadata, CitationSource +from .citation import ( + CitationMetadata, + CitationSource, +) from .discuss_service import ( CountMessageTokensRequest, CountMessageTokensResponse, @@ -23,8 +26,14 @@ Message, MessagePrompt, ) -from .model import Model -from .model_service import GetModelRequest, ListModelsRequest, ListModelsResponse +from .model import ( + Model, +) +from .model_service import ( + GetModelRequest, + ListModelsRequest, + ListModelsResponse, +) from .safety import ( ContentFilter, HarmCategory, diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/safety.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/safety.py index 466a7828a9f4..9212213d2e0c 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/safety.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/safety.py @@ -59,6 +59,7 @@ class HarmCategory(proto.Enum): Dangerous content that promotes, facilitates, or encourages harmful acts. """ + HARM_CATEGORY_UNSPECIFIED = 0 HARM_CATEGORY_DEROGATORY = 1 HARM_CATEGORY_TOXICITY = 2 @@ -100,6 +101,7 @@ class BlockedReason(proto.Enum): Content was blocked, but the reason is uncategorized. """ + BLOCKED_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -182,6 +184,7 @@ class HarmProbability(proto.Enum): HIGH (4): Content has a high chance of being unsafe. """ + HARM_PROBABILITY_UNSPECIFIED = 0 NEGLIGIBLE = 1 LOW = 2 @@ -229,6 +232,7 @@ class HarmBlockThreshold(proto.Enum): Content with NEGLIGIBLE, LOW, and MEDIUM will be allowed. """ + HARM_BLOCK_THRESHOLD_UNSPECIFIED = 0 BLOCK_LOW_AND_ABOVE = 1 BLOCK_MEDIUM_AND_ABOVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/__init__.py index 87e768c5339e..783210c85484 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.discuss_service import DiscussServiceAsyncClient, DiscussServiceClient from .services.model_service import ModelServiceAsyncClient, ModelServiceClient from .services.permission_service import ( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/async_client.py index 23ba7959c19f..bef9537b4697 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -118,7 +118,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_info.__func__(DiscussServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DiscussServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DiscussServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +137,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_file.__func__(DiscussServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DiscussServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DiscussServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/client.py index e33322d77cd9..aa509b517a37 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -79,9 +79,7 @@ class DiscussServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DiscussServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DiscussServiceTransport]] _transport_registry["grpc"] = DiscussServiceGrpcTransport _transport_registry["grpc_asyncio"] = DiscussServiceGrpcAsyncIOTransport _transport_registry["rest"] = DiscussServiceRestTransport @@ -618,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DiscussServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DiscussServiceClient._read_environment_variables() + ) self._client_cert_source = DiscussServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -657,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DiscussServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/base.py index afc6c9fd2286..f14b332a99b9 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version from google.ai.generativelanguage_v1beta3.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc.py index 0cf12fead37e..a8bdd4769596 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta3.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc_asyncio.py index 3269b169eb48..c76a94ddd24d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta3.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/rest.py index e3375c56afc5..9504bcdebc69 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -351,9 +351,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() request, metadata = self._interceptor.pre_count_message_tokens( request, metadata @@ -511,9 +509,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() request, metadata = self._interceptor.pre_generate_message( request, metadata diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/async_client.py index 1574610d5901..9b856bf0c682 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -46,14 +46,13 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta3.services.model_service import pagers +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model from .client import ModelServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ModelServiceTransport @@ -121,7 +120,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_info.__func__(ModelServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ModelServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ModelServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +139,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_file.__func__(ModelServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ModelServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ModelServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/client.py index 6d9f8207f8e6..ed773fce5ac1 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -63,14 +63,13 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta3.services.model_service import pagers +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model from .transports.base import DEFAULT_CLIENT_INFO, ModelServiceTransport from .transports.grpc import ModelServiceGrpcTransport @@ -636,11 +635,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ModelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ModelServiceClient._read_environment_variables() + ) self._client_cert_source = ModelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -675,8 +672,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ModelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/pagers.py index 3e0a81f1e2e0..64705e4257ed 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/base.py index e4881e1cf94e..6ef356a34621 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta3 import gapic_version as package_version +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc.py index 8f2b4a248430..e49af013eaf4 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc_asyncio.py index c869996077a9..11a32d9be3ea 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc_asyncio.py @@ -17,25 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport from .grpc import ModelServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest.py index 8de57e962376..8b027efd2d79 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseModelServiceRestTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest_base.py index 164bf0eea1b7..a606497672ec 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest_base.py @@ -17,14 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/async_client.py index 84e1f4b2f678..0d68b338eab2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -44,13 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta3.services.permission_service import pagers +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service from .client import PermissionServiceClient from .transports.base import DEFAULT_CLIENT_INFO, PermissionServiceTransport @@ -124,7 +123,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PermissionServiceAsyncClient: The constructed client. """ - return PermissionServiceClient.from_service_account_info.__func__(PermissionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PermissionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PermissionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +142,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PermissionServiceAsyncClient: The constructed client. """ - return PermissionServiceClient.from_service_account_file.__func__(PermissionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PermissionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PermissionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/client.py index 5f63769d9b29..6846669fd6a6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -61,13 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.ai.generativelanguage_v1beta3.services.permission_service import pagers +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service from .transports.base import DEFAULT_CLIENT_INFO, PermissionServiceTransport from .transports.grpc import PermissionServiceGrpcTransport @@ -83,9 +82,7 @@ class PermissionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PermissionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PermissionServiceTransport]] _transport_registry["grpc"] = PermissionServiceGrpcTransport _transport_registry["grpc_asyncio"] = PermissionServiceGrpcAsyncIOTransport _transport_registry["rest"] = PermissionServiceRestTransport @@ -643,11 +640,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PermissionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PermissionServiceClient._read_environment_variables() + ) self._client_cert_source = PermissionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -682,8 +677,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PermissionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/pagers.py index 6ca04a54f8a5..41cd819439cb 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/base.py index 99c553c07c08..c8228fadc62d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta3 import gapic_version as package_version +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc.py index 18399454f7f9..f70285a5d771 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc_asyncio.py index ef24de766dc2..7ff85d5b5d9e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc_asyncio.py @@ -17,25 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport from .grpc import PermissionServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py index b7a7b05bf4c7..fd99536d04c5 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BasePermissionServiceRestTransport @@ -559,9 +558,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseCreatePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseCreatePermission._get_http_options() request, metadata = self._interceptor.pre_create_permission( request, metadata @@ -707,9 +704,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseDeletePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseDeletePermission._get_http_options() request, metadata = self._interceptor.pre_delete_permission( request, metadata @@ -844,9 +839,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseGetPermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseGetPermission._get_http_options() request, metadata = self._interceptor.pre_get_permission(request, metadata) transcoded_request = _BasePermissionServiceRestTransport._BaseGetPermission._get_transcoded_request( @@ -991,9 +984,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseListPermissions._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseListPermissions._get_http_options() request, metadata = self._interceptor.pre_list_permissions( request, metadata @@ -1142,9 +1133,7 @@ def __call__( Response from ``TransferOwnership``. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseTransferOwnership._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseTransferOwnership._get_http_options() request, metadata = self._interceptor.pre_transfer_ownership( request, metadata @@ -1320,9 +1309,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseUpdatePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseUpdatePermission._get_http_options() request, metadata = self._interceptor.pre_update_permission( request, metadata diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest_base.py index 8c1f5dc37f47..618b8026ccca 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest_base.py @@ -17,14 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/async_client.py index c17366c12314..54be965458bb 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -114,7 +114,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_info.__func__(TextServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + TextServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(TextServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +133,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_file.__func__(TextServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + TextServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(TextServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/client.py index 7d05a713fbc8..d7e4ca371739 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -616,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TextServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TextServiceClient._read_environment_variables() + ) self._client_cert_source = TextServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -655,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TextServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/base.py index e88dbeea30f5..497818e64f18 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version from google.ai.generativelanguage_v1beta3.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc.py index bc0d8881b5d8..0fa951da40d7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta3.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc_asyncio.py index c7ce62f9ff37..0498a7d920c9 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta3.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/rest.py index 2b831794bd21..1e27fefbb8e7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/__init__.py index aa90e5d93eba..94d7de94b6f2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .citation import CitationMetadata, CitationSource +from .citation import ( + CitationMetadata, + CitationSource, +) from .discuss_service import ( CountMessageTokensRequest, CountMessageTokensResponse, @@ -23,7 +26,9 @@ Message, MessagePrompt, ) -from .model import Model +from .model import ( + Model, +) from .model_service import ( CreateTunedModelMetadata, CreateTunedModelRequest, @@ -36,7 +41,9 @@ ListTunedModelsResponse, UpdateTunedModelRequest, ) -from .permission import Permission +from .permission import ( + Permission, +) from .permission_service import ( CreatePermissionRequest, DeletePermissionRequest, diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/model_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/model_service.py index da74d084c129..3b3c6cb604ee 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/model_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/model_service.py @@ -20,8 +20,8 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model from google.ai.generativelanguage_v1beta3.types import model +from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model __protobuf__ = proto.module( package="google.ai.generativelanguage.v1beta3", diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission.py index 68c7b3926daf..27d9268eb549 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission.py @@ -89,6 +89,7 @@ class GranteeType(proto.Enum): Represents access to everyone. No extra information is required. """ + GRANTEE_TYPE_UNSPECIFIED = 0 USER = 1 GROUP = 2 @@ -109,6 +110,7 @@ class Role(proto.Enum): READER (3): Reader can use the resource. """ + ROLE_UNSPECIFIED = 0 OWNER = 1 WRITER = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/safety.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/safety.py index d440bd18a707..72cfd8d79253 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/safety.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/safety.py @@ -59,6 +59,7 @@ class HarmCategory(proto.Enum): Dangerous content that promotes, facilitates, or encourages harmful acts. """ + HARM_CATEGORY_UNSPECIFIED = 0 HARM_CATEGORY_DEROGATORY = 1 HARM_CATEGORY_TOXICITY = 2 @@ -100,6 +101,7 @@ class BlockedReason(proto.Enum): Content was blocked, but the reason is uncategorized. """ + BLOCKED_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -182,6 +184,7 @@ class HarmProbability(proto.Enum): HIGH (4): Content has a high chance of being unsafe. """ + HARM_PROBABILITY_UNSPECIFIED = 0 NEGLIGIBLE = 1 LOW = 2 @@ -231,6 +234,7 @@ class HarmBlockThreshold(proto.Enum): BLOCK_NONE (4): All content will be allowed. """ + HARM_BLOCK_THRESHOLD_UNSPECIFIED = 0 BLOCK_LOW_AND_ABOVE = 1 BLOCK_MEDIUM_AND_ABOVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/tuned_model.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/tuned_model.py index 2aa43d8ad04a..c97f2a57206b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/tuned_model.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/tuned_model.py @@ -130,6 +130,7 @@ class State(proto.Enum): FAILED (3): The model failed to be created. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-ai-generativelanguage/mypy.ini b/packages/google-ai-generativelanguage/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-ai-generativelanguage/mypy.ini +++ b/packages/google-ai-generativelanguage/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-ai-generativelanguage/noxfile.py b/packages/google-ai-generativelanguage/noxfile.py index 468fa21a3dcb..7cd56933f1d5 100644 --- a/packages/google-ai-generativelanguage/noxfile.py +++ b/packages/google-ai-generativelanguage/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_generative_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_generative_service.py index f878b3e8c127..508bb2eb25af 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_generative_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_generative_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,26 +43,30 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.ai.generativelanguage_v1.services.generative_service import ( GenerativeServiceAsyncClient, GenerativeServiceClient, transports, ) -from google.ai.generativelanguage_v1.types import content +from google.ai.generativelanguage_v1.types import content, generative_service, safety from google.ai.generativelanguage_v1.types import content as gag_content -from google.ai.generativelanguage_v1.types import generative_service, safety CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -982,10 +986,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1033,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1069,10 +1071,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1324,9 +1325,7 @@ def test_generative_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1435,9 +1434,9 @@ def test_generate_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_content] = ( + mock_rpc + ) request = {} client.generate_content(request) @@ -2454,9 +2453,9 @@ def test_batch_embed_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_contents] = ( + mock_rpc + ) request = {} client.batch_embed_contents(request) @@ -3066,9 +3065,9 @@ def test_generate_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_content] = ( + mock_rpc + ) request = {} client.generate_content(request) @@ -3643,9 +3642,9 @@ def test_batch_embed_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_contents] = ( + mock_rpc + ) request = {} client.batch_embed_contents(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_model_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_model_service.py index 420d866bd405..1de82c13cb07 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_model_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_model_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -927,10 +932,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +979,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1017,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1260,9 +1262,7 @@ def test_model_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_cache_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_cache_service.py index a8be02ff7c78..2e66189615c3 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_cache_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_cache_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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.struct_pb2 as struct_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.cache_service import ( CacheServiceAsyncClient, @@ -63,12 +68,14 @@ pagers, transports, ) +from google.ai.generativelanguage_v1alpha.types import ( + cache_service, + cached_content, + content, +) from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content -from google.ai.generativelanguage_v1alpha.types import content CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -936,10 +943,9 @@ def test_cache_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +990,9 @@ def test_cache_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1028,9 @@ def test_cache_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1269,9 +1273,7 @@ def test_cache_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1384,9 +1386,9 @@ def test_list_cached_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cached_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cached_contents] = ( + mock_rpc + ) request = {} client.list_cached_contents(request) @@ -1775,9 +1777,9 @@ def test_create_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_cached_content] = ( + mock_rpc + ) request = {} client.create_cached_content(request) @@ -2072,9 +2074,9 @@ def test_get_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cached_content] = ( + mock_rpc + ) request = {} client.get_cached_content(request) @@ -2418,9 +2420,9 @@ def test_update_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cached_content] = ( + mock_rpc + ) request = {} client.update_cached_content(request) @@ -2784,9 +2786,9 @@ def test_delete_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cached_content] = ( + mock_rpc + ) request = {} client.delete_cached_content(request) @@ -3049,9 +3051,9 @@ def test_list_cached_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cached_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cached_contents] = ( + mock_rpc + ) request = {} client.list_cached_contents(request) @@ -3153,9 +3155,9 @@ def test_create_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_cached_content] = ( + mock_rpc + ) request = {} client.create_cached_content(request) @@ -3333,9 +3335,9 @@ def test_get_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cached_content] = ( + mock_rpc + ) request = {} client.get_cached_content(request) @@ -3514,9 +3516,9 @@ def test_update_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cached_content] = ( + mock_rpc + ) request = {} client.update_cached_content(request) @@ -3701,9 +3703,9 @@ def test_delete_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cached_content] = ( + mock_rpc + ) request = {} client.delete_cached_content(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_discuss_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_discuss_service.py index d442c3277b84..558edeb17103 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_discuss_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_discuss_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -945,10 +950,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +997,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1035,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1282,9 +1284,7 @@ def test_discuss_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1388,9 +1388,9 @@ def test_generate_message_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -1758,9 +1758,9 @@ def test_count_message_tokens_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) @@ -2040,9 +2040,9 @@ def test_generate_message_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -2240,9 +2240,9 @@ def test_count_message_tokens_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_file_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_file_service.py index 6560a63b3865..9fc5704aecb3 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_file_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_file_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.file_service import ( FileServiceAsyncClient, @@ -927,10 +932,9 @@ def test_file_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +979,9 @@ def test_file_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1017,9 @@ def test_file_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1250,9 +1252,7 @@ def test_file_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_generative_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_generative_service.py index 8a64cc90def2..4604310e9dd7 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_generative_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_generative_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.generative_service import ( GenerativeServiceAsyncClient, @@ -60,11 +65,11 @@ transports, ) from google.ai.generativelanguage_v1alpha.types import ( + content, generative_service, retriever, safety, ) -from google.ai.generativelanguage_v1alpha.types import content from google.ai.generativelanguage_v1alpha.types import content as gag_content CRED_INFO_JSON = { @@ -985,10 +990,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1037,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1072,10 +1075,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1327,9 +1329,7 @@ def test_generative_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1438,9 +1438,9 @@ def test_generate_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_content] = ( + mock_rpc + ) request = {} client.generate_content(request) @@ -2831,9 +2831,9 @@ def test_batch_embed_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_contents] = ( + mock_rpc + ) request = {} client.batch_embed_contents(request) @@ -3488,9 +3488,9 @@ def test_bidi_generate_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.bidi_generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.bidi_generate_content] = ( + mock_rpc + ) request = [{}] client.bidi_generate_content(request) @@ -3608,9 +3608,9 @@ def test_generate_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_content] = ( + mock_rpc + ) request = {} client.generate_content(request) @@ -4388,9 +4388,9 @@ def test_batch_embed_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_contents] = ( + mock_rpc + ) request = {} client.batch_embed_contents(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_model_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_model_service.py index 4e0a34f0806e..bc921b8ff0fd 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_model_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_model_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.model_service import ( ModelServiceAsyncClient, @@ -70,9 +70,8 @@ pagers, transports, ) +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -940,10 +939,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +986,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1024,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1273,9 +1269,7 @@ def test_model_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2568,9 +2562,9 @@ def test_list_tuned_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tuned_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tuned_models] = ( + mock_rpc + ) request = {} client.list_tuned_models(request) @@ -3050,9 +3044,9 @@ def test_create_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tuned_model] = ( + mock_rpc + ) request = {} client.create_tuned_model(request) @@ -3378,9 +3372,9 @@ def test_update_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tuned_model] = ( + mock_rpc + ) request = {} client.update_tuned_model(request) @@ -3764,9 +3758,9 @@ def test_delete_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tuned_model] = ( + mock_rpc + ) request = {} client.delete_tuned_model(request) @@ -4531,9 +4525,9 @@ def test_list_tuned_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tuned_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tuned_models] = ( + mock_rpc + ) request = {} client.list_tuned_models(request) @@ -4692,9 +4686,9 @@ def test_create_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tuned_model] = ( + mock_rpc + ) request = {} client.create_tuned_model(request) @@ -4879,9 +4873,9 @@ def test_update_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tuned_model] = ( + mock_rpc + ) request = {} client.update_tuned_model(request) @@ -5068,9 +5062,9 @@ def test_delete_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tuned_model] = ( + mock_rpc + ) request = {} client.delete_tuned_model(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_permission_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_permission_service.py index 78d6e080c55b..3aaec88a694f 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_permission_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_permission_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.permission_service import ( PermissionServiceAsyncClient, @@ -60,9 +65,8 @@ pagers, transports, ) +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -982,10 +986,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1033,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1069,10 +1071,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1324,9 +1325,7 @@ def test_permission_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1443,9 +1442,9 @@ def test_create_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_permission] = ( + mock_rpc + ) request = {} client.create_permission(request) @@ -2133,9 +2132,9 @@ def test_list_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_permissions] = ( + mock_rpc + ) request = {} client.list_permissions(request) @@ -2659,9 +2658,9 @@ def test_update_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_permission] = ( + mock_rpc + ) request = {} client.update_permission(request) @@ -3012,9 +3011,9 @@ def test_delete_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_permission] = ( + mock_rpc + ) request = {} client.delete_permission(request) @@ -3344,9 +3343,9 @@ def test_transfer_ownership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.transfer_ownership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.transfer_ownership] = ( + mock_rpc + ) request = {} client.transfer_ownership(request) @@ -3527,9 +3526,9 @@ def test_create_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_permission] = ( + mock_rpc + ) request = {} client.create_permission(request) @@ -3894,9 +3893,9 @@ def test_list_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_permissions] = ( + mock_rpc + ) request = {} client.list_permissions(request) @@ -4151,9 +4150,9 @@ def test_update_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_permission] = ( + mock_rpc + ) request = {} client.update_permission(request) @@ -4341,9 +4340,9 @@ def test_delete_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_permission] = ( + mock_rpc + ) request = {} client.delete_permission(request) @@ -4517,9 +4516,9 @@ def test_transfer_ownership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.transfer_ownership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.transfer_ownership] = ( + mock_rpc + ) request = {} client.transfer_ownership(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_prediction_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_prediction_service.py index 6ad4d5ad71a2..7fd1352a41e8 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_prediction_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_prediction_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.prediction_service import ( PredictionServiceAsyncClient, @@ -979,10 +984,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1031,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1066,10 +1069,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1321,9 +1323,7 @@ def test_prediction_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_retriever_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_retriever_service.py index 619de83240cd..e3ab147ca6ce 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_retriever_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_retriever_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.retriever_service import ( RetrieverServiceAsyncClient, @@ -973,10 +978,9 @@ def test_retriever_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1021,10 +1025,9 @@ def test_retriever_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1060,10 +1063,9 @@ def test_retriever_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1315,9 +1317,7 @@ def test_retriever_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5644,9 +5644,9 @@ def test_batch_create_chunks_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_chunks] = ( + mock_rpc + ) request = {} client.batch_create_chunks(request) @@ -6544,9 +6544,9 @@ def test_batch_update_chunks_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_chunks] = ( + mock_rpc + ) request = {} client.batch_update_chunks(request) @@ -7105,9 +7105,9 @@ def test_batch_delete_chunks_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_chunks] = ( + mock_rpc + ) request = {} client.batch_delete_chunks(request) @@ -10038,9 +10038,9 @@ def test_batch_create_chunks_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_chunks] = ( + mock_rpc + ) request = {} client.batch_create_chunks(request) @@ -10521,9 +10521,9 @@ def test_batch_update_chunks_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_chunks] = ( + mock_rpc + ) request = {} client.batch_update_chunks(request) @@ -10813,9 +10813,9 @@ def test_batch_delete_chunks_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_chunks] = ( + mock_rpc + ) request = {} client.batch_delete_chunks(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_text_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_text_service.py index e81d012be3d7..c5a5fe635ef2 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_text_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_text_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -922,10 +927,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -970,10 +974,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1009,10 +1012,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1245,9 +1247,7 @@ def test_text_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2047,9 +2047,9 @@ def test_batch_embed_text_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_text - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_text] = ( + mock_rpc + ) request = {} client.batch_embed_text(request) @@ -2383,9 +2383,9 @@ def test_count_text_tokens_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_text_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_text_tokens] = ( + mock_rpc + ) request = {} client.count_text_tokens(request) @@ -3038,9 +3038,9 @@ def test_batch_embed_text_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_text - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_text] = ( + mock_rpc + ) request = {} client.batch_embed_text(request) @@ -3220,9 +3220,9 @@ def test_count_text_tokens_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_text_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_text_tokens] = ( + mock_rpc + ) request = {} client.count_text_tokens(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_cache_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_cache_service.py index ed9341c362dd..daf006dad640 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_cache_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_cache_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,21 +43,26 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account 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.struct_pb2 as struct_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.type.interval_pb2 as interval_pb2 # type: ignore import google.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account from google.ai.generativelanguage_v1beta.services.cache_service import ( CacheServiceAsyncClient, @@ -65,12 +70,14 @@ pagers, transports, ) +from google.ai.generativelanguage_v1beta.types import ( + cache_service, + cached_content, + content, +) from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content -from google.ai.generativelanguage_v1beta.types import content CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -938,10 +945,9 @@ def test_cache_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +992,9 @@ def test_cache_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1030,9 @@ def test_cache_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1271,9 +1275,7 @@ def test_cache_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1386,9 +1388,9 @@ def test_list_cached_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cached_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cached_contents] = ( + mock_rpc + ) request = {} client.list_cached_contents(request) @@ -1777,9 +1779,9 @@ def test_create_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_cached_content] = ( + mock_rpc + ) request = {} client.create_cached_content(request) @@ -2074,9 +2076,9 @@ def test_get_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cached_content] = ( + mock_rpc + ) request = {} client.get_cached_content(request) @@ -2420,9 +2422,9 @@ def test_update_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cached_content] = ( + mock_rpc + ) request = {} client.update_cached_content(request) @@ -2786,9 +2788,9 @@ def test_delete_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cached_content] = ( + mock_rpc + ) request = {} client.delete_cached_content(request) @@ -3051,9 +3053,9 @@ def test_list_cached_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cached_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cached_contents] = ( + mock_rpc + ) request = {} client.list_cached_contents(request) @@ -3155,9 +3157,9 @@ def test_create_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_cached_content] = ( + mock_rpc + ) request = {} client.create_cached_content(request) @@ -3335,9 +3337,9 @@ def test_get_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cached_content] = ( + mock_rpc + ) request = {} client.get_cached_content(request) @@ -3516,9 +3518,9 @@ def test_update_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cached_content] = ( + mock_rpc + ) request = {} client.update_cached_content(request) @@ -3702,9 +3704,9 @@ def test_delete_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cached_content] = ( + mock_rpc + ) request = {} client.delete_cached_content(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_discuss_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_discuss_service.py index 66c1560a06ea..6626f8a34c1e 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_discuss_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_discuss_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -945,10 +950,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +997,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1035,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1282,9 +1284,7 @@ def test_discuss_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1388,9 +1388,9 @@ def test_generate_message_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -1758,9 +1758,9 @@ def test_count_message_tokens_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) @@ -2040,9 +2040,9 @@ def test_generate_message_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -2240,9 +2240,9 @@ def test_count_message_tokens_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_file_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_file_service.py index 540614ae4ef7..2df9c4f18784 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_file_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_file_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.file_service import ( FileServiceAsyncClient, @@ -927,10 +932,9 @@ def test_file_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +979,9 @@ def test_file_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1017,9 @@ def test_file_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1250,9 +1252,7 @@ def test_file_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_generative_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_generative_service.py index ae9f676c0663..f919963068ca 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_generative_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_generative_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,20 +43,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.duration_pb2 as duration_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.type.interval_pb2 as interval_pb2 # type: ignore import google.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account from google.ai.generativelanguage_v1beta.services.generative_service import ( GenerativeServiceAsyncClient, @@ -64,11 +69,11 @@ transports, ) from google.ai.generativelanguage_v1beta.types import ( + content, generative_service, retriever, safety, ) -from google.ai.generativelanguage_v1beta.types import content from google.ai.generativelanguage_v1beta.types import content as gag_content CRED_INFO_JSON = { @@ -989,10 +994,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1041,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1076,10 +1079,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1331,9 +1333,7 @@ def test_generative_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1444,9 +1444,9 @@ def test_generate_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_content] = ( + mock_rpc + ) request = {} client.generate_content(request) @@ -2839,9 +2839,9 @@ def test_batch_embed_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_contents] = ( + mock_rpc + ) request = {} client.batch_embed_contents(request) @@ -3496,9 +3496,9 @@ def test_bidi_generate_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.bidi_generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.bidi_generate_content] = ( + mock_rpc + ) request = [{}] client.bidi_generate_content(request) @@ -3616,9 +3616,9 @@ def test_generate_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_content] = ( + mock_rpc + ) request = {} client.generate_content(request) @@ -4395,9 +4395,9 @@ def test_batch_embed_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_contents] = ( + mock_rpc + ) request = {} client.batch_embed_contents(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_model_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_model_service.py index 6a04d743db2d..b3cca3066bce 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_model_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_model_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.model_service import ( ModelServiceAsyncClient, @@ -70,9 +70,8 @@ pagers, transports, ) +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -940,10 +939,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +986,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1024,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1273,9 +1269,7 @@ def test_model_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2572,9 +2566,9 @@ def test_list_tuned_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tuned_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tuned_models] = ( + mock_rpc + ) request = {} client.list_tuned_models(request) @@ -3054,9 +3048,9 @@ def test_create_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tuned_model] = ( + mock_rpc + ) request = {} client.create_tuned_model(request) @@ -3382,9 +3376,9 @@ def test_update_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tuned_model] = ( + mock_rpc + ) request = {} client.update_tuned_model(request) @@ -3768,9 +3762,9 @@ def test_delete_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tuned_model] = ( + mock_rpc + ) request = {} client.delete_tuned_model(request) @@ -4535,9 +4529,9 @@ def test_list_tuned_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tuned_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tuned_models] = ( + mock_rpc + ) request = {} client.list_tuned_models(request) @@ -4696,9 +4690,9 @@ def test_create_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tuned_model] = ( + mock_rpc + ) request = {} client.create_tuned_model(request) @@ -4883,9 +4877,9 @@ def test_update_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tuned_model] = ( + mock_rpc + ) request = {} client.update_tuned_model(request) @@ -5072,9 +5066,9 @@ def test_delete_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tuned_model] = ( + mock_rpc + ) request = {} client.delete_tuned_model(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_permission_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_permission_service.py index dd0ac849bb9f..8e23e1657be2 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_permission_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_permission_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.permission_service import ( PermissionServiceAsyncClient, @@ -60,9 +65,8 @@ pagers, transports, ) +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -982,10 +986,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1033,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1069,10 +1071,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1324,9 +1325,7 @@ def test_permission_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1443,9 +1442,9 @@ def test_create_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_permission] = ( + mock_rpc + ) request = {} client.create_permission(request) @@ -2133,9 +2132,9 @@ def test_list_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_permissions] = ( + mock_rpc + ) request = {} client.list_permissions(request) @@ -2659,9 +2658,9 @@ def test_update_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_permission] = ( + mock_rpc + ) request = {} client.update_permission(request) @@ -3012,9 +3011,9 @@ def test_delete_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_permission] = ( + mock_rpc + ) request = {} client.delete_permission(request) @@ -3344,9 +3343,9 @@ def test_transfer_ownership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.transfer_ownership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.transfer_ownership] = ( + mock_rpc + ) request = {} client.transfer_ownership(request) @@ -3527,9 +3526,9 @@ def test_create_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_permission] = ( + mock_rpc + ) request = {} client.create_permission(request) @@ -3894,9 +3893,9 @@ def test_list_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_permissions] = ( + mock_rpc + ) request = {} client.list_permissions(request) @@ -4151,9 +4150,9 @@ def test_update_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_permission] = ( + mock_rpc + ) request = {} client.update_permission(request) @@ -4341,9 +4340,9 @@ def test_delete_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_permission] = ( + mock_rpc + ) request = {} client.delete_permission(request) @@ -4517,9 +4516,9 @@ def test_transfer_ownership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.transfer_ownership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.transfer_ownership] = ( + mock_rpc + ) request = {} client.transfer_ownership(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_prediction_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_prediction_service.py index 8739d8231639..55c543b8f9e6 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_prediction_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_prediction_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,16 +56,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.prediction_service import ( PredictionServiceAsyncClient, @@ -988,10 +988,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1036,10 +1035,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1075,10 +1073,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1330,9 +1327,7 @@ def test_prediction_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1767,9 +1762,9 @@ def test_predict_long_running_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.predict_long_running - ] = mock_rpc + client._transport._wrapped_methods[client._transport.predict_long_running] = ( + mock_rpc + ) request = {} client.predict_long_running(request) @@ -2243,9 +2238,9 @@ def test_predict_long_running_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.predict_long_running - ] = mock_rpc + client._transport._wrapped_methods[client._transport.predict_long_running] = ( + mock_rpc + ) request = {} client.predict_long_running(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_retriever_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_retriever_service.py index 0b127c2926ff..890135828eb2 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_retriever_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_retriever_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.retriever_service import ( RetrieverServiceAsyncClient, @@ -973,10 +978,9 @@ def test_retriever_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1021,10 +1025,9 @@ def test_retriever_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1060,10 +1063,9 @@ def test_retriever_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1315,9 +1317,7 @@ def test_retriever_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5644,9 +5644,9 @@ def test_batch_create_chunks_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_chunks] = ( + mock_rpc + ) request = {} client.batch_create_chunks(request) @@ -6544,9 +6544,9 @@ def test_batch_update_chunks_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_chunks] = ( + mock_rpc + ) request = {} client.batch_update_chunks(request) @@ -7105,9 +7105,9 @@ def test_batch_delete_chunks_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_chunks] = ( + mock_rpc + ) request = {} client.batch_delete_chunks(request) @@ -10038,9 +10038,9 @@ def test_batch_create_chunks_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_chunks] = ( + mock_rpc + ) request = {} client.batch_create_chunks(request) @@ -10521,9 +10521,9 @@ def test_batch_update_chunks_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_chunks] = ( + mock_rpc + ) request = {} client.batch_update_chunks(request) @@ -10813,9 +10813,9 @@ def test_batch_delete_chunks_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_chunks] = ( + mock_rpc + ) request = {} client.batch_delete_chunks(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_text_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_text_service.py index ec6d6293b0b2..245cf4b5c6c3 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_text_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_text_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -922,10 +927,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -970,10 +974,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1009,10 +1012,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1245,9 +1247,7 @@ def test_text_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2047,9 +2047,9 @@ def test_batch_embed_text_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_text - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_text] = ( + mock_rpc + ) request = {} client.batch_embed_text(request) @@ -2383,9 +2383,9 @@ def test_count_text_tokens_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_text_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_text_tokens] = ( + mock_rpc + ) request = {} client.count_text_tokens(request) @@ -3038,9 +3038,9 @@ def test_batch_embed_text_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_text - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_text] = ( + mock_rpc + ) request = {} client.batch_embed_text(request) @@ -3220,9 +3220,9 @@ def test_count_text_tokens_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_text_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_text_tokens] = ( + mock_rpc + ) request = {} client.count_text_tokens(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_discuss_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_discuss_service.py index eb7277fb24cf..2981ba16546b 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_discuss_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_discuss_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -944,10 +949,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -992,10 +996,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1034,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1281,9 +1283,7 @@ def test_discuss_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1387,9 +1387,9 @@ def test_generate_message_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -1757,9 +1757,9 @@ def test_count_message_tokens_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) @@ -2039,9 +2039,9 @@ def test_generate_message_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -2239,9 +2239,9 @@ def test_count_message_tokens_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_model_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_model_service.py index a383fe0e232c..35600caab363 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_model_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_model_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -926,10 +931,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -974,10 +978,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1013,10 +1016,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1259,9 +1261,7 @@ def test_model_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_text_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_text_service.py index 6068c1eeea3c..256adf04b223 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_text_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_text_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -921,10 +926,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1244,9 +1246,7 @@ def test_text_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_discuss_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_discuss_service.py index f48aaa042386..c42f6a7ecc25 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_discuss_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_discuss_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -945,10 +950,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +997,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1035,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1282,9 +1284,7 @@ def test_discuss_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1388,9 +1388,9 @@ def test_generate_message_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -1758,9 +1758,9 @@ def test_count_message_tokens_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) @@ -2040,9 +2040,9 @@ def test_generate_message_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -2240,9 +2240,9 @@ def test_count_message_tokens_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_model_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_model_service.py index c9321be85a9b..abf389a260a1 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_model_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_model_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1beta3.services.model_service import ( ModelServiceAsyncClient, @@ -70,9 +70,8 @@ pagers, transports, ) +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -940,10 +939,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +986,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1024,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1273,9 +1269,7 @@ def test_model_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2558,9 +2552,9 @@ def test_list_tuned_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tuned_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tuned_models] = ( + mock_rpc + ) request = {} client.list_tuned_models(request) @@ -3040,9 +3034,9 @@ def test_create_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tuned_model] = ( + mock_rpc + ) request = {} client.create_tuned_model(request) @@ -3366,9 +3360,9 @@ def test_update_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tuned_model] = ( + mock_rpc + ) request = {} client.update_tuned_model(request) @@ -3750,9 +3744,9 @@ def test_delete_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tuned_model] = ( + mock_rpc + ) request = {} client.delete_tuned_model(request) @@ -4517,9 +4511,9 @@ def test_list_tuned_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tuned_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tuned_models] = ( + mock_rpc + ) request = {} client.list_tuned_models(request) @@ -4678,9 +4672,9 @@ def test_create_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tuned_model] = ( + mock_rpc + ) request = {} client.create_tuned_model(request) @@ -4865,9 +4859,9 @@ def test_update_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tuned_model] = ( + mock_rpc + ) request = {} client.update_tuned_model(request) @@ -5062,9 +5056,9 @@ def test_delete_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tuned_model] = ( + mock_rpc + ) request = {} client.delete_tuned_model(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_permission_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_permission_service.py index f3b8e8fb869f..0aad249c14c0 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_permission_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_permission_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.ai.generativelanguage_v1beta3.services.permission_service import ( PermissionServiceAsyncClient, @@ -60,9 +65,8 @@ pagers, transports, ) +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -982,10 +986,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1033,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1069,10 +1071,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1324,9 +1325,7 @@ def test_permission_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1443,9 +1442,9 @@ def test_create_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_permission] = ( + mock_rpc + ) request = {} client.create_permission(request) @@ -2133,9 +2132,9 @@ def test_list_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_permissions] = ( + mock_rpc + ) request = {} client.list_permissions(request) @@ -2659,9 +2658,9 @@ def test_update_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_permission] = ( + mock_rpc + ) request = {} client.update_permission(request) @@ -3012,9 +3011,9 @@ def test_delete_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_permission] = ( + mock_rpc + ) request = {} client.delete_permission(request) @@ -3344,9 +3343,9 @@ def test_transfer_ownership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.transfer_ownership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.transfer_ownership] = ( + mock_rpc + ) request = {} client.transfer_ownership(request) @@ -3527,9 +3526,9 @@ def test_create_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_permission] = ( + mock_rpc + ) request = {} client.create_permission(request) @@ -3894,9 +3893,9 @@ def test_list_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_permissions] = ( + mock_rpc + ) request = {} client.list_permissions(request) @@ -4151,9 +4150,9 @@ def test_update_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_permission] = ( + mock_rpc + ) request = {} client.update_permission(request) @@ -4341,9 +4340,9 @@ def test_delete_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_permission] = ( + mock_rpc + ) request = {} client.delete_permission(request) @@ -4517,9 +4516,9 @@ def test_transfer_ownership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.transfer_ownership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.transfer_ownership] = ( + mock_rpc + ) request = {} client.transfer_ownership(request) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_text_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_text_service.py index e552f0fa44e4..88370ca1ef45 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_text_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_text_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -922,10 +927,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -970,10 +974,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1009,10 +1012,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1245,9 +1247,7 @@ def test_text_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2047,9 +2047,9 @@ def test_batch_embed_text_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_text - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_text] = ( + mock_rpc + ) request = {} client.batch_embed_text(request) @@ -2383,9 +2383,9 @@ def test_count_text_tokens_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_text_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_text_tokens] = ( + mock_rpc + ) request = {} client.count_text_tokens(request) @@ -3050,9 +3050,9 @@ def test_batch_embed_text_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_text - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_text] = ( + mock_rpc + ) request = {} client.batch_embed_text(request) @@ -3244,9 +3244,9 @@ def test_count_text_tokens_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_text_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_text_tokens] = ( + mock_rpc + ) request = {} client.count_text_tokens(request) diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/__init__.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/__init__.py index fd5c93b15746..52535fd10219 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/__init__.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.analytics_admin_service import ( AnalyticsAdminServiceAsyncClient, AnalyticsAdminServiceClient, diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/async_client.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/async_client.py index 1e01cddc3855..a5da6d7fb55f 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/async_client.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.admin_v1alpha import gapic_version as package_version @@ -51,6 +51,17 @@ import google.type.date_pb2 as date_pb2 # type: ignore from google.analytics.admin_v1alpha.services.analytics_admin_service import pagers +from google.analytics.admin_v1alpha.types import ( + access_report, + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -58,14 +69,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import access_report, analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter from .client import AnalyticsAdminServiceClient from .transports.base import DEFAULT_CLIENT_INFO, AnalyticsAdminServiceTransport @@ -325,7 +328,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AnalyticsAdminServiceAsyncClient: The constructed client. """ - return AnalyticsAdminServiceClient.from_service_account_info.__func__(AnalyticsAdminServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AnalyticsAdminServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AnalyticsAdminServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -341,7 +347,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AnalyticsAdminServiceAsyncClient: The constructed client. """ - return AnalyticsAdminServiceClient.from_service_account_file.__func__(AnalyticsAdminServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AnalyticsAdminServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AnalyticsAdminServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -379,7 +388,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AnalyticsAdminServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AnalyticsAdminServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AnalyticsAdminServiceTransport: diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/client.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/client.py index c2db2d4a4d50..64b553827f1b 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/client.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.admin_v1alpha import gapic_version as package_version @@ -67,6 +67,17 @@ import google.type.date_pb2 as date_pb2 # type: ignore from google.analytics.admin_v1alpha.services.analytics_admin_service import pagers +from google.analytics.admin_v1alpha.types import ( + access_report, + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -74,14 +85,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import access_report, analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter from .transports.base import DEFAULT_CLIENT_INFO, AnalyticsAdminServiceTransport from .transports.grpc import AnalyticsAdminServiceGrpcTransport @@ -97,9 +100,7 @@ class AnalyticsAdminServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AnalyticsAdminServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsAdminServiceTransport]] _transport_registry["grpc"] = AnalyticsAdminServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsAdminServiceGrpcAsyncIOTransport _transport_registry["rest"] = AnalyticsAdminServiceRestTransport @@ -1319,11 +1320,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AnalyticsAdminServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AnalyticsAdminServiceClient._read_environment_variables() + ) self._client_cert_source = AnalyticsAdminServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1358,8 +1357,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AnalyticsAdminServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/pagers.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/pagers.py index da5a1b136d58..20d832e29532 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/pagers.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/pagers.py @@ -75,7 +75,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -231,7 +231,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -307,7 +307,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -389,7 +389,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -465,7 +465,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -545,7 +545,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -621,7 +621,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -701,7 +701,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -777,7 +777,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -857,7 +857,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -935,7 +935,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1019,7 +1019,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1102,7 +1102,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1186,7 +1186,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1264,7 +1264,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1346,7 +1346,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1422,7 +1422,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1504,7 +1504,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1580,7 +1580,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1662,7 +1662,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1744,7 +1744,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1830,7 +1830,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1915,7 +1915,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2003,7 +2003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2079,7 +2079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2161,7 +2161,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2237,7 +2237,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2317,7 +2317,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2393,7 +2393,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2473,7 +2473,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2549,7 +2549,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2629,7 +2629,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2705,7 +2705,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2787,7 +2787,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2863,7 +2863,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2943,7 +2943,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3019,7 +3019,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -3101,7 +3101,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3177,7 +3177,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -3257,7 +3257,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3333,7 +3333,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -3413,7 +3413,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3489,7 +3489,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -3569,7 +3569,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3645,7 +3645,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -3727,7 +3727,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3803,7 +3803,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -3883,7 +3883,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3959,7 +3959,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -4041,7 +4041,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -4119,7 +4119,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -4201,7 +4201,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -4279,7 +4279,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -4363,7 +4363,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -4441,7 +4441,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -4523,7 +4523,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -4601,7 +4601,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/__init__.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/__init__.py index 36fdaad681d1..13b4fb2c6f02 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/__init__.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AnalyticsAdminServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsAdminServiceTransport]] _transport_registry["grpc"] = AnalyticsAdminServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsAdminServiceGrpcAsyncIOTransport _transport_registry["rest"] = AnalyticsAdminServiceRestTransport diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/base.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/base.py index 39c4ce530170..db8dc6f9f2b3 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/base.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/base.py @@ -17,16 +17,26 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.analytics.admin_v1alpha import gapic_version as package_version +from google.analytics.admin_v1alpha.types import ( + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -34,14 +44,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc.py index ad7ca8b46d68..dd98c207c75a 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc.py @@ -16,19 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson +from google.analytics.admin_v1alpha.types import ( + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -36,14 +46,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter from .base import DEFAULT_CLIENT_INFO, AnalyticsAdminServiceTransport @@ -942,12 +944,12 @@ def get_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "get_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetMeasurementProtocolSecret", - request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["get_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetMeasurementProtocolSecret", + request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["get_measurement_protocol_secret"] @@ -975,12 +977,12 @@ def list_measurement_protocol_secrets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_measurement_protocol_secrets" not in self._stubs: - self._stubs[ - "list_measurement_protocol_secrets" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListMeasurementProtocolSecrets", - request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, - response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + self._stubs["list_measurement_protocol_secrets"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListMeasurementProtocolSecrets", + request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, + response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + ) ) return self._stubs["list_measurement_protocol_secrets"] @@ -1007,12 +1009,12 @@ def create_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "create_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateMeasurementProtocolSecret", - request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["create_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateMeasurementProtocolSecret", + request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["create_measurement_protocol_secret"] @@ -1038,12 +1040,12 @@ def delete_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "delete_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteMeasurementProtocolSecret", - request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteMeasurementProtocolSecret", + request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_measurement_protocol_secret"] @@ -1070,12 +1072,12 @@ def update_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "update_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateMeasurementProtocolSecret", - request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["update_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateMeasurementProtocolSecret", + request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["update_measurement_protocol_secret"] @@ -1106,12 +1108,12 @@ def acknowledge_user_data_collection( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "acknowledge_user_data_collection" not in self._stubs: - self._stubs[ - "acknowledge_user_data_collection" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/AcknowledgeUserDataCollection", - request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, - response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + self._stubs["acknowledge_user_data_collection"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/AcknowledgeUserDataCollection", + request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, + response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + ) ) return self._stubs["acknowledge_user_data_collection"] @@ -1138,12 +1140,12 @@ def get_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "get_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.GetSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + self._stubs["get_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.GetSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + ) ) return self._stubs["get_sk_ad_network_conversion_value_schema"] @@ -1170,12 +1172,12 @@ def create_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "create_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.CreateSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + self._stubs["create_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.CreateSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + ) ) return self._stubs["create_sk_ad_network_conversion_value_schema"] @@ -1201,12 +1203,12 @@ def delete_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "delete_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.DeleteSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.DeleteSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_sk_ad_network_conversion_value_schema"] @@ -1233,12 +1235,12 @@ def update_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "update_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.UpdateSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + self._stubs["update_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.UpdateSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + ) ) return self._stubs["update_sk_ad_network_conversion_value_schema"] @@ -1267,12 +1269,12 @@ def list_sk_ad_network_conversion_value_schemas( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_sk_ad_network_conversion_value_schemas" not in self._stubs: - self._stubs[ - "list_sk_ad_network_conversion_value_schemas" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSKAdNetworkConversionValueSchemas", - request_serializer=analytics_admin.ListSKAdNetworkConversionValueSchemasRequest.serialize, - response_deserializer=analytics_admin.ListSKAdNetworkConversionValueSchemasResponse.deserialize, + self._stubs["list_sk_ad_network_conversion_value_schemas"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSKAdNetworkConversionValueSchemas", + request_serializer=analytics_admin.ListSKAdNetworkConversionValueSchemasRequest.serialize, + response_deserializer=analytics_admin.ListSKAdNetworkConversionValueSchemasResponse.deserialize, + ) ) return self._stubs["list_sk_ad_network_conversion_value_schemas"] @@ -1302,12 +1304,12 @@ def search_change_history_events( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_change_history_events" not in self._stubs: - self._stubs[ - "search_change_history_events" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/SearchChangeHistoryEvents", - request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, - response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + self._stubs["search_change_history_events"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/SearchChangeHistoryEvents", + request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, + response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + ) ) return self._stubs["search_change_history_events"] @@ -1333,12 +1335,12 @@ def get_google_signals_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_google_signals_settings" not in self._stubs: - self._stubs[ - "get_google_signals_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetGoogleSignalsSettings", - request_serializer=analytics_admin.GetGoogleSignalsSettingsRequest.serialize, - response_deserializer=resources.GoogleSignalsSettings.deserialize, + self._stubs["get_google_signals_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetGoogleSignalsSettings", + request_serializer=analytics_admin.GetGoogleSignalsSettingsRequest.serialize, + response_deserializer=resources.GoogleSignalsSettings.deserialize, + ) ) return self._stubs["get_google_signals_settings"] @@ -1364,12 +1366,12 @@ def update_google_signals_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_google_signals_settings" not in self._stubs: - self._stubs[ - "update_google_signals_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateGoogleSignalsSettings", - request_serializer=analytics_admin.UpdateGoogleSignalsSettingsRequest.serialize, - response_deserializer=resources.GoogleSignalsSettings.deserialize, + self._stubs["update_google_signals_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateGoogleSignalsSettings", + request_serializer=analytics_admin.UpdateGoogleSignalsSettingsRequest.serialize, + response_deserializer=resources.GoogleSignalsSettings.deserialize, + ) ) return self._stubs["update_google_signals_settings"] @@ -1676,12 +1678,12 @@ def get_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "get_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + self._stubs["get_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + ) ) return self._stubs["get_display_video360_advertiser_link"] @@ -1709,12 +1711,12 @@ def list_display_video360_advertiser_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_display_video360_advertiser_links" not in self._stubs: - self._stubs[ - "list_display_video360_advertiser_links" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinks", - request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinksRequest.serialize, - response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinksResponse.deserialize, + self._stubs["list_display_video360_advertiser_links"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinks", + request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinksRequest.serialize, + response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinksResponse.deserialize, + ) ) return self._stubs["list_display_video360_advertiser_links"] @@ -1746,12 +1748,12 @@ def create_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "create_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + self._stubs["create_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + ) ) return self._stubs["create_display_video360_advertiser_link"] @@ -1778,12 +1780,12 @@ def delete_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "delete_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_display_video360_advertiser_link"] @@ -1811,12 +1813,12 @@ def update_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "update_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.UpdateDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + self._stubs["update_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.UpdateDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + ) ) return self._stubs["update_display_video360_advertiser_link"] @@ -1844,12 +1846,12 @@ def get_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "get_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + self._stubs["get_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + ) ) return self._stubs["get_display_video360_advertiser_link_proposal"] @@ -1877,12 +1879,12 @@ def list_display_video360_advertiser_link_proposals( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_display_video360_advertiser_link_proposals" not in self._stubs: - self._stubs[ - "list_display_video360_advertiser_link_proposals" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinkProposals", - request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsRequest.serialize, - response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsResponse.deserialize, + self._stubs["list_display_video360_advertiser_link_proposals"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinkProposals", + request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsRequest.serialize, + response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsResponse.deserialize, + ) ) return self._stubs["list_display_video360_advertiser_link_proposals"] @@ -1909,12 +1911,12 @@ def create_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "create_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + self._stubs["create_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + ) ) return self._stubs["create_display_video360_advertiser_link_proposal"] @@ -1942,12 +1944,12 @@ def delete_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "delete_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_display_video360_advertiser_link_proposal"] @@ -1977,12 +1979,12 @@ def approve_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "approve_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "approve_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ApproveDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalResponse.deserialize, + self._stubs["approve_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ApproveDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalResponse.deserialize, + ) ) return self._stubs["approve_display_video360_advertiser_link_proposal"] @@ -2016,12 +2018,12 @@ def cancel_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "cancel_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CancelDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.CancelDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + self._stubs["cancel_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CancelDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.CancelDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + ) ) return self._stubs["cancel_display_video360_advertiser_link_proposal"] @@ -2320,12 +2322,12 @@ def get_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_retention_settings" not in self._stubs: - self._stubs[ - "get_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRetentionSettings", - request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["get_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRetentionSettings", + request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["get_data_retention_settings"] @@ -2352,12 +2354,12 @@ def update_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_retention_settings" not in self._stubs: - self._stubs[ - "update_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRetentionSettings", - request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["update_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRetentionSettings", + request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["update_data_retention_settings"] @@ -2819,12 +2821,12 @@ def update_attribution_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_attribution_settings" not in self._stubs: - self._stubs[ - "update_attribution_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateAttributionSettings", - request_serializer=analytics_admin.UpdateAttributionSettingsRequest.serialize, - response_deserializer=resources.AttributionSettings.deserialize, + self._stubs["update_attribution_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateAttributionSettings", + request_serializer=analytics_admin.UpdateAttributionSettingsRequest.serialize, + response_deserializer=resources.AttributionSettings.deserialize, + ) ) return self._stubs["update_attribution_settings"] @@ -3041,12 +3043,12 @@ def batch_create_access_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_create_access_bindings" not in self._stubs: - self._stubs[ - "batch_create_access_bindings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchCreateAccessBindings", - request_serializer=analytics_admin.BatchCreateAccessBindingsRequest.serialize, - response_deserializer=analytics_admin.BatchCreateAccessBindingsResponse.deserialize, + self._stubs["batch_create_access_bindings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchCreateAccessBindings", + request_serializer=analytics_admin.BatchCreateAccessBindingsRequest.serialize, + response_deserializer=analytics_admin.BatchCreateAccessBindingsResponse.deserialize, + ) ) return self._stubs["batch_create_access_bindings"] @@ -3103,12 +3105,12 @@ def batch_update_access_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_access_bindings" not in self._stubs: - self._stubs[ - "batch_update_access_bindings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchUpdateAccessBindings", - request_serializer=analytics_admin.BatchUpdateAccessBindingsRequest.serialize, - response_deserializer=analytics_admin.BatchUpdateAccessBindingsResponse.deserialize, + self._stubs["batch_update_access_bindings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchUpdateAccessBindings", + request_serializer=analytics_admin.BatchUpdateAccessBindingsRequest.serialize, + response_deserializer=analytics_admin.BatchUpdateAccessBindingsResponse.deserialize, + ) ) return self._stubs["batch_update_access_bindings"] @@ -3132,12 +3134,12 @@ def batch_delete_access_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_delete_access_bindings" not in self._stubs: - self._stubs[ - "batch_delete_access_bindings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchDeleteAccessBindings", - request_serializer=analytics_admin.BatchDeleteAccessBindingsRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["batch_delete_access_bindings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchDeleteAccessBindings", + request_serializer=analytics_admin.BatchDeleteAccessBindingsRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["batch_delete_access_bindings"] @@ -3577,12 +3579,12 @@ def get_enhanced_measurement_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_enhanced_measurement_settings" not in self._stubs: - self._stubs[ - "get_enhanced_measurement_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetEnhancedMeasurementSettings", - request_serializer=analytics_admin.GetEnhancedMeasurementSettingsRequest.serialize, - response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + self._stubs["get_enhanced_measurement_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetEnhancedMeasurementSettings", + request_serializer=analytics_admin.GetEnhancedMeasurementSettingsRequest.serialize, + response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + ) ) return self._stubs["get_enhanced_measurement_settings"] @@ -3611,12 +3613,12 @@ def update_enhanced_measurement_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_enhanced_measurement_settings" not in self._stubs: - self._stubs[ - "update_enhanced_measurement_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateEnhancedMeasurementSettings", - request_serializer=analytics_admin.UpdateEnhancedMeasurementSettingsRequest.serialize, - response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + self._stubs["update_enhanced_measurement_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateEnhancedMeasurementSettings", + request_serializer=analytics_admin.UpdateEnhancedMeasurementSettingsRequest.serialize, + response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + ) ) return self._stubs["update_enhanced_measurement_settings"] @@ -4059,12 +4061,12 @@ def update_data_redaction_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_redaction_settings" not in self._stubs: - self._stubs[ - "update_data_redaction_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRedactionSettings", - request_serializer=analytics_admin.UpdateDataRedactionSettingsRequest.serialize, - response_deserializer=resources.DataRedactionSettings.deserialize, + self._stubs["update_data_redaction_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRedactionSettings", + request_serializer=analytics_admin.UpdateDataRedactionSettingsRequest.serialize, + response_deserializer=resources.DataRedactionSettings.deserialize, + ) ) return self._stubs["update_data_redaction_settings"] @@ -4090,12 +4092,12 @@ def get_data_redaction_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_redaction_settings" not in self._stubs: - self._stubs[ - "get_data_redaction_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRedactionSettings", - request_serializer=analytics_admin.GetDataRedactionSettingsRequest.serialize, - response_deserializer=resources.DataRedactionSettings.deserialize, + self._stubs["get_data_redaction_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRedactionSettings", + request_serializer=analytics_admin.GetDataRedactionSettingsRequest.serialize, + response_deserializer=resources.DataRedactionSettings.deserialize, + ) ) return self._stubs["get_data_redaction_settings"] @@ -4294,12 +4296,12 @@ def get_rollup_property_source_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_rollup_property_source_link" not in self._stubs: - self._stubs[ - "get_rollup_property_source_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetRollupPropertySourceLink", - request_serializer=analytics_admin.GetRollupPropertySourceLinkRequest.serialize, - response_deserializer=resources.RollupPropertySourceLink.deserialize, + self._stubs["get_rollup_property_source_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetRollupPropertySourceLink", + request_serializer=analytics_admin.GetRollupPropertySourceLinkRequest.serialize, + response_deserializer=resources.RollupPropertySourceLink.deserialize, + ) ) return self._stubs["get_rollup_property_source_link"] @@ -4329,12 +4331,12 @@ def list_rollup_property_source_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_rollup_property_source_links" not in self._stubs: - self._stubs[ - "list_rollup_property_source_links" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListRollupPropertySourceLinks", - request_serializer=analytics_admin.ListRollupPropertySourceLinksRequest.serialize, - response_deserializer=analytics_admin.ListRollupPropertySourceLinksResponse.deserialize, + self._stubs["list_rollup_property_source_links"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListRollupPropertySourceLinks", + request_serializer=analytics_admin.ListRollupPropertySourceLinksRequest.serialize, + response_deserializer=analytics_admin.ListRollupPropertySourceLinksResponse.deserialize, + ) ) return self._stubs["list_rollup_property_source_links"] @@ -4364,12 +4366,12 @@ def create_rollup_property_source_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_rollup_property_source_link" not in self._stubs: - self._stubs[ - "create_rollup_property_source_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateRollupPropertySourceLink", - request_serializer=analytics_admin.CreateRollupPropertySourceLinkRequest.serialize, - response_deserializer=resources.RollupPropertySourceLink.deserialize, + self._stubs["create_rollup_property_source_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateRollupPropertySourceLink", + request_serializer=analytics_admin.CreateRollupPropertySourceLinkRequest.serialize, + response_deserializer=resources.RollupPropertySourceLink.deserialize, + ) ) return self._stubs["create_rollup_property_source_link"] @@ -4398,12 +4400,12 @@ def delete_rollup_property_source_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_rollup_property_source_link" not in self._stubs: - self._stubs[ - "delete_rollup_property_source_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteRollupPropertySourceLink", - request_serializer=analytics_admin.DeleteRollupPropertySourceLinkRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_rollup_property_source_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteRollupPropertySourceLink", + request_serializer=analytics_admin.DeleteRollupPropertySourceLinkRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_rollup_property_source_link"] @@ -4460,12 +4462,12 @@ def create_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_subproperty_event_filter" not in self._stubs: - self._stubs[ - "create_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSubpropertyEventFilter", - request_serializer=analytics_admin.CreateSubpropertyEventFilterRequest.serialize, - response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + self._stubs["create_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSubpropertyEventFilter", + request_serializer=analytics_admin.CreateSubpropertyEventFilterRequest.serialize, + response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + ) ) return self._stubs["create_subproperty_event_filter"] @@ -4491,12 +4493,12 @@ def get_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_subproperty_event_filter" not in self._stubs: - self._stubs[ - "get_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertyEventFilter", - request_serializer=analytics_admin.GetSubpropertyEventFilterRequest.serialize, - response_deserializer=subproperty_event_filter.SubpropertyEventFilter.deserialize, + self._stubs["get_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertyEventFilter", + request_serializer=analytics_admin.GetSubpropertyEventFilterRequest.serialize, + response_deserializer=subproperty_event_filter.SubpropertyEventFilter.deserialize, + ) ) return self._stubs["get_subproperty_event_filter"] @@ -4522,12 +4524,12 @@ def list_subproperty_event_filters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_subproperty_event_filters" not in self._stubs: - self._stubs[ - "list_subproperty_event_filters" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertyEventFilters", - request_serializer=analytics_admin.ListSubpropertyEventFiltersRequest.serialize, - response_deserializer=analytics_admin.ListSubpropertyEventFiltersResponse.deserialize, + self._stubs["list_subproperty_event_filters"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertyEventFilters", + request_serializer=analytics_admin.ListSubpropertyEventFiltersRequest.serialize, + response_deserializer=analytics_admin.ListSubpropertyEventFiltersResponse.deserialize, + ) ) return self._stubs["list_subproperty_event_filters"] @@ -4554,12 +4556,12 @@ def update_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_subproperty_event_filter" not in self._stubs: - self._stubs[ - "update_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertyEventFilter", - request_serializer=analytics_admin.UpdateSubpropertyEventFilterRequest.serialize, - response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + self._stubs["update_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertyEventFilter", + request_serializer=analytics_admin.UpdateSubpropertyEventFilterRequest.serialize, + response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + ) ) return self._stubs["update_subproperty_event_filter"] @@ -4585,12 +4587,12 @@ def delete_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_subproperty_event_filter" not in self._stubs: - self._stubs[ - "delete_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSubpropertyEventFilter", - request_serializer=analytics_admin.DeleteSubpropertyEventFilterRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSubpropertyEventFilter", + request_serializer=analytics_admin.DeleteSubpropertyEventFilterRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_subproperty_event_filter"] @@ -4617,12 +4619,12 @@ def create_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_reporting_data_annotation" not in self._stubs: - self._stubs[ - "create_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateReportingDataAnnotation", - request_serializer=analytics_admin.CreateReportingDataAnnotationRequest.serialize, - response_deserializer=resources.ReportingDataAnnotation.deserialize, + self._stubs["create_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateReportingDataAnnotation", + request_serializer=analytics_admin.CreateReportingDataAnnotationRequest.serialize, + response_deserializer=resources.ReportingDataAnnotation.deserialize, + ) ) return self._stubs["create_reporting_data_annotation"] @@ -4648,12 +4650,12 @@ def get_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_reporting_data_annotation" not in self._stubs: - self._stubs[ - "get_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingDataAnnotation", - request_serializer=analytics_admin.GetReportingDataAnnotationRequest.serialize, - response_deserializer=resources.ReportingDataAnnotation.deserialize, + self._stubs["get_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingDataAnnotation", + request_serializer=analytics_admin.GetReportingDataAnnotationRequest.serialize, + response_deserializer=resources.ReportingDataAnnotation.deserialize, + ) ) return self._stubs["get_reporting_data_annotation"] @@ -4680,12 +4682,12 @@ def list_reporting_data_annotations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_reporting_data_annotations" not in self._stubs: - self._stubs[ - "list_reporting_data_annotations" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListReportingDataAnnotations", - request_serializer=analytics_admin.ListReportingDataAnnotationsRequest.serialize, - response_deserializer=analytics_admin.ListReportingDataAnnotationsResponse.deserialize, + self._stubs["list_reporting_data_annotations"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListReportingDataAnnotations", + request_serializer=analytics_admin.ListReportingDataAnnotationsRequest.serialize, + response_deserializer=analytics_admin.ListReportingDataAnnotationsResponse.deserialize, + ) ) return self._stubs["list_reporting_data_annotations"] @@ -4712,12 +4714,12 @@ def update_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_reporting_data_annotation" not in self._stubs: - self._stubs[ - "update_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateReportingDataAnnotation", - request_serializer=analytics_admin.UpdateReportingDataAnnotationRequest.serialize, - response_deserializer=resources.ReportingDataAnnotation.deserialize, + self._stubs["update_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateReportingDataAnnotation", + request_serializer=analytics_admin.UpdateReportingDataAnnotationRequest.serialize, + response_deserializer=resources.ReportingDataAnnotation.deserialize, + ) ) return self._stubs["update_reporting_data_annotation"] @@ -4743,12 +4745,12 @@ def delete_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_reporting_data_annotation" not in self._stubs: - self._stubs[ - "delete_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteReportingDataAnnotation", - request_serializer=analytics_admin.DeleteReportingDataAnnotationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteReportingDataAnnotation", + request_serializer=analytics_admin.DeleteReportingDataAnnotationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_reporting_data_annotation"] @@ -4803,12 +4805,12 @@ def list_subproperty_sync_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_subproperty_sync_configs" not in self._stubs: - self._stubs[ - "list_subproperty_sync_configs" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertySyncConfigs", - request_serializer=analytics_admin.ListSubpropertySyncConfigsRequest.serialize, - response_deserializer=analytics_admin.ListSubpropertySyncConfigsResponse.deserialize, + self._stubs["list_subproperty_sync_configs"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertySyncConfigs", + request_serializer=analytics_admin.ListSubpropertySyncConfigsRequest.serialize, + response_deserializer=analytics_admin.ListSubpropertySyncConfigsResponse.deserialize, + ) ) return self._stubs["list_subproperty_sync_configs"] @@ -4834,12 +4836,12 @@ def update_subproperty_sync_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_subproperty_sync_config" not in self._stubs: - self._stubs[ - "update_subproperty_sync_config" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertySyncConfig", - request_serializer=analytics_admin.UpdateSubpropertySyncConfigRequest.serialize, - response_deserializer=resources.SubpropertySyncConfig.deserialize, + self._stubs["update_subproperty_sync_config"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertySyncConfig", + request_serializer=analytics_admin.UpdateSubpropertySyncConfigRequest.serialize, + response_deserializer=resources.SubpropertySyncConfig.deserialize, + ) ) return self._stubs["update_subproperty_sync_config"] @@ -4865,12 +4867,12 @@ def get_subproperty_sync_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_subproperty_sync_config" not in self._stubs: - self._stubs[ - "get_subproperty_sync_config" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertySyncConfig", - request_serializer=analytics_admin.GetSubpropertySyncConfigRequest.serialize, - response_deserializer=resources.SubpropertySyncConfig.deserialize, + self._stubs["get_subproperty_sync_config"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertySyncConfig", + request_serializer=analytics_admin.GetSubpropertySyncConfigRequest.serialize, + response_deserializer=resources.SubpropertySyncConfig.deserialize, + ) ) return self._stubs["get_subproperty_sync_config"] @@ -4898,12 +4900,12 @@ def get_reporting_identity_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_reporting_identity_settings" not in self._stubs: - self._stubs[ - "get_reporting_identity_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingIdentitySettings", - request_serializer=analytics_admin.GetReportingIdentitySettingsRequest.serialize, - response_deserializer=resources.ReportingIdentitySettings.deserialize, + self._stubs["get_reporting_identity_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingIdentitySettings", + request_serializer=analytics_admin.GetReportingIdentitySettingsRequest.serialize, + response_deserializer=resources.ReportingIdentitySettings.deserialize, + ) ) return self._stubs["get_reporting_identity_settings"] diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc_asyncio.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc_asyncio.py index f9c9ea03eec0..67f2a37f6030 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc_asyncio.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc_asyncio.py @@ -17,21 +17,31 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.analytics.admin_v1alpha.types import ( + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -39,14 +49,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter from .base import DEFAULT_CLIENT_INFO, AnalyticsAdminServiceTransport from .grpc import AnalyticsAdminServiceGrpcTransport @@ -967,12 +969,12 @@ def get_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "get_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetMeasurementProtocolSecret", - request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["get_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetMeasurementProtocolSecret", + request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["get_measurement_protocol_secret"] @@ -1000,12 +1002,12 @@ def list_measurement_protocol_secrets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_measurement_protocol_secrets" not in self._stubs: - self._stubs[ - "list_measurement_protocol_secrets" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListMeasurementProtocolSecrets", - request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, - response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + self._stubs["list_measurement_protocol_secrets"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListMeasurementProtocolSecrets", + request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, + response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + ) ) return self._stubs["list_measurement_protocol_secrets"] @@ -1032,12 +1034,12 @@ def create_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "create_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateMeasurementProtocolSecret", - request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["create_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateMeasurementProtocolSecret", + request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["create_measurement_protocol_secret"] @@ -1064,12 +1066,12 @@ def delete_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "delete_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteMeasurementProtocolSecret", - request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteMeasurementProtocolSecret", + request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_measurement_protocol_secret"] @@ -1096,12 +1098,12 @@ def update_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "update_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateMeasurementProtocolSecret", - request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["update_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateMeasurementProtocolSecret", + request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["update_measurement_protocol_secret"] @@ -1132,12 +1134,12 @@ def acknowledge_user_data_collection( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "acknowledge_user_data_collection" not in self._stubs: - self._stubs[ - "acknowledge_user_data_collection" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/AcknowledgeUserDataCollection", - request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, - response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + self._stubs["acknowledge_user_data_collection"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/AcknowledgeUserDataCollection", + request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, + response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + ) ) return self._stubs["acknowledge_user_data_collection"] @@ -1164,12 +1166,12 @@ def get_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "get_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.GetSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + self._stubs["get_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.GetSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + ) ) return self._stubs["get_sk_ad_network_conversion_value_schema"] @@ -1196,12 +1198,12 @@ def create_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "create_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.CreateSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + self._stubs["create_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.CreateSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + ) ) return self._stubs["create_sk_ad_network_conversion_value_schema"] @@ -1228,12 +1230,12 @@ def delete_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "delete_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.DeleteSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.DeleteSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_sk_ad_network_conversion_value_schema"] @@ -1260,12 +1262,12 @@ def update_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "update_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.UpdateSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + self._stubs["update_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.UpdateSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + ) ) return self._stubs["update_sk_ad_network_conversion_value_schema"] @@ -1294,12 +1296,12 @@ def list_sk_ad_network_conversion_value_schemas( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_sk_ad_network_conversion_value_schemas" not in self._stubs: - self._stubs[ - "list_sk_ad_network_conversion_value_schemas" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSKAdNetworkConversionValueSchemas", - request_serializer=analytics_admin.ListSKAdNetworkConversionValueSchemasRequest.serialize, - response_deserializer=analytics_admin.ListSKAdNetworkConversionValueSchemasResponse.deserialize, + self._stubs["list_sk_ad_network_conversion_value_schemas"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSKAdNetworkConversionValueSchemas", + request_serializer=analytics_admin.ListSKAdNetworkConversionValueSchemasRequest.serialize, + response_deserializer=analytics_admin.ListSKAdNetworkConversionValueSchemasResponse.deserialize, + ) ) return self._stubs["list_sk_ad_network_conversion_value_schemas"] @@ -1329,12 +1331,12 @@ def search_change_history_events( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_change_history_events" not in self._stubs: - self._stubs[ - "search_change_history_events" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/SearchChangeHistoryEvents", - request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, - response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + self._stubs["search_change_history_events"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/SearchChangeHistoryEvents", + request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, + response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + ) ) return self._stubs["search_change_history_events"] @@ -1360,12 +1362,12 @@ def get_google_signals_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_google_signals_settings" not in self._stubs: - self._stubs[ - "get_google_signals_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetGoogleSignalsSettings", - request_serializer=analytics_admin.GetGoogleSignalsSettingsRequest.serialize, - response_deserializer=resources.GoogleSignalsSettings.deserialize, + self._stubs["get_google_signals_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetGoogleSignalsSettings", + request_serializer=analytics_admin.GetGoogleSignalsSettingsRequest.serialize, + response_deserializer=resources.GoogleSignalsSettings.deserialize, + ) ) return self._stubs["get_google_signals_settings"] @@ -1391,12 +1393,12 @@ def update_google_signals_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_google_signals_settings" not in self._stubs: - self._stubs[ - "update_google_signals_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateGoogleSignalsSettings", - request_serializer=analytics_admin.UpdateGoogleSignalsSettingsRequest.serialize, - response_deserializer=resources.GoogleSignalsSettings.deserialize, + self._stubs["update_google_signals_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateGoogleSignalsSettings", + request_serializer=analytics_admin.UpdateGoogleSignalsSettingsRequest.serialize, + response_deserializer=resources.GoogleSignalsSettings.deserialize, + ) ) return self._stubs["update_google_signals_settings"] @@ -1713,12 +1715,12 @@ def get_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "get_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + self._stubs["get_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + ) ) return self._stubs["get_display_video360_advertiser_link"] @@ -1746,12 +1748,12 @@ def list_display_video360_advertiser_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_display_video360_advertiser_links" not in self._stubs: - self._stubs[ - "list_display_video360_advertiser_links" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinks", - request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinksRequest.serialize, - response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinksResponse.deserialize, + self._stubs["list_display_video360_advertiser_links"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinks", + request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinksRequest.serialize, + response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinksResponse.deserialize, + ) ) return self._stubs["list_display_video360_advertiser_links"] @@ -1783,12 +1785,12 @@ def create_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "create_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + self._stubs["create_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + ) ) return self._stubs["create_display_video360_advertiser_link"] @@ -1816,12 +1818,12 @@ def delete_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "delete_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_display_video360_advertiser_link"] @@ -1849,12 +1851,12 @@ def update_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "update_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.UpdateDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + self._stubs["update_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.UpdateDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + ) ) return self._stubs["update_display_video360_advertiser_link"] @@ -1882,12 +1884,12 @@ def get_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "get_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + self._stubs["get_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + ) ) return self._stubs["get_display_video360_advertiser_link_proposal"] @@ -1915,12 +1917,12 @@ def list_display_video360_advertiser_link_proposals( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_display_video360_advertiser_link_proposals" not in self._stubs: - self._stubs[ - "list_display_video360_advertiser_link_proposals" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinkProposals", - request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsRequest.serialize, - response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsResponse.deserialize, + self._stubs["list_display_video360_advertiser_link_proposals"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinkProposals", + request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsRequest.serialize, + response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsResponse.deserialize, + ) ) return self._stubs["list_display_video360_advertiser_link_proposals"] @@ -1947,12 +1949,12 @@ def create_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "create_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + self._stubs["create_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + ) ) return self._stubs["create_display_video360_advertiser_link_proposal"] @@ -1980,12 +1982,12 @@ def delete_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "delete_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_display_video360_advertiser_link_proposal"] @@ -2015,12 +2017,12 @@ def approve_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "approve_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "approve_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ApproveDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalResponse.deserialize, + self._stubs["approve_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ApproveDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalResponse.deserialize, + ) ) return self._stubs["approve_display_video360_advertiser_link_proposal"] @@ -2054,12 +2056,12 @@ def cancel_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "cancel_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CancelDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.CancelDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + self._stubs["cancel_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CancelDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.CancelDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + ) ) return self._stubs["cancel_display_video360_advertiser_link_proposal"] @@ -2371,12 +2373,12 @@ def get_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_retention_settings" not in self._stubs: - self._stubs[ - "get_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRetentionSettings", - request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["get_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRetentionSettings", + request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["get_data_retention_settings"] @@ -2403,12 +2405,12 @@ def update_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_retention_settings" not in self._stubs: - self._stubs[ - "update_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRetentionSettings", - request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["update_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRetentionSettings", + request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["update_data_retention_settings"] @@ -2889,12 +2891,12 @@ def update_attribution_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_attribution_settings" not in self._stubs: - self._stubs[ - "update_attribution_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateAttributionSettings", - request_serializer=analytics_admin.UpdateAttributionSettingsRequest.serialize, - response_deserializer=resources.AttributionSettings.deserialize, + self._stubs["update_attribution_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateAttributionSettings", + request_serializer=analytics_admin.UpdateAttributionSettingsRequest.serialize, + response_deserializer=resources.AttributionSettings.deserialize, + ) ) return self._stubs["update_attribution_settings"] @@ -3115,12 +3117,12 @@ def batch_create_access_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_create_access_bindings" not in self._stubs: - self._stubs[ - "batch_create_access_bindings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchCreateAccessBindings", - request_serializer=analytics_admin.BatchCreateAccessBindingsRequest.serialize, - response_deserializer=analytics_admin.BatchCreateAccessBindingsResponse.deserialize, + self._stubs["batch_create_access_bindings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchCreateAccessBindings", + request_serializer=analytics_admin.BatchCreateAccessBindingsRequest.serialize, + response_deserializer=analytics_admin.BatchCreateAccessBindingsResponse.deserialize, + ) ) return self._stubs["batch_create_access_bindings"] @@ -3177,12 +3179,12 @@ def batch_update_access_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_access_bindings" not in self._stubs: - self._stubs[ - "batch_update_access_bindings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchUpdateAccessBindings", - request_serializer=analytics_admin.BatchUpdateAccessBindingsRequest.serialize, - response_deserializer=analytics_admin.BatchUpdateAccessBindingsResponse.deserialize, + self._stubs["batch_update_access_bindings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchUpdateAccessBindings", + request_serializer=analytics_admin.BatchUpdateAccessBindingsRequest.serialize, + response_deserializer=analytics_admin.BatchUpdateAccessBindingsResponse.deserialize, + ) ) return self._stubs["batch_update_access_bindings"] @@ -3208,12 +3210,12 @@ def batch_delete_access_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_delete_access_bindings" not in self._stubs: - self._stubs[ - "batch_delete_access_bindings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchDeleteAccessBindings", - request_serializer=analytics_admin.BatchDeleteAccessBindingsRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["batch_delete_access_bindings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchDeleteAccessBindings", + request_serializer=analytics_admin.BatchDeleteAccessBindingsRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["batch_delete_access_bindings"] @@ -3670,12 +3672,12 @@ def get_enhanced_measurement_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_enhanced_measurement_settings" not in self._stubs: - self._stubs[ - "get_enhanced_measurement_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetEnhancedMeasurementSettings", - request_serializer=analytics_admin.GetEnhancedMeasurementSettingsRequest.serialize, - response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + self._stubs["get_enhanced_measurement_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetEnhancedMeasurementSettings", + request_serializer=analytics_admin.GetEnhancedMeasurementSettingsRequest.serialize, + response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + ) ) return self._stubs["get_enhanced_measurement_settings"] @@ -3704,12 +3706,12 @@ def update_enhanced_measurement_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_enhanced_measurement_settings" not in self._stubs: - self._stubs[ - "update_enhanced_measurement_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateEnhancedMeasurementSettings", - request_serializer=analytics_admin.UpdateEnhancedMeasurementSettingsRequest.serialize, - response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + self._stubs["update_enhanced_measurement_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateEnhancedMeasurementSettings", + request_serializer=analytics_admin.UpdateEnhancedMeasurementSettingsRequest.serialize, + response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + ) ) return self._stubs["update_enhanced_measurement_settings"] @@ -4165,12 +4167,12 @@ def update_data_redaction_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_redaction_settings" not in self._stubs: - self._stubs[ - "update_data_redaction_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRedactionSettings", - request_serializer=analytics_admin.UpdateDataRedactionSettingsRequest.serialize, - response_deserializer=resources.DataRedactionSettings.deserialize, + self._stubs["update_data_redaction_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRedactionSettings", + request_serializer=analytics_admin.UpdateDataRedactionSettingsRequest.serialize, + response_deserializer=resources.DataRedactionSettings.deserialize, + ) ) return self._stubs["update_data_redaction_settings"] @@ -4196,12 +4198,12 @@ def get_data_redaction_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_redaction_settings" not in self._stubs: - self._stubs[ - "get_data_redaction_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRedactionSettings", - request_serializer=analytics_admin.GetDataRedactionSettingsRequest.serialize, - response_deserializer=resources.DataRedactionSettings.deserialize, + self._stubs["get_data_redaction_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRedactionSettings", + request_serializer=analytics_admin.GetDataRedactionSettingsRequest.serialize, + response_deserializer=resources.DataRedactionSettings.deserialize, + ) ) return self._stubs["get_data_redaction_settings"] @@ -4405,12 +4407,12 @@ def get_rollup_property_source_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_rollup_property_source_link" not in self._stubs: - self._stubs[ - "get_rollup_property_source_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetRollupPropertySourceLink", - request_serializer=analytics_admin.GetRollupPropertySourceLinkRequest.serialize, - response_deserializer=resources.RollupPropertySourceLink.deserialize, + self._stubs["get_rollup_property_source_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetRollupPropertySourceLink", + request_serializer=analytics_admin.GetRollupPropertySourceLinkRequest.serialize, + response_deserializer=resources.RollupPropertySourceLink.deserialize, + ) ) return self._stubs["get_rollup_property_source_link"] @@ -4440,12 +4442,12 @@ def list_rollup_property_source_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_rollup_property_source_links" not in self._stubs: - self._stubs[ - "list_rollup_property_source_links" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListRollupPropertySourceLinks", - request_serializer=analytics_admin.ListRollupPropertySourceLinksRequest.serialize, - response_deserializer=analytics_admin.ListRollupPropertySourceLinksResponse.deserialize, + self._stubs["list_rollup_property_source_links"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListRollupPropertySourceLinks", + request_serializer=analytics_admin.ListRollupPropertySourceLinksRequest.serialize, + response_deserializer=analytics_admin.ListRollupPropertySourceLinksResponse.deserialize, + ) ) return self._stubs["list_rollup_property_source_links"] @@ -4475,12 +4477,12 @@ def create_rollup_property_source_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_rollup_property_source_link" not in self._stubs: - self._stubs[ - "create_rollup_property_source_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateRollupPropertySourceLink", - request_serializer=analytics_admin.CreateRollupPropertySourceLinkRequest.serialize, - response_deserializer=resources.RollupPropertySourceLink.deserialize, + self._stubs["create_rollup_property_source_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateRollupPropertySourceLink", + request_serializer=analytics_admin.CreateRollupPropertySourceLinkRequest.serialize, + response_deserializer=resources.RollupPropertySourceLink.deserialize, + ) ) return self._stubs["create_rollup_property_source_link"] @@ -4510,12 +4512,12 @@ def delete_rollup_property_source_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_rollup_property_source_link" not in self._stubs: - self._stubs[ - "delete_rollup_property_source_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteRollupPropertySourceLink", - request_serializer=analytics_admin.DeleteRollupPropertySourceLinkRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_rollup_property_source_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteRollupPropertySourceLink", + request_serializer=analytics_admin.DeleteRollupPropertySourceLinkRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_rollup_property_source_link"] @@ -4572,12 +4574,12 @@ def create_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_subproperty_event_filter" not in self._stubs: - self._stubs[ - "create_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSubpropertyEventFilter", - request_serializer=analytics_admin.CreateSubpropertyEventFilterRequest.serialize, - response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + self._stubs["create_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSubpropertyEventFilter", + request_serializer=analytics_admin.CreateSubpropertyEventFilterRequest.serialize, + response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + ) ) return self._stubs["create_subproperty_event_filter"] @@ -4603,12 +4605,12 @@ def get_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_subproperty_event_filter" not in self._stubs: - self._stubs[ - "get_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertyEventFilter", - request_serializer=analytics_admin.GetSubpropertyEventFilterRequest.serialize, - response_deserializer=subproperty_event_filter.SubpropertyEventFilter.deserialize, + self._stubs["get_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertyEventFilter", + request_serializer=analytics_admin.GetSubpropertyEventFilterRequest.serialize, + response_deserializer=subproperty_event_filter.SubpropertyEventFilter.deserialize, + ) ) return self._stubs["get_subproperty_event_filter"] @@ -4634,12 +4636,12 @@ def list_subproperty_event_filters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_subproperty_event_filters" not in self._stubs: - self._stubs[ - "list_subproperty_event_filters" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertyEventFilters", - request_serializer=analytics_admin.ListSubpropertyEventFiltersRequest.serialize, - response_deserializer=analytics_admin.ListSubpropertyEventFiltersResponse.deserialize, + self._stubs["list_subproperty_event_filters"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertyEventFilters", + request_serializer=analytics_admin.ListSubpropertyEventFiltersRequest.serialize, + response_deserializer=analytics_admin.ListSubpropertyEventFiltersResponse.deserialize, + ) ) return self._stubs["list_subproperty_event_filters"] @@ -4666,12 +4668,12 @@ def update_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_subproperty_event_filter" not in self._stubs: - self._stubs[ - "update_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertyEventFilter", - request_serializer=analytics_admin.UpdateSubpropertyEventFilterRequest.serialize, - response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + self._stubs["update_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertyEventFilter", + request_serializer=analytics_admin.UpdateSubpropertyEventFilterRequest.serialize, + response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + ) ) return self._stubs["update_subproperty_event_filter"] @@ -4698,12 +4700,12 @@ def delete_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_subproperty_event_filter" not in self._stubs: - self._stubs[ - "delete_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSubpropertyEventFilter", - request_serializer=analytics_admin.DeleteSubpropertyEventFilterRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSubpropertyEventFilter", + request_serializer=analytics_admin.DeleteSubpropertyEventFilterRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_subproperty_event_filter"] @@ -4730,12 +4732,12 @@ def create_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_reporting_data_annotation" not in self._stubs: - self._stubs[ - "create_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateReportingDataAnnotation", - request_serializer=analytics_admin.CreateReportingDataAnnotationRequest.serialize, - response_deserializer=resources.ReportingDataAnnotation.deserialize, + self._stubs["create_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateReportingDataAnnotation", + request_serializer=analytics_admin.CreateReportingDataAnnotationRequest.serialize, + response_deserializer=resources.ReportingDataAnnotation.deserialize, + ) ) return self._stubs["create_reporting_data_annotation"] @@ -4761,12 +4763,12 @@ def get_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_reporting_data_annotation" not in self._stubs: - self._stubs[ - "get_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingDataAnnotation", - request_serializer=analytics_admin.GetReportingDataAnnotationRequest.serialize, - response_deserializer=resources.ReportingDataAnnotation.deserialize, + self._stubs["get_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingDataAnnotation", + request_serializer=analytics_admin.GetReportingDataAnnotationRequest.serialize, + response_deserializer=resources.ReportingDataAnnotation.deserialize, + ) ) return self._stubs["get_reporting_data_annotation"] @@ -4793,12 +4795,12 @@ def list_reporting_data_annotations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_reporting_data_annotations" not in self._stubs: - self._stubs[ - "list_reporting_data_annotations" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListReportingDataAnnotations", - request_serializer=analytics_admin.ListReportingDataAnnotationsRequest.serialize, - response_deserializer=analytics_admin.ListReportingDataAnnotationsResponse.deserialize, + self._stubs["list_reporting_data_annotations"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListReportingDataAnnotations", + request_serializer=analytics_admin.ListReportingDataAnnotationsRequest.serialize, + response_deserializer=analytics_admin.ListReportingDataAnnotationsResponse.deserialize, + ) ) return self._stubs["list_reporting_data_annotations"] @@ -4825,12 +4827,12 @@ def update_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_reporting_data_annotation" not in self._stubs: - self._stubs[ - "update_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateReportingDataAnnotation", - request_serializer=analytics_admin.UpdateReportingDataAnnotationRequest.serialize, - response_deserializer=resources.ReportingDataAnnotation.deserialize, + self._stubs["update_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateReportingDataAnnotation", + request_serializer=analytics_admin.UpdateReportingDataAnnotationRequest.serialize, + response_deserializer=resources.ReportingDataAnnotation.deserialize, + ) ) return self._stubs["update_reporting_data_annotation"] @@ -4857,12 +4859,12 @@ def delete_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_reporting_data_annotation" not in self._stubs: - self._stubs[ - "delete_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteReportingDataAnnotation", - request_serializer=analytics_admin.DeleteReportingDataAnnotationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteReportingDataAnnotation", + request_serializer=analytics_admin.DeleteReportingDataAnnotationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_reporting_data_annotation"] @@ -4917,12 +4919,12 @@ def list_subproperty_sync_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_subproperty_sync_configs" not in self._stubs: - self._stubs[ - "list_subproperty_sync_configs" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertySyncConfigs", - request_serializer=analytics_admin.ListSubpropertySyncConfigsRequest.serialize, - response_deserializer=analytics_admin.ListSubpropertySyncConfigsResponse.deserialize, + self._stubs["list_subproperty_sync_configs"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertySyncConfigs", + request_serializer=analytics_admin.ListSubpropertySyncConfigsRequest.serialize, + response_deserializer=analytics_admin.ListSubpropertySyncConfigsResponse.deserialize, + ) ) return self._stubs["list_subproperty_sync_configs"] @@ -4948,12 +4950,12 @@ def update_subproperty_sync_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_subproperty_sync_config" not in self._stubs: - self._stubs[ - "update_subproperty_sync_config" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertySyncConfig", - request_serializer=analytics_admin.UpdateSubpropertySyncConfigRequest.serialize, - response_deserializer=resources.SubpropertySyncConfig.deserialize, + self._stubs["update_subproperty_sync_config"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertySyncConfig", + request_serializer=analytics_admin.UpdateSubpropertySyncConfigRequest.serialize, + response_deserializer=resources.SubpropertySyncConfig.deserialize, + ) ) return self._stubs["update_subproperty_sync_config"] @@ -4979,12 +4981,12 @@ def get_subproperty_sync_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_subproperty_sync_config" not in self._stubs: - self._stubs[ - "get_subproperty_sync_config" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertySyncConfig", - request_serializer=analytics_admin.GetSubpropertySyncConfigRequest.serialize, - response_deserializer=resources.SubpropertySyncConfig.deserialize, + self._stubs["get_subproperty_sync_config"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertySyncConfig", + request_serializer=analytics_admin.GetSubpropertySyncConfigRequest.serialize, + response_deserializer=resources.SubpropertySyncConfig.deserialize, + ) ) return self._stubs["get_subproperty_sync_config"] @@ -5012,12 +5014,12 @@ def get_reporting_identity_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_reporting_identity_settings" not in self._stubs: - self._stubs[ - "get_reporting_identity_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingIdentitySettings", - request_serializer=analytics_admin.GetReportingIdentitySettingsRequest.serialize, - response_deserializer=resources.ReportingIdentitySettings.deserialize, + self._stubs["get_reporting_identity_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingIdentitySettings", + request_serializer=analytics_admin.GetReportingIdentitySettingsRequest.serialize, + response_deserializer=resources.ReportingIdentitySettings.deserialize, + ) ) return self._stubs["get_reporting_identity_settings"] diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest.py index fb2a67746861..5a6d939205be 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest.py @@ -16,19 +16,29 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.analytics.admin_v1alpha.types import ( + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -36,14 +46,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAnalyticsAdminServiceRestTransport @@ -8144,9 +8146,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseAcknowledgeUserDataCollection._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseAcknowledgeUserDataCollection._get_http_options() request, metadata = self._interceptor.pre_acknowledge_user_data_collection( request, metadata @@ -8215,11 +8215,10 @@ def __call__( resp = self._interceptor.post_acknowledge_user_data_collection(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_acknowledge_user_data_collection_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_acknowledge_user_data_collection_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8312,15 +8311,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseApproveDisplayVideo360AdvertiserLinkProposal._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseApproveDisplayVideo360AdvertiserLinkProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_approve_display_video360_advertiser_link_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_approve_display_video360_advertiser_link_proposal( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseApproveDisplayVideo360AdvertiserLinkProposal._get_transcoded_request( http_options, request @@ -8394,11 +8390,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_approve_display_video360_advertiser_link_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_approve_display_video360_advertiser_link_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8478,9 +8473,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseArchiveAudience._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseArchiveAudience._get_http_options() request, metadata = self._interceptor.pre_archive_audience( request, metadata @@ -8596,9 +8589,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomDimension._get_http_options() request, metadata = self._interceptor.pre_archive_custom_dimension( request, metadata @@ -8712,9 +8703,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomMetric._get_http_options() request, metadata = self._interceptor.pre_archive_custom_metric( request, metadata @@ -8837,9 +8826,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseBatchCreateAccessBindings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseBatchCreateAccessBindings._get_http_options() request, metadata = self._interceptor.pre_batch_create_access_bindings( request, metadata @@ -8992,9 +8979,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseBatchDeleteAccessBindings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseBatchDeleteAccessBindings._get_http_options() request, metadata = self._interceptor.pre_batch_delete_access_bindings( request, metadata @@ -9113,9 +9098,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseBatchGetAccessBindings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseBatchGetAccessBindings._get_http_options() request, metadata = self._interceptor.pre_batch_get_access_bindings( request, metadata @@ -9267,9 +9250,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseBatchUpdateAccessBindings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseBatchUpdateAccessBindings._get_http_options() request, metadata = self._interceptor.pre_batch_update_access_bindings( request, metadata @@ -9439,15 +9420,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCancelDisplayVideo360AdvertiserLinkProposal._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCancelDisplayVideo360AdvertiserLinkProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_cancel_display_video360_advertiser_link_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_cancel_display_video360_advertiser_link_proposal( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCancelDisplayVideo360AdvertiserLinkProposal._get_transcoded_request( http_options, request @@ -9517,11 +9495,10 @@ def __call__( ) ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_cancel_display_video360_advertiser_link_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_cancel_display_video360_advertiser_link_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -9609,9 +9586,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateAccessBinding._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateAccessBinding._get_http_options() request, metadata = self._interceptor.pre_create_access_binding( request, metadata @@ -9768,9 +9743,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateAdSenseLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateAdSenseLink._get_http_options() request, metadata = self._interceptor.pre_create_ad_sense_link( request, metadata @@ -9926,9 +9899,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateAudience._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateAudience._get_http_options() request, metadata = self._interceptor.pre_create_audience(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateAudience._get_transcoded_request( @@ -10080,9 +10051,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateBigQueryLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateBigQueryLink._get_http_options() request, metadata = self._interceptor.pre_create_big_query_link( request, metadata @@ -10236,9 +10205,7 @@ def __call__( A definition for a calculated metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateCalculatedMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateCalculatedMetric._get_http_options() request, metadata = self._interceptor.pre_create_calculated_metric( request, metadata @@ -10392,9 +10359,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateChannelGroup._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateChannelGroup._get_http_options() request, metadata = self._interceptor.pre_create_channel_group( request, metadata @@ -10550,9 +10515,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateConversionEvent._get_http_options() request, metadata = self._interceptor.pre_create_conversion_event( request, metadata @@ -10706,9 +10669,7 @@ def __call__( A definition for a CustomDimension. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomDimension._get_http_options() request, metadata = self._interceptor.pre_create_custom_dimension( request, metadata @@ -10862,9 +10823,7 @@ def __call__( A definition for a custom metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomMetric._get_http_options() request, metadata = self._interceptor.pre_create_custom_metric( request, metadata @@ -11020,9 +10979,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateDataStream._get_http_options() request, metadata = self._interceptor.pre_create_data_stream( request, metadata @@ -11182,15 +11139,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateDisplayVideo360AdvertiserLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateDisplayVideo360AdvertiserLink._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_display_video360_advertiser_link( - request, metadata + request, metadata = ( + self._interceptor.pre_create_display_video360_advertiser_link( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateDisplayVideo360AdvertiserLink._get_transcoded_request( http_options, request @@ -11256,11 +11210,10 @@ def __call__( resp = self._interceptor.post_create_display_video360_advertiser_link(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_display_video360_advertiser_link_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_display_video360_advertiser_link_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -11358,15 +11311,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateDisplayVideo360AdvertiserLinkProposal._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateDisplayVideo360AdvertiserLinkProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_display_video360_advertiser_link_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_create_display_video360_advertiser_link_proposal( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateDisplayVideo360AdvertiserLinkProposal._get_transcoded_request( http_options, request @@ -11436,11 +11386,10 @@ def __call__( ) ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_display_video360_advertiser_link_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_display_video360_advertiser_link_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -11540,9 +11489,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateEventCreateRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateEventCreateRule._get_http_options() request, metadata = self._interceptor.pre_create_event_create_rule( request, metadata @@ -11712,9 +11659,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateEventEditRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateEventEditRule._get_http_options() request, metadata = self._interceptor.pre_create_event_edit_rule( request, metadata @@ -11870,9 +11815,7 @@ def __call__( A resource message representing an ``ExpandedDataSet``. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateExpandedDataSet._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateExpandedDataSet._get_http_options() request, metadata = self._interceptor.pre_create_expanded_data_set( request, metadata @@ -12030,9 +11973,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateFirebaseLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateFirebaseLink._get_http_options() request, metadata = self._interceptor.pre_create_firebase_link( request, metadata @@ -12188,9 +12129,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateGoogleAdsLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateGoogleAdsLink._get_http_options() request, metadata = self._interceptor.pre_create_google_ads_link( request, metadata @@ -12346,9 +12285,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateKeyEvent._get_http_options() request, metadata = self._interceptor.pre_create_key_event( request, metadata @@ -12505,15 +12442,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateMeasurementProtocolSecret._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_measurement_protocol_secret( - request, metadata + request, metadata = ( + self._interceptor.pre_create_measurement_protocol_secret( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateMeasurementProtocolSecret._get_transcoded_request( http_options, request @@ -12579,11 +12513,10 @@ def __call__( resp = self._interceptor.post_create_measurement_protocol_secret(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_measurement_protocol_secret_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_measurement_protocol_secret_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -12669,9 +12602,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateProperty._get_http_options() request, metadata = self._interceptor.pre_create_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateProperty._get_transcoded_request( @@ -12827,9 +12758,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateReportingDataAnnotation._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateReportingDataAnnotation._get_http_options() request, metadata = self._interceptor.pre_create_reporting_data_annotation( request, metadata @@ -12898,11 +12827,10 @@ def __call__( resp = self._interceptor.post_create_reporting_data_annotation(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_reporting_data_annotation_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_reporting_data_annotation_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -12988,9 +12916,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateRollupProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateRollupProperty._get_http_options() request, metadata = self._interceptor.pre_create_rollup_property( request, metadata @@ -13152,15 +13078,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateRollupPropertySourceLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateRollupPropertySourceLink._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_rollup_property_source_link( - request, metadata + request, metadata = ( + self._interceptor.pre_create_rollup_property_source_link( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateRollupPropertySourceLink._get_transcoded_request( http_options, request @@ -13226,11 +13149,10 @@ def __call__( resp = self._interceptor.post_create_rollup_property_source_link(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_rollup_property_source_link_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_rollup_property_source_link_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -13316,9 +13238,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateSearchAds360Link._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateSearchAds360Link._get_http_options() request, metadata = self._interceptor.pre_create_search_ads360_link( request, metadata @@ -13476,15 +13396,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateSKAdNetworkConversionValueSchema._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateSKAdNetworkConversionValueSchema._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_sk_ad_network_conversion_value_schema( - request, metadata + request, metadata = ( + self._interceptor.pre_create_sk_ad_network_conversion_value_schema( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateSKAdNetworkConversionValueSchema._get_transcoded_request( http_options, request @@ -13552,11 +13469,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_sk_ad_network_conversion_value_schema_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_sk_ad_network_conversion_value_schema_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -13646,9 +13562,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateSubpropertyEventFilter._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateSubpropertyEventFilter._get_http_options() request, metadata = self._interceptor.pre_create_subproperty_event_filter( request, metadata @@ -13717,11 +13631,10 @@ def __call__( resp = self._interceptor.post_create_subproperty_event_filter(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_subproperty_event_filter_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_subproperty_event_filter_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -13802,9 +13715,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccessBinding._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccessBinding._get_http_options() request, metadata = self._interceptor.pre_delete_access_binding( request, metadata @@ -13914,9 +13825,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccount._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccount._get_http_options() request, metadata = self._interceptor.pre_delete_account(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccount._get_transcoded_request( @@ -14022,9 +13931,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAdSenseLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAdSenseLink._get_http_options() request, metadata = self._interceptor.pre_delete_ad_sense_link( request, metadata @@ -14134,9 +14041,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteBigQueryLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteBigQueryLink._get_http_options() request, metadata = self._interceptor.pre_delete_big_query_link( request, metadata @@ -14246,9 +14151,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteCalculatedMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteCalculatedMetric._get_http_options() request, metadata = self._interceptor.pre_delete_calculated_metric( request, metadata @@ -14356,9 +14259,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteChannelGroup._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteChannelGroup._get_http_options() request, metadata = self._interceptor.pre_delete_channel_group( request, metadata @@ -14468,9 +14369,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteConversionEvent._get_http_options() request, metadata = self._interceptor.pre_delete_conversion_event( request, metadata @@ -14580,9 +14479,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDataStream._get_http_options() request, metadata = self._interceptor.pre_delete_data_stream( request, metadata @@ -14695,15 +14592,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDisplayVideo360AdvertiserLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDisplayVideo360AdvertiserLink._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_display_video360_advertiser_link( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_display_video360_advertiser_link( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDisplayVideo360AdvertiserLink._get_transcoded_request( http_options, request @@ -14812,15 +14706,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDisplayVideo360AdvertiserLinkProposal._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDisplayVideo360AdvertiserLinkProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_display_video360_advertiser_link_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_display_video360_advertiser_link_proposal( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDisplayVideo360AdvertiserLinkProposal._get_transcoded_request( http_options, request @@ -14925,9 +14816,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteEventCreateRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteEventCreateRule._get_http_options() request, metadata = self._interceptor.pre_delete_event_create_rule( request, metadata @@ -15037,9 +14926,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteEventEditRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteEventEditRule._get_http_options() request, metadata = self._interceptor.pre_delete_event_edit_rule( request, metadata @@ -15149,9 +15036,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteExpandedDataSet._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteExpandedDataSet._get_http_options() request, metadata = self._interceptor.pre_delete_expanded_data_set( request, metadata @@ -15261,9 +15146,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteFirebaseLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteFirebaseLink._get_http_options() request, metadata = self._interceptor.pre_delete_firebase_link( request, metadata @@ -15373,9 +15256,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteGoogleAdsLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteGoogleAdsLink._get_http_options() request, metadata = self._interceptor.pre_delete_google_ads_link( request, metadata @@ -15485,9 +15366,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteKeyEvent._get_http_options() request, metadata = self._interceptor.pre_delete_key_event( request, metadata @@ -15598,15 +15477,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteMeasurementProtocolSecret._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_measurement_protocol_secret( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_measurement_protocol_secret( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteMeasurementProtocolSecret._get_transcoded_request( http_options, request @@ -15717,9 +15593,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteProperty._get_http_options() request, metadata = self._interceptor.pre_delete_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteProperty._get_transcoded_request( @@ -15862,9 +15736,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteReportingDataAnnotation._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteReportingDataAnnotation._get_http_options() request, metadata = self._interceptor.pre_delete_reporting_data_annotation( request, metadata @@ -15975,15 +15847,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteRollupPropertySourceLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteRollupPropertySourceLink._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_rollup_property_source_link( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_rollup_property_source_link( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteRollupPropertySourceLink._get_transcoded_request( http_options, request @@ -16088,9 +15957,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteSearchAds360Link._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteSearchAds360Link._get_http_options() request, metadata = self._interceptor.pre_delete_search_ads360_link( request, metadata @@ -16202,15 +16069,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteSKAdNetworkConversionValueSchema._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteSKAdNetworkConversionValueSchema._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_sk_ad_network_conversion_value_schema( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_sk_ad_network_conversion_value_schema( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteSKAdNetworkConversionValueSchema._get_transcoded_request( http_options, request @@ -16318,9 +16182,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteSubpropertyEventFilter._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteSubpropertyEventFilter._get_http_options() request, metadata = self._interceptor.pre_delete_subproperty_event_filter( request, metadata @@ -16434,9 +16296,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetAccessBinding._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetAccessBinding._get_http_options() request, metadata = self._interceptor.pre_get_access_binding( request, metadata @@ -16585,9 +16445,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetAccount._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetAccount._get_http_options() request, metadata = self._interceptor.pre_get_account(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetAccount._get_transcoded_request( @@ -16734,9 +16592,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetAdSenseLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetAdSenseLink._get_http_options() request, metadata = self._interceptor.pre_get_ad_sense_link( request, metadata @@ -16885,9 +16741,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetAttributionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetAttributionSettings._get_http_options() request, metadata = self._interceptor.pre_get_attribution_settings( request, metadata @@ -17034,9 +16888,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetAudience._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetAudience._get_http_options() request, metadata = self._interceptor.pre_get_audience(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetAudience._get_transcoded_request( @@ -17182,9 +17034,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetBigQueryLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetBigQueryLink._get_http_options() request, metadata = self._interceptor.pre_get_big_query_link( request, metadata @@ -17332,9 +17182,7 @@ def __call__( A definition for a calculated metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetCalculatedMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetCalculatedMetric._get_http_options() request, metadata = self._interceptor.pre_get_calculated_metric( request, metadata @@ -17484,9 +17332,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetChannelGroup._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetChannelGroup._get_http_options() request, metadata = self._interceptor.pre_get_channel_group( request, metadata @@ -17636,9 +17482,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetConversionEvent._get_http_options() request, metadata = self._interceptor.pre_get_conversion_event( request, metadata @@ -17786,9 +17630,7 @@ def __call__( A definition for a CustomDimension. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomDimension._get_http_options() request, metadata = self._interceptor.pre_get_custom_dimension( request, metadata @@ -17936,9 +17778,7 @@ def __call__( A definition for a custom metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomMetric._get_http_options() request, metadata = self._interceptor.pre_get_custom_metric( request, metadata @@ -18090,9 +17930,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDataRedactionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataRedactionSettings._get_http_options() request, metadata = self._interceptor.pre_get_data_redaction_settings( request, metadata @@ -18241,9 +18079,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDataRetentionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataRetentionSettings._get_http_options() request, metadata = self._interceptor.pre_get_data_retention_settings( request, metadata @@ -18392,9 +18228,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDataSharingSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataSharingSettings._get_http_options() request, metadata = self._interceptor.pre_get_data_sharing_settings( request, metadata @@ -18542,9 +18376,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataStream._get_http_options() request, metadata = self._interceptor.pre_get_data_stream(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataStream._get_transcoded_request( @@ -18694,15 +18526,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDisplayVideo360AdvertiserLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDisplayVideo360AdvertiserLink._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_display_video360_advertiser_link( - request, metadata + request, metadata = ( + self._interceptor.pre_get_display_video360_advertiser_link( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetDisplayVideo360AdvertiserLink._get_transcoded_request( http_options, request @@ -18763,11 +18592,10 @@ def __call__( resp = self._interceptor.post_get_display_video360_advertiser_link(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_display_video360_advertiser_link_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_display_video360_advertiser_link_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -18864,15 +18692,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDisplayVideo360AdvertiserLinkProposal._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDisplayVideo360AdvertiserLinkProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_display_video360_advertiser_link_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_get_display_video360_advertiser_link_proposal( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetDisplayVideo360AdvertiserLinkProposal._get_transcoded_request( http_options, request @@ -18935,11 +18760,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_display_video360_advertiser_link_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_display_video360_advertiser_link_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -19031,9 +18855,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetEnhancedMeasurementSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetEnhancedMeasurementSettings._get_http_options() request, metadata = self._interceptor.pre_get_enhanced_measurement_settings( request, metadata @@ -19097,11 +18919,10 @@ def __call__( resp = self._interceptor.post_get_enhanced_measurement_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_enhanced_measurement_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_enhanced_measurement_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -19198,9 +19019,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetEventCreateRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetEventCreateRule._get_http_options() request, metadata = self._interceptor.pre_get_event_create_rule( request, metadata @@ -19364,9 +19183,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetEventEditRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetEventEditRule._get_http_options() request, metadata = self._interceptor.pre_get_event_edit_rule( request, metadata @@ -19516,9 +19333,7 @@ def __call__( A resource message representing an ``ExpandedDataSet``. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetExpandedDataSet._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetExpandedDataSet._get_http_options() request, metadata = self._interceptor.pre_get_expanded_data_set( request, metadata @@ -19672,9 +19487,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetGlobalSiteTag._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetGlobalSiteTag._get_http_options() request, metadata = self._interceptor.pre_get_global_site_tag( request, metadata @@ -19825,9 +19638,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetGoogleSignalsSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetGoogleSignalsSettings._get_http_options() request, metadata = self._interceptor.pre_get_google_signals_settings( request, metadata @@ -19974,9 +19785,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetKeyEvent._get_http_options() request, metadata = self._interceptor.pre_get_key_event(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetKeyEvent._get_transcoded_request( @@ -20125,9 +19934,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetMeasurementProtocolSecret._get_http_options() request, metadata = self._interceptor.pre_get_measurement_protocol_secret( request, metadata @@ -20191,11 +19998,10 @@ def __call__( resp = self._interceptor.post_get_measurement_protocol_secret(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_measurement_protocol_secret_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_measurement_protocol_secret_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -20279,9 +20085,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetProperty._get_http_options() request, metadata = self._interceptor.pre_get_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetProperty._get_transcoded_request( @@ -20429,9 +20233,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetReportingDataAnnotation._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetReportingDataAnnotation._get_http_options() request, metadata = self._interceptor.pre_get_reporting_data_annotation( request, metadata @@ -20495,11 +20297,10 @@ def __call__( resp = self._interceptor.post_get_reporting_data_annotation(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_reporting_data_annotation_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_reporting_data_annotation_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -20587,9 +20388,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetReportingIdentitySettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetReportingIdentitySettings._get_http_options() request, metadata = self._interceptor.pre_get_reporting_identity_settings( request, metadata @@ -20653,11 +20452,10 @@ def __call__( resp = self._interceptor.post_get_reporting_identity_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_reporting_identity_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_reporting_identity_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -20746,9 +20544,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetRollupPropertySourceLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetRollupPropertySourceLink._get_http_options() request, metadata = self._interceptor.pre_get_rollup_property_source_link( request, metadata @@ -20812,11 +20608,10 @@ def __call__( resp = self._interceptor.post_get_rollup_property_source_link(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_rollup_property_source_link_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_rollup_property_source_link_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -20901,9 +20696,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetSearchAds360Link._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetSearchAds360Link._get_http_options() request, metadata = self._interceptor.pre_get_search_ads360_link( request, metadata @@ -21056,15 +20849,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetSKAdNetworkConversionValueSchema._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetSKAdNetworkConversionValueSchema._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_sk_ad_network_conversion_value_schema( - request, metadata + request, metadata = ( + self._interceptor.pre_get_sk_ad_network_conversion_value_schema( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetSKAdNetworkConversionValueSchema._get_transcoded_request( http_options, request @@ -21127,11 +20917,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_sk_ad_network_conversion_value_schema_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_sk_ad_network_conversion_value_schema_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -21218,9 +21007,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetSubpropertyEventFilter._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetSubpropertyEventFilter._get_http_options() request, metadata = self._interceptor.pre_get_subproperty_event_filter( request, metadata @@ -21377,9 +21164,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetSubpropertySyncConfig._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetSubpropertySyncConfig._get_http_options() request, metadata = self._interceptor.pre_get_subproperty_sync_config( request, metadata @@ -21527,9 +21312,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListAccessBindings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListAccessBindings._get_http_options() request, metadata = self._interceptor.pre_list_access_bindings( request, metadata @@ -21678,9 +21461,7 @@ def __call__( Request message for ListAccounts RPC. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListAccounts._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListAccounts._get_http_options() request, metadata = self._interceptor.pre_list_accounts(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListAccounts._get_transcoded_request( @@ -21828,9 +21609,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListAccountSummaries._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListAccountSummaries._get_http_options() request, metadata = self._interceptor.pre_list_account_summaries( request, metadata @@ -21982,9 +21761,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListAdSenseLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListAdSenseLinks._get_http_options() request, metadata = self._interceptor.pre_list_ad_sense_links( request, metadata @@ -22136,9 +21913,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListAudiences._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListAudiences._get_http_options() request, metadata = self._interceptor.pre_list_audiences(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListAudiences._get_transcoded_request( @@ -22286,9 +22061,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListBigQueryLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListBigQueryLinks._get_http_options() request, metadata = self._interceptor.pre_list_big_query_links( request, metadata @@ -22440,9 +22213,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListCalculatedMetrics._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListCalculatedMetrics._get_http_options() request, metadata = self._interceptor.pre_list_calculated_metrics( request, metadata @@ -22594,9 +22365,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListChannelGroups._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListChannelGroups._get_http_options() request, metadata = self._interceptor.pre_list_channel_groups( request, metadata @@ -22748,9 +22517,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListConversionEvents._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListConversionEvents._get_http_options() request, metadata = self._interceptor.pre_list_conversion_events( request, metadata @@ -22902,9 +22669,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListCustomDimensions._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListCustomDimensions._get_http_options() request, metadata = self._interceptor.pre_list_custom_dimensions( request, metadata @@ -23056,9 +22821,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListCustomMetrics._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListCustomMetrics._get_http_options() request, metadata = self._interceptor.pre_list_custom_metrics( request, metadata @@ -23210,9 +22973,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListDataStreams._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListDataStreams._get_http_options() request, metadata = self._interceptor.pre_list_data_streams( request, metadata @@ -23369,15 +23130,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListDisplayVideo360AdvertiserLinkProposals._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListDisplayVideo360AdvertiserLinkProposals._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_display_video360_advertiser_link_proposals( - request, metadata + request, metadata = ( + self._interceptor.pre_list_display_video360_advertiser_link_proposals( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListDisplayVideo360AdvertiserLinkProposals._get_transcoded_request( http_options, request @@ -23446,11 +23204,10 @@ def __call__( ) ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_display_video360_advertiser_link_proposals_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_display_video360_advertiser_link_proposals_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -23538,15 +23295,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListDisplayVideo360AdvertiserLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListDisplayVideo360AdvertiserLinks._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_display_video360_advertiser_links( - request, metadata + request, metadata = ( + self._interceptor.pre_list_display_video360_advertiser_links( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListDisplayVideo360AdvertiserLinks._get_transcoded_request( http_options, request @@ -23609,11 +23363,10 @@ def __call__( resp = self._interceptor.post_list_display_video360_advertiser_links(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_display_video360_advertiser_links_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_display_video360_advertiser_links_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -23698,9 +23451,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListEventCreateRules._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListEventCreateRules._get_http_options() request, metadata = self._interceptor.pre_list_event_create_rules( request, metadata @@ -23852,9 +23603,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListEventEditRules._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListEventEditRules._get_http_options() request, metadata = self._interceptor.pre_list_event_edit_rules( request, metadata @@ -24006,9 +23755,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListExpandedDataSets._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListExpandedDataSets._get_http_options() request, metadata = self._interceptor.pre_list_expanded_data_sets( request, metadata @@ -24160,9 +23907,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListFirebaseLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListFirebaseLinks._get_http_options() request, metadata = self._interceptor.pre_list_firebase_links( request, metadata @@ -24314,9 +24059,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListGoogleAdsLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListGoogleAdsLinks._get_http_options() request, metadata = self._interceptor.pre_list_google_ads_links( request, metadata @@ -24467,9 +24210,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListKeyEvents._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListKeyEvents._get_http_options() request, metadata = self._interceptor.pre_list_key_events(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListKeyEvents._get_transcoded_request( @@ -24620,9 +24361,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListMeasurementProtocolSecrets._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListMeasurementProtocolSecrets._get_http_options() request, metadata = self._interceptor.pre_list_measurement_protocol_secrets( request, metadata @@ -24686,11 +24425,10 @@ def __call__( resp = self._interceptor.post_list_measurement_protocol_secrets(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_measurement_protocol_secrets_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_measurement_protocol_secrets_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -24777,9 +24515,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListProperties._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListProperties._get_http_options() request, metadata = self._interceptor.pre_list_properties(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListProperties._get_transcoded_request( @@ -24930,9 +24666,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListReportingDataAnnotations._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListReportingDataAnnotations._get_http_options() request, metadata = self._interceptor.pre_list_reporting_data_annotations( request, metadata @@ -24996,11 +24730,10 @@ def __call__( resp = self._interceptor.post_list_reporting_data_annotations(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_reporting_data_annotations_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_reporting_data_annotations_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -25090,9 +24823,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListRollupPropertySourceLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListRollupPropertySourceLinks._get_http_options() request, metadata = self._interceptor.pre_list_rollup_property_source_links( request, metadata @@ -25156,11 +24887,10 @@ def __call__( resp = self._interceptor.post_list_rollup_property_source_links(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_rollup_property_source_links_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_rollup_property_source_links_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -25247,9 +24977,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListSearchAds360Links._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListSearchAds360Links._get_http_options() request, metadata = self._interceptor.pre_list_search_ads360_links( request, metadata @@ -25406,15 +25134,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListSKAdNetworkConversionValueSchemas._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListSKAdNetworkConversionValueSchemas._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_sk_ad_network_conversion_value_schemas( - request, metadata + request, metadata = ( + self._interceptor.pre_list_sk_ad_network_conversion_value_schemas( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListSKAdNetworkConversionValueSchemas._get_transcoded_request( http_options, request @@ -25479,11 +25204,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_sk_ad_network_conversion_value_schemas_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_sk_ad_network_conversion_value_schemas_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -25571,9 +25295,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListSubpropertyEventFilters._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListSubpropertyEventFilters._get_http_options() request, metadata = self._interceptor.pre_list_subproperty_event_filters( request, metadata @@ -25637,11 +25359,10 @@ def __call__( resp = self._interceptor.post_list_subproperty_event_filters(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_subproperty_event_filters_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_subproperty_event_filters_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -25729,9 +25450,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListSubpropertySyncConfigs._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListSubpropertySyncConfigs._get_http_options() request, metadata = self._interceptor.pre_list_subproperty_sync_configs( request, metadata @@ -25795,11 +25514,10 @@ def __call__( resp = self._interceptor.post_list_subproperty_sync_configs(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_subproperty_sync_configs_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_subproperty_sync_configs_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -25887,9 +25605,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseProvisionAccountTicket._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseProvisionAccountTicket._get_http_options() request, metadata = self._interceptor.pre_provision_account_ticket( request, metadata @@ -26045,9 +25761,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseProvisionSubproperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseProvisionSubproperty._get_http_options() request, metadata = self._interceptor.pre_provision_subproperty( request, metadata @@ -26199,9 +25913,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseReorderEventEditRules._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseReorderEventEditRules._get_http_options() request, metadata = self._interceptor.pre_reorder_event_edit_rules( request, metadata @@ -26323,9 +26035,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseRunAccessReport._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseRunAccessReport._get_http_options() request, metadata = self._interceptor.pre_run_access_report( request, metadata @@ -26484,9 +26194,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseSearchChangeHistoryEvents._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseSearchChangeHistoryEvents._get_http_options() request, metadata = self._interceptor.pre_search_change_history_events( request, metadata @@ -26644,9 +26352,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseSubmitUserDeletion._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseSubmitUserDeletion._get_http_options() request, metadata = self._interceptor.pre_submit_user_deletion( request, metadata @@ -26804,9 +26510,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccessBinding._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccessBinding._get_http_options() request, metadata = self._interceptor.pre_update_access_binding( request, metadata @@ -26962,9 +26666,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccount._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccount._get_http_options() request, metadata = self._interceptor.pre_update_account(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccount._get_transcoded_request( @@ -27118,9 +26820,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAttributionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAttributionSettings._get_http_options() request, metadata = self._interceptor.pre_update_attribution_settings( request, metadata @@ -27274,9 +26974,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAudience._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAudience._get_http_options() request, metadata = self._interceptor.pre_update_audience(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAudience._get_transcoded_request( @@ -27428,9 +27126,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateBigQueryLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateBigQueryLink._get_http_options() request, metadata = self._interceptor.pre_update_big_query_link( request, metadata @@ -27584,9 +27280,7 @@ def __call__( A definition for a calculated metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCalculatedMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCalculatedMetric._get_http_options() request, metadata = self._interceptor.pre_update_calculated_metric( request, metadata @@ -27740,9 +27434,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateChannelGroup._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateChannelGroup._get_http_options() request, metadata = self._interceptor.pre_update_channel_group( request, metadata @@ -27898,9 +27590,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateConversionEvent._get_http_options() request, metadata = self._interceptor.pre_update_conversion_event( request, metadata @@ -28054,9 +27744,7 @@ def __call__( A definition for a CustomDimension. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomDimension._get_http_options() request, metadata = self._interceptor.pre_update_custom_dimension( request, metadata @@ -28210,9 +27898,7 @@ def __call__( A definition for a custom metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomMetric._get_http_options() request, metadata = self._interceptor.pre_update_custom_metric( request, metadata @@ -28372,9 +28058,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataRedactionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataRedactionSettings._get_http_options() request, metadata = self._interceptor.pre_update_data_redaction_settings( request, metadata @@ -28443,11 +28127,10 @@ def __call__( resp = self._interceptor.post_update_data_redaction_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_data_redaction_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_data_redaction_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -28534,9 +28217,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataRetentionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataRetentionSettings._get_http_options() request, metadata = self._interceptor.pre_update_data_retention_settings( request, metadata @@ -28605,11 +28286,10 @@ def __call__( resp = self._interceptor.post_update_data_retention_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_data_retention_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_data_retention_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -28693,9 +28373,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataStream._get_http_options() request, metadata = self._interceptor.pre_update_data_stream( request, metadata @@ -28855,15 +28533,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDisplayVideo360AdvertiserLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDisplayVideo360AdvertiserLink._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_display_video360_advertiser_link( - request, metadata + request, metadata = ( + self._interceptor.pre_update_display_video360_advertiser_link( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDisplayVideo360AdvertiserLink._get_transcoded_request( http_options, request @@ -28929,11 +28604,10 @@ def __call__( resp = self._interceptor.post_update_display_video360_advertiser_link(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_display_video360_advertiser_link_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_display_video360_advertiser_link_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -29024,15 +28698,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateEnhancedMeasurementSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateEnhancedMeasurementSettings._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_enhanced_measurement_settings( - request, metadata + request, metadata = ( + self._interceptor.pre_update_enhanced_measurement_settings( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateEnhancedMeasurementSettings._get_transcoded_request( http_options, request @@ -29098,11 +28769,10 @@ def __call__( resp = self._interceptor.post_update_enhanced_measurement_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_enhanced_measurement_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_enhanced_measurement_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -29200,9 +28870,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateEventCreateRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateEventCreateRule._get_http_options() request, metadata = self._interceptor.pre_update_event_create_rule( request, metadata @@ -29372,9 +29040,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateEventEditRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateEventEditRule._get_http_options() request, metadata = self._interceptor.pre_update_event_edit_rule( request, metadata @@ -29530,9 +29196,7 @@ def __call__( A resource message representing an ``ExpandedDataSet``. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateExpandedDataSet._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateExpandedDataSet._get_http_options() request, metadata = self._interceptor.pre_update_expanded_data_set( request, metadata @@ -29690,9 +29354,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateGoogleAdsLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateGoogleAdsLink._get_http_options() request, metadata = self._interceptor.pre_update_google_ads_link( request, metadata @@ -29851,9 +29513,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateGoogleSignalsSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateGoogleSignalsSettings._get_http_options() request, metadata = self._interceptor.pre_update_google_signals_settings( request, metadata @@ -29922,11 +29582,10 @@ def __call__( resp = self._interceptor.post_update_google_signals_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_google_signals_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_google_signals_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -30010,9 +29669,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateKeyEvent._get_http_options() request, metadata = self._interceptor.pre_update_key_event( request, metadata @@ -30169,15 +29826,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateMeasurementProtocolSecret._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_measurement_protocol_secret( - request, metadata + request, metadata = ( + self._interceptor.pre_update_measurement_protocol_secret( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateMeasurementProtocolSecret._get_transcoded_request( http_options, request @@ -30243,11 +29897,10 @@ def __call__( resp = self._interceptor.post_update_measurement_protocol_secret(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_measurement_protocol_secret_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_measurement_protocol_secret_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -30333,9 +29986,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateProperty._get_http_options() request, metadata = self._interceptor.pre_update_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateProperty._get_transcoded_request( @@ -30491,9 +30142,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateReportingDataAnnotation._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateReportingDataAnnotation._get_http_options() request, metadata = self._interceptor.pre_update_reporting_data_annotation( request, metadata @@ -30562,11 +30211,10 @@ def __call__( resp = self._interceptor.post_update_reporting_data_annotation(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_reporting_data_annotation_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_reporting_data_annotation_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -30652,9 +30300,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSearchAds360Link._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSearchAds360Link._get_http_options() request, metadata = self._interceptor.pre_update_search_ads360_link( request, metadata @@ -30812,15 +30458,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSKAdNetworkConversionValueSchema._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSKAdNetworkConversionValueSchema._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_sk_ad_network_conversion_value_schema( - request, metadata + request, metadata = ( + self._interceptor.pre_update_sk_ad_network_conversion_value_schema( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSKAdNetworkConversionValueSchema._get_transcoded_request( http_options, request @@ -30888,11 +30531,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_sk_ad_network_conversion_value_schema_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_sk_ad_network_conversion_value_schema_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -30982,9 +30624,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSubpropertyEventFilter._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSubpropertyEventFilter._get_http_options() request, metadata = self._interceptor.pre_update_subproperty_event_filter( request, metadata @@ -31053,11 +30693,10 @@ def __call__( resp = self._interceptor.post_update_subproperty_event_filter(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_subproperty_event_filter_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_subproperty_event_filter_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -31152,9 +30791,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSubpropertySyncConfig._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSubpropertySyncConfig._get_http_options() request, metadata = self._interceptor.pre_update_subproperty_sync_config( request, metadata @@ -31223,11 +30860,10 @@ def __call__( resp = self._interceptor.post_update_subproperty_sync_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_subproperty_sync_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_subproperty_sync_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -31261,7 +30897,9 @@ def acknowledge_user_data_collection( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AcknowledgeUserDataCollection(self._session, self._host, self._interceptor) # type: ignore + return self._AcknowledgeUserDataCollection( + self._session, self._host, self._interceptor + ) # type: ignore @property def approve_display_video360_advertiser_link_proposal( @@ -31272,7 +30910,9 @@ def approve_display_video360_advertiser_link_proposal( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ApproveDisplayVideo360AdvertiserLinkProposal(self._session, self._host, self._interceptor) # type: ignore + return self._ApproveDisplayVideo360AdvertiserLinkProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def archive_audience( @@ -31288,7 +30928,9 @@ def archive_custom_dimension( ) -> Callable[[analytics_admin.ArchiveCustomDimensionRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ArchiveCustomDimension(self._session, self._host, self._interceptor) # type: ignore + return self._ArchiveCustomDimension( + self._session, self._host, self._interceptor + ) # type: ignore @property def archive_custom_metric( @@ -31307,7 +30949,9 @@ def batch_create_access_bindings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchCreateAccessBindings(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateAccessBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_delete_access_bindings( @@ -31315,7 +30959,9 @@ def batch_delete_access_bindings( ) -> Callable[[analytics_admin.BatchDeleteAccessBindingsRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchDeleteAccessBindings(self._session, self._host, self._interceptor) # type: ignore + return self._BatchDeleteAccessBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_get_access_bindings( @@ -31326,7 +30972,9 @@ def batch_get_access_bindings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchGetAccessBindings(self._session, self._host, self._interceptor) # type: ignore + return self._BatchGetAccessBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_access_bindings( @@ -31337,7 +30985,9 @@ def batch_update_access_bindings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchUpdateAccessBindings(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateAccessBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_display_video360_advertiser_link_proposal( @@ -31348,7 +30998,9 @@ def cancel_display_video360_advertiser_link_proposal( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CancelDisplayVideo360AdvertiserLinkProposal(self._session, self._host, self._interceptor) # type: ignore + return self._CancelDisplayVideo360AdvertiserLinkProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_access_binding( @@ -31392,7 +31044,9 @@ def create_calculated_metric( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateCalculatedMetric(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCalculatedMetric( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_channel_group( @@ -31449,7 +31103,9 @@ def create_display_video360_advertiser_link( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateDisplayVideo360AdvertiserLink(self._session, self._host, self._interceptor) # type: ignore + return self._CreateDisplayVideo360AdvertiserLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_display_video360_advertiser_link_proposal( @@ -31460,7 +31116,9 @@ def create_display_video360_advertiser_link_proposal( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateDisplayVideo360AdvertiserLinkProposal(self._session, self._host, self._interceptor) # type: ignore + return self._CreateDisplayVideo360AdvertiserLinkProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_event_create_rule( @@ -31530,7 +31188,9 @@ def create_measurement_protocol_secret( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._CreateMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_property( @@ -31549,7 +31209,9 @@ def create_reporting_data_annotation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateReportingDataAnnotation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateReportingDataAnnotation( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_rollup_property( @@ -31571,7 +31233,9 @@ def create_rollup_property_source_link( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateRollupPropertySourceLink(self._session, self._host, self._interceptor) # type: ignore + return self._CreateRollupPropertySourceLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_search_ads360_link( @@ -31581,7 +31245,9 @@ def create_search_ads360_link( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSearchAds360Link(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSearchAds360Link( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_sk_ad_network_conversion_value_schema( @@ -31592,7 +31258,9 @@ def create_sk_ad_network_conversion_value_schema( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSKAdNetworkConversionValueSchema(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSKAdNetworkConversionValueSchema( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_subproperty_event_filter( @@ -31603,7 +31271,9 @@ def create_subproperty_event_filter( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSubpropertyEventFilter(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSubpropertyEventFilter( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_access_binding( @@ -31643,7 +31313,9 @@ def delete_calculated_metric( ) -> Callable[[analytics_admin.DeleteCalculatedMetricRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteCalculatedMetric(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteCalculatedMetric( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_channel_group( @@ -31677,7 +31349,9 @@ def delete_display_video360_advertiser_link( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteDisplayVideo360AdvertiserLink(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteDisplayVideo360AdvertiserLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_display_video360_advertiser_link_proposal( @@ -31688,7 +31362,9 @@ def delete_display_video360_advertiser_link_proposal( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteDisplayVideo360AdvertiserLinkProposal(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteDisplayVideo360AdvertiserLinkProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_event_create_rule( @@ -31746,7 +31422,9 @@ def delete_measurement_protocol_secret( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_property( @@ -31764,7 +31442,9 @@ def delete_reporting_data_annotation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteReportingDataAnnotation(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteReportingDataAnnotation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_rollup_property_source_link( @@ -31774,7 +31454,9 @@ def delete_rollup_property_source_link( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteRollupPropertySourceLink(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteRollupPropertySourceLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_search_ads360_link( @@ -31782,7 +31464,9 @@ def delete_search_ads360_link( ) -> Callable[[analytics_admin.DeleteSearchAds360LinkRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteSearchAds360Link(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSearchAds360Link( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_sk_ad_network_conversion_value_schema( @@ -31792,7 +31476,9 @@ def delete_sk_ad_network_conversion_value_schema( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteSKAdNetworkConversionValueSchema(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSKAdNetworkConversionValueSchema( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_subproperty_event_filter( @@ -31802,7 +31488,9 @@ def delete_subproperty_event_filter( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteSubpropertyEventFilter(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSubpropertyEventFilter( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_access_binding( @@ -31836,7 +31524,9 @@ def get_attribution_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetAttributionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetAttributionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_audience( @@ -31909,7 +31599,9 @@ def get_data_redaction_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetDataRedactionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetDataRedactionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_data_retention_settings( @@ -31920,7 +31612,9 @@ def get_data_retention_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetDataRetentionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetDataRetentionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_data_sharing_settings( @@ -31930,7 +31624,9 @@ def get_data_sharing_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetDataSharingSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetDataSharingSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_data_stream( @@ -31949,7 +31645,9 @@ def get_display_video360_advertiser_link( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetDisplayVideo360AdvertiserLink(self._session, self._host, self._interceptor) # type: ignore + return self._GetDisplayVideo360AdvertiserLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_display_video360_advertiser_link_proposal( @@ -31960,7 +31658,9 @@ def get_display_video360_advertiser_link_proposal( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetDisplayVideo360AdvertiserLinkProposal(self._session, self._host, self._interceptor) # type: ignore + return self._GetDisplayVideo360AdvertiserLinkProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_enhanced_measurement_settings( @@ -31971,7 +31671,9 @@ def get_enhanced_measurement_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetEnhancedMeasurementSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetEnhancedMeasurementSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_event_create_rule( @@ -32021,7 +31723,9 @@ def get_google_signals_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetGoogleSignalsSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetGoogleSignalsSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_key_event( @@ -32040,7 +31744,9 @@ def get_measurement_protocol_secret( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._GetMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_property( @@ -32059,7 +31765,9 @@ def get_reporting_data_annotation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetReportingDataAnnotation(self._session, self._host, self._interceptor) # type: ignore + return self._GetReportingDataAnnotation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_reporting_identity_settings( @@ -32070,7 +31778,9 @@ def get_reporting_identity_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetReportingIdentitySettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetReportingIdentitySettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_rollup_property_source_link( @@ -32081,7 +31791,9 @@ def get_rollup_property_source_link( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetRollupPropertySourceLink(self._session, self._host, self._interceptor) # type: ignore + return self._GetRollupPropertySourceLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_search_ads360_link( @@ -32102,7 +31814,9 @@ def get_sk_ad_network_conversion_value_schema( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetSKAdNetworkConversionValueSchema(self._session, self._host, self._interceptor) # type: ignore + return self._GetSKAdNetworkConversionValueSchema( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_subproperty_event_filter( @@ -32113,7 +31827,9 @@ def get_subproperty_event_filter( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetSubpropertyEventFilter(self._session, self._host, self._interceptor) # type: ignore + return self._GetSubpropertyEventFilter( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_subproperty_sync_config( @@ -32124,7 +31840,9 @@ def get_subproperty_sync_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetSubpropertySyncConfig(self._session, self._host, self._interceptor) # type: ignore + return self._GetSubpropertySyncConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_access_bindings( @@ -32265,7 +31983,9 @@ def list_display_video360_advertiser_link_proposals( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListDisplayVideo360AdvertiserLinkProposals(self._session, self._host, self._interceptor) # type: ignore + return self._ListDisplayVideo360AdvertiserLinkProposals( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_display_video360_advertiser_links( @@ -32276,7 +31996,9 @@ def list_display_video360_advertiser_links( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListDisplayVideo360AdvertiserLinks(self._session, self._host, self._interceptor) # type: ignore + return self._ListDisplayVideo360AdvertiserLinks( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_event_create_rules( @@ -32352,7 +32074,9 @@ def list_measurement_protocol_secrets( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListMeasurementProtocolSecrets(self._session, self._host, self._interceptor) # type: ignore + return self._ListMeasurementProtocolSecrets( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_properties( @@ -32373,7 +32097,9 @@ def list_reporting_data_annotations( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListReportingDataAnnotations(self._session, self._host, self._interceptor) # type: ignore + return self._ListReportingDataAnnotations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_rollup_property_source_links( @@ -32384,7 +32110,9 @@ def list_rollup_property_source_links( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListRollupPropertySourceLinks(self._session, self._host, self._interceptor) # type: ignore + return self._ListRollupPropertySourceLinks( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_search_ads360_links( @@ -32406,7 +32134,9 @@ def list_sk_ad_network_conversion_value_schemas( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListSKAdNetworkConversionValueSchemas(self._session, self._host, self._interceptor) # type: ignore + return self._ListSKAdNetworkConversionValueSchemas( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_subproperty_event_filters( @@ -32417,7 +32147,9 @@ def list_subproperty_event_filters( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListSubpropertyEventFilters(self._session, self._host, self._interceptor) # type: ignore + return self._ListSubpropertyEventFilters( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_subproperty_sync_configs( @@ -32428,7 +32160,9 @@ def list_subproperty_sync_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListSubpropertySyncConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListSubpropertySyncConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def provision_account_ticket( @@ -32439,7 +32173,9 @@ def provision_account_ticket( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ProvisionAccountTicket(self._session, self._host, self._interceptor) # type: ignore + return self._ProvisionAccountTicket( + self._session, self._host, self._interceptor + ) # type: ignore @property def provision_subproperty( @@ -32480,7 +32216,9 @@ def search_change_history_events( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SearchChangeHistoryEvents(self._session, self._host, self._interceptor) # type: ignore + return self._SearchChangeHistoryEvents( + self._session, self._host, self._interceptor + ) # type: ignore @property def submit_user_deletion( @@ -32520,7 +32258,9 @@ def update_attribution_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateAttributionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAttributionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_audience( @@ -32546,7 +32286,9 @@ def update_calculated_metric( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateCalculatedMetric(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCalculatedMetric( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_channel_group( @@ -32595,7 +32337,9 @@ def update_data_redaction_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateDataRedactionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDataRedactionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_data_retention_settings( @@ -32606,7 +32350,9 @@ def update_data_retention_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateDataRetentionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDataRetentionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_data_stream( @@ -32625,7 +32371,9 @@ def update_display_video360_advertiser_link( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateDisplayVideo360AdvertiserLink(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDisplayVideo360AdvertiserLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_enhanced_measurement_settings( @@ -32636,7 +32384,9 @@ def update_enhanced_measurement_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateEnhancedMeasurementSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateEnhancedMeasurementSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_event_create_rule( @@ -32690,7 +32440,9 @@ def update_google_signals_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateGoogleSignalsSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateGoogleSignalsSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_key_event( @@ -32709,7 +32461,9 @@ def update_measurement_protocol_secret( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_property( @@ -32728,7 +32482,9 @@ def update_reporting_data_annotation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateReportingDataAnnotation(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateReportingDataAnnotation( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_search_ads360_link( @@ -32738,7 +32494,9 @@ def update_search_ads360_link( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateSearchAds360Link(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSearchAds360Link( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_sk_ad_network_conversion_value_schema( @@ -32749,7 +32507,9 @@ def update_sk_ad_network_conversion_value_schema( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateSKAdNetworkConversionValueSchema(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSKAdNetworkConversionValueSchema( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_subproperty_event_filter( @@ -32760,7 +32520,9 @@ def update_subproperty_event_filter( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateSubpropertyEventFilter(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSubpropertyEventFilter( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_subproperty_sync_config( @@ -32771,7 +32533,9 @@ def update_subproperty_sync_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateSubpropertySyncConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSubpropertySyncConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest_base.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest_base.py index 02ea91e39a91..737034dadcec 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest_base.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest_base.py @@ -17,10 +17,20 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.analytics.admin_v1alpha.types import ( + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -28,14 +38,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter from .base import DEFAULT_CLIENT_INFO, AnalyticsAdminServiceTransport diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/access_report.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/access_report.py index 04e2be2a8ead..53902be53158 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/access_report.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/access_report.py @@ -285,6 +285,7 @@ class MatchType(proto.Enum): Partial match for the regular expression with the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BEGINS_WITH = 2 @@ -355,6 +356,7 @@ class Operation(proto.Enum): GREATER_THAN_OR_EQUAL (5): Greater than or equal """ + OPERATION_UNSPECIFIED = 0 EQUAL = 1 LESS_THAN = 2 @@ -501,6 +503,7 @@ class OrderType(proto.Enum): values all have equal ordering value below all numeric values. """ + ORDER_TYPE_UNSPECIFIED = 0 ALPHANUMERIC = 1 CASE_INSENSITIVE_ALPHANUMERIC = 2 diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/analytics_admin.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/analytics_admin.py index 5b8e31dfddf0..a56b944eae24 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/analytics_admin.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/analytics_admin.py @@ -21,6 +21,12 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.analytics.admin_v1alpha.types import ( + access_report, + event_create_and_edit, + resources, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -28,10 +34,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import access_report -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import resources __protobuf__ = proto.module( package="google.analytics.admin.v1alpha", @@ -430,19 +432,19 @@ class RunAccessReportResponse(proto.Message): with account-level requests. """ - dimension_headers: MutableSequence[ - access_report.AccessDimensionHeader - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=access_report.AccessDimensionHeader, + dimension_headers: MutableSequence[access_report.AccessDimensionHeader] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=access_report.AccessDimensionHeader, + ) ) - metric_headers: MutableSequence[ - access_report.AccessMetricHeader - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=access_report.AccessMetricHeader, + metric_headers: MutableSequence[access_report.AccessMetricHeader] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=access_report.AccessMetricHeader, + ) ) rows: MutableSequence[access_report.AccessRow] = proto.RepeatedField( proto.MESSAGE, @@ -1198,12 +1200,12 @@ class SearchChangeHistoryEventsRequest(proto.Message): proto.STRING, number=2, ) - resource_type: MutableSequence[ - resources.ChangeHistoryResourceType - ] = proto.RepeatedField( - proto.ENUM, - number=3, - enum=resources.ChangeHistoryResourceType, + resource_type: MutableSequence[resources.ChangeHistoryResourceType] = ( + proto.RepeatedField( + proto.ENUM, + number=3, + enum=resources.ChangeHistoryResourceType, + ) ) action: MutableSequence[resources.ActionType] = proto.RepeatedField( proto.ENUM, @@ -1250,12 +1252,12 @@ class SearchChangeHistoryEventsResponse(proto.Message): def raw_page(self): return self - change_history_events: MutableSequence[ - resources.ChangeHistoryEvent - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.ChangeHistoryEvent, + change_history_events: MutableSequence[resources.ChangeHistoryEvent] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.ChangeHistoryEvent, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -2293,12 +2295,12 @@ class ListSearchAds360LinksResponse(proto.Message): def raw_page(self): return self - search_ads_360_links: MutableSequence[ - resources.SearchAds360Link - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.SearchAds360Link, + search_ads_360_links: MutableSequence[resources.SearchAds360Link] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.SearchAds360Link, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -2773,12 +2775,12 @@ class ListCalculatedMetricsResponse(proto.Message): def raw_page(self): return self - calculated_metrics: MutableSequence[ - resources.CalculatedMetric - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.CalculatedMetric, + calculated_metrics: MutableSequence[resources.CalculatedMetric] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.CalculatedMetric, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -3604,12 +3606,12 @@ class ListExpandedDataSetsResponse(proto.Message): def raw_page(self): return self - expanded_data_sets: MutableSequence[ - gaa_expanded_data_set.ExpandedDataSet - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gaa_expanded_data_set.ExpandedDataSet, + expanded_data_sets: MutableSequence[gaa_expanded_data_set.ExpandedDataSet] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gaa_expanded_data_set.ExpandedDataSet, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -3750,12 +3752,12 @@ class ListChannelGroupsResponse(proto.Message): def raw_page(self): return self - channel_groups: MutableSequence[ - gaa_channel_group.ChannelGroup - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gaa_channel_group.ChannelGroup, + channel_groups: MutableSequence[gaa_channel_group.ChannelGroup] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gaa_channel_group.ChannelGroup, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -4246,12 +4248,12 @@ class ListEventCreateRulesResponse(proto.Message): def raw_page(self): return self - event_create_rules: MutableSequence[ - event_create_and_edit.EventCreateRule - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=event_create_and_edit.EventCreateRule, + event_create_rules: MutableSequence[event_create_and_edit.EventCreateRule] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=event_create_and_edit.EventCreateRule, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -4392,12 +4394,12 @@ class ListEventEditRulesResponse(proto.Message): def raw_page(self): return self - event_edit_rules: MutableSequence[ - event_create_and_edit.EventEditRule - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=event_create_and_edit.EventEditRule, + event_edit_rules: MutableSequence[event_create_and_edit.EventEditRule] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=event_create_and_edit.EventEditRule, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -4957,12 +4959,12 @@ class ListReportingDataAnnotationsResponse(proto.Message): def raw_page(self): return self - reporting_data_annotations: MutableSequence[ - resources.ReportingDataAnnotation - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.ReportingDataAnnotation, + reporting_data_annotations: MutableSequence[resources.ReportingDataAnnotation] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.ReportingDataAnnotation, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -5175,12 +5177,12 @@ class ListSubpropertySyncConfigsResponse(proto.Message): def raw_page(self): return self - subproperty_sync_configs: MutableSequence[ - resources.SubpropertySyncConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.SubpropertySyncConfig, + subproperty_sync_configs: MutableSequence[resources.SubpropertySyncConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.SubpropertySyncConfig, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/audience.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/audience.py index 8eedbfb87645..58b7d8facf53 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/audience.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/audience.py @@ -55,6 +55,7 @@ class AudienceFilterScope(proto.Enum): condition is met by any event across any session. """ + AUDIENCE_FILTER_SCOPE_UNSPECIFIED = 0 AUDIENCE_FILTER_SCOPE_WITHIN_SAME_EVENT = 1 AUDIENCE_FILTER_SCOPE_WITHIN_SAME_SESSION = 2 @@ -159,6 +160,7 @@ class MatchType(proto.Enum): Full regular expression matches with the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BEGINS_WITH = 2 @@ -262,6 +264,7 @@ class Operation(proto.Enum): GREATER_THAN (4): Greater than. """ + OPERATION_UNSPECIFIED = 0 EQUAL = 1 LESS_THAN = 2 @@ -457,12 +460,12 @@ class AudienceFilterExpressionList(proto.Message): A list of Audience filter expressions. """ - filter_expressions: MutableSequence[ - "AudienceFilterExpression" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AudienceFilterExpression", + filter_expressions: MutableSequence["AudienceFilterExpression"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AudienceFilterExpression", + ) ) @@ -617,6 +620,7 @@ class AudienceClauseType(proto.Enum): Users will be excluded from the Audience if the filter clause is met. """ + AUDIENCE_CLAUSE_TYPE_UNSPECIFIED = 0 INCLUDE = 1 EXCLUDE = 2 @@ -664,6 +668,7 @@ class LogCondition(proto.Enum): Audience condition is met, even if the user is already a member of the Audience. """ + LOG_CONDITION_UNSPECIFIED = 0 AUDIENCE_JOINED = 1 AUDIENCE_MEMBERSHIP_RENEWED = 2 @@ -732,6 +737,7 @@ class AudienceExclusionDurationMode(proto.Enum): Exclude users from the Audience if they've ever met the filter clause. """ + AUDIENCE_EXCLUSION_DURATION_MODE_UNSPECIFIED = 0 EXCLUDE_TEMPORARILY = 1 EXCLUDE_PERMANENTLY = 2 diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/channel_group.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/channel_group.py index f31adc8950f9..2b1288ec3b0a 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/channel_group.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/channel_group.py @@ -91,6 +91,7 @@ class MatchType(proto.Enum): Partial regular expression match with the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BEGINS_WITH = 2 @@ -213,12 +214,12 @@ class ChannelGroupFilterExpressionList(proto.Message): A list of Channel Group filter expressions. """ - filter_expressions: MutableSequence[ - "ChannelGroupFilterExpression" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ChannelGroupFilterExpression", + filter_expressions: MutableSequence["ChannelGroupFilterExpression"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ChannelGroupFilterExpression", + ) ) diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/event_create_and_edit.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/event_create_and_edit.py index 6b488354e27b..47923a7debb5 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/event_create_and_edit.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/event_create_and_edit.py @@ -260,6 +260,7 @@ class ComparisonType(proto.Enum): regular expression, case insensitive. Only supported for web streams. """ + COMPARISON_TYPE_UNSPECIFIED = 0 EQUALS = 1 EQUALS_CASE_INSENSITIVE = 2 diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/expanded_data_set.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/expanded_data_set.py index 42aba3353be4..4fe0bcc31bf1 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/expanded_data_set.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/expanded_data_set.py @@ -84,6 +84,7 @@ class MatchType(proto.Enum): CONTAINS (2): Contains the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 CONTAINS = 2 @@ -204,12 +205,12 @@ class ExpandedDataSetFilterExpressionList(proto.Message): A list of ExpandedDataSet filter expressions. """ - filter_expressions: MutableSequence[ - "ExpandedDataSetFilterExpression" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ExpandedDataSetFilterExpression", + filter_expressions: MutableSequence["ExpandedDataSetFilterExpression"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ExpandedDataSetFilterExpression", + ) ) diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/resources.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/resources.py index f16f276328e2..9d50d4498249 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/resources.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/resources.py @@ -22,12 +22,12 @@ import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group +from google.analytics.admin_v1alpha.types import event_create_and_edit from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, ) -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import event_create_and_edit __protobuf__ = proto.module( package="google.analytics.admin.v1alpha", @@ -144,6 +144,7 @@ class IndustryCategory(proto.Enum): SHOPPING (26): Shopping """ + INDUSTRY_CATEGORY_UNSPECIFIED = 0 AUTOMOTIVE = 1 BUSINESS_AND_INDUSTRIAL_MARKETS = 2 @@ -185,6 +186,7 @@ class ServiceLevel(proto.Enum): The paid, premium version of Google Analytics. """ + SERVICE_LEVEL_UNSPECIFIED = 0 GOOGLE_ANALYTICS_STANDARD = 1 GOOGLE_ANALYTICS_360 = 2 @@ -205,6 +207,7 @@ class ActorType(proto.Enum): Changes made by Google Analytics support team staff. """ + ACTOR_TYPE_UNSPECIFIED = 0 USER = 1 SYSTEM = 2 @@ -224,6 +227,7 @@ class ActionType(proto.Enum): DELETED (3): Resource was deleted in this change. """ + ACTION_TYPE_UNSPECIFIED = 0 CREATED = 1 UPDATED = 2 @@ -297,6 +301,7 @@ class ChangeHistoryResourceType(proto.Enum): REPORTING_IDENTITY_SETTINGS (34): ReportingIdentitySettings resource """ + CHANGE_HISTORY_RESOURCE_TYPE_UNSPECIFIED = 0 ACCOUNT = 1 PROPERTY = 2 @@ -342,6 +347,7 @@ class GoogleSignalsState(proto.Enum): GOOGLE_SIGNALS_DISABLED (2): Google Signals is disabled. """ + GOOGLE_SIGNALS_STATE_UNSPECIFIED = 0 GOOGLE_SIGNALS_ENABLED = 1 GOOGLE_SIGNALS_DISABLED = 2 @@ -360,6 +366,7 @@ class GoogleSignalsConsent(proto.Enum): GOOGLE_SIGNALS_CONSENT_NOT_CONSENTED (1): Terms of service have not been accepted """ + GOOGLE_SIGNALS_CONSENT_UNSPECIFIED = 0 GOOGLE_SIGNALS_CONSENT_CONSENTED = 2 GOOGLE_SIGNALS_CONSENT_NOT_CONSENTED = 1 @@ -379,6 +386,7 @@ class LinkProposalInitiatingProduct(proto.Enum): This proposal was created by a user from a linked product (not Google Analytics). """ + LINK_PROPOSAL_INITIATING_PRODUCT_UNSPECIFIED = 0 GOOGLE_ANALYTICS = 1 LINKED_PRODUCT = 2 @@ -418,6 +426,7 @@ class LinkProposalState(proto.Enum): This proposal will be automatically deleted after some time. """ + LINK_PROPOSAL_STATE_UNSPECIFIED = 0 AWAITING_REVIEW_FROM_GOOGLE_ANALYTICS = 1 AWAITING_REVIEW_FROM_LINKED_PRODUCT = 2 @@ -440,6 +449,7 @@ class PropertyType(proto.Enum): PROPERTY_TYPE_ROLLUP (3): Google Analytics rollup property """ + PROPERTY_TYPE_UNSPECIFIED = 0 PROPERTY_TYPE_ORDINARY = 1 PROPERTY_TYPE_SUBPROPERTY = 2 @@ -462,6 +472,7 @@ class CoarseValue(proto.Enum): COARSE_VALUE_HIGH (3): Coarse value of high. """ + COARSE_VALUE_UNSPECIFIED = 0 COARSE_VALUE_LOW = 1 COARSE_VALUE_MEDIUM = 2 @@ -720,6 +731,7 @@ class DataStreamType(proto.Enum): IOS_APP_DATA_STREAM (3): iOS app data stream. """ + DATA_STREAM_TYPE_UNSPECIFIED = 0 WEB_DATA_STREAM = 1 ANDROID_APP_DATA_STREAM = 2 @@ -2175,6 +2187,7 @@ class ConversionCountingMethod(proto.Enum): An Event instance is considered a Conversion at most once per session per user. """ + CONVERSION_COUNTING_METHOD_UNSPECIFIED = 0 ONCE_PER_EVENT = 1 ONCE_PER_SESSION = 2 @@ -2296,6 +2309,7 @@ class CountingMethod(proto.Enum): An Event instance is considered a Key Event at most once per session per user. """ + COUNTING_METHOD_UNSPECIFIED = 0 ONCE_PER_EVENT = 1 ONCE_PER_SESSION = 2 @@ -2450,6 +2464,7 @@ class DimensionScope(proto.Enum): ITEM (3): Dimension scoped to eCommerce items """ + DIMENSION_SCOPE_UNSPECIFIED = 0 EVENT = 1 USER = 2 @@ -2553,6 +2568,7 @@ class MeasurementUnit(proto.Enum): HOURS (10): This metric measures hours. """ + MEASUREMENT_UNIT_UNSPECIFIED = 0 STANDARD = 1 CURRENCY = 2 @@ -2574,6 +2590,7 @@ class MetricScope(proto.Enum): EVENT (1): Metric scoped to an event. """ + METRIC_SCOPE_UNSPECIFIED = 0 EVENT = 1 @@ -2589,6 +2606,7 @@ class RestrictedMetricType(proto.Enum): REVENUE_DATA (2): Metric reports revenue data. """ + RESTRICTED_METRIC_TYPE_UNSPECIFIED = 0 COST_DATA = 1 REVENUE_DATA = 2 @@ -2699,6 +2717,7 @@ class MetricUnit(proto.Enum): HOURS (10): This metric measures hours. """ + METRIC_UNIT_UNSPECIFIED = 0 STANDARD = 1 CURRENCY = 2 @@ -2724,6 +2743,7 @@ class RestrictedMetricType(proto.Enum): REVENUE_DATA (2): Metric reports revenue data. """ + RESTRICTED_METRIC_TYPE_UNSPECIFIED = 0 COST_DATA = 1 REVENUE_DATA = 2 @@ -2809,6 +2829,7 @@ class RetentionDuration(proto.Enum): months. Available to 360 properties only. Available for event data only. """ + RETENTION_DURATION_UNSPECIFIED = 0 TWO_MONTHS = 1 FOURTEEN_MONTHS = 3 @@ -2882,6 +2903,7 @@ class AcquisitionConversionEventLookbackWindow(proto.Enum): ACQUISITION_CONVERSION_EVENT_LOOKBACK_WINDOW_30_DAYS (2): 30-day lookback window. """ + ACQUISITION_CONVERSION_EVENT_LOOKBACK_WINDOW_UNSPECIFIED = 0 ACQUISITION_CONVERSION_EVENT_LOOKBACK_WINDOW_7_DAYS = 1 ACQUISITION_CONVERSION_EVENT_LOOKBACK_WINDOW_30_DAYS = 2 @@ -2901,6 +2923,7 @@ class OtherConversionEventLookbackWindow(proto.Enum): OTHER_CONVERSION_EVENT_LOOKBACK_WINDOW_90_DAYS (3): 90-day lookback window. """ + OTHER_CONVERSION_EVENT_LOOKBACK_WINDOW_UNSPECIFIED = 0 OTHER_CONVERSION_EVENT_LOOKBACK_WINDOW_30_DAYS = 1 OTHER_CONVERSION_EVENT_LOOKBACK_WINDOW_60_DAYS = 2 @@ -2928,6 +2951,7 @@ class ReportingAttributionModel(proto.Enum): Paid channel that the customer clicked through before converting. Previously ADS_PREFERRED_LAST_CLICK """ + REPORTING_ATTRIBUTION_MODEL_UNSPECIFIED = 0 PAID_AND_ORGANIC_CHANNELS_DATA_DRIVEN = 1 PAID_AND_ORGANIC_CHANNELS_LAST_CLICK = 2 @@ -2955,6 +2979,7 @@ class AdsWebConversionDataExportScope(proto.Enum): conversion credit. To learn more, see `Google Paid channels `__. """ + ADS_WEB_CONVERSION_DATA_EXPORT_SCOPE_UNSPECIFIED = 0 NOT_SELECTED_YET = 1 PAID_AND_ORGANIC_CHANNELS = 2 @@ -3400,6 +3425,7 @@ class Color(proto.Enum): Orange color. (Only used for system-generated annotations) """ + COLOR_UNSPECIFIED = 0 PURPLE = 1 BROWN = 2 @@ -3518,6 +3544,7 @@ class SynchronizationMode(proto.Enum): property. Local mutations are not allowed on the subproperty (Create / Update / Delete) """ + SYNCHRONIZATION_MODE_UNSPECIFIED = 0 NONE = 1 ALL = 2 @@ -3565,6 +3592,7 @@ class ReportingIdentity(proto.Enum): DEVICE_BASED (3): Device-based reporting identity strategy. """ + IDENTITY_BLENDING_STRATEGY_UNSPECIFIED = 0 BLENDED = 1 OBSERVED = 2 diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/subproperty_event_filter.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/subproperty_event_filter.py index 9c2f204bfeed..15731b5bf7a8 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/subproperty_event_filter.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/subproperty_event_filter.py @@ -93,6 +93,7 @@ class MatchType(proto.Enum): Partial regular expression matches with the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BEGINS_WITH = 2 @@ -194,12 +195,12 @@ class SubpropertyEventFilterExpressionList(proto.Message): Subproperty event filter expressions """ - filter_expressions: MutableSequence[ - "SubpropertyEventFilterExpression" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SubpropertyEventFilterExpression", + filter_expressions: MutableSequence["SubpropertyEventFilterExpression"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SubpropertyEventFilterExpression", + ) ) @@ -231,6 +232,7 @@ class FilterClauseType(proto.Enum): Events will be excluded from the Sub property if the filter clause is met. """ + FILTER_CLAUSE_TYPE_UNSPECIFIED = 0 INCLUDE = 1 EXCLUDE = 2 @@ -280,12 +282,12 @@ class SubpropertyEventFilter(proto.Message): number=2, optional=True, ) - filter_clauses: MutableSequence[ - "SubpropertyEventFilterClause" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SubpropertyEventFilterClause", + filter_clauses: MutableSequence["SubpropertyEventFilterClause"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SubpropertyEventFilterClause", + ) ) diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/__init__.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/__init__.py index fbae194a5849..01dda1535b13 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/__init__.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.analytics_admin_service import ( AnalyticsAdminServiceAsyncClient, AnalyticsAdminServiceClient, diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/async_client.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/async_client.py index 8f37b06ac7d9..e9a506dca9ce 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/async_client.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.admin_v1beta import gapic_version as package_version @@ -188,7 +188,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AnalyticsAdminServiceAsyncClient: The constructed client. """ - return AnalyticsAdminServiceClient.from_service_account_info.__func__(AnalyticsAdminServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AnalyticsAdminServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AnalyticsAdminServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -204,7 +207,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AnalyticsAdminServiceAsyncClient: The constructed client. """ - return AnalyticsAdminServiceClient.from_service_account_file.__func__(AnalyticsAdminServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AnalyticsAdminServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AnalyticsAdminServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -242,7 +248,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AnalyticsAdminServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AnalyticsAdminServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AnalyticsAdminServiceTransport: diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/client.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/client.py index f1d543e85cf9..0c88d2660100 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/client.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.admin_v1beta import gapic_version as package_version @@ -86,9 +86,7 @@ class AnalyticsAdminServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AnalyticsAdminServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsAdminServiceTransport]] _transport_registry["grpc"] = AnalyticsAdminServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsAdminServiceGrpcAsyncIOTransport _transport_registry["rest"] = AnalyticsAdminServiceRestTransport @@ -860,11 +858,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AnalyticsAdminServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AnalyticsAdminServiceClient._read_environment_variables() + ) self._client_cert_source = AnalyticsAdminServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -899,8 +895,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AnalyticsAdminServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/pagers.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/pagers.py index eda6d347944a..03cdf55db47f 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/pagers.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -381,7 +381,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -457,7 +457,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -537,7 +537,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -613,7 +613,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -693,7 +693,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -769,7 +769,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -849,7 +849,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -927,7 +927,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1009,7 +1009,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1087,7 +1087,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1169,7 +1169,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1245,7 +1245,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1327,7 +1327,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1403,7 +1403,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1483,7 +1483,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1559,7 +1559,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1641,7 +1641,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1717,7 +1717,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1797,7 +1797,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1873,7 +1873,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/__init__.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/__init__.py index 36fdaad681d1..13b4fb2c6f02 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/__init__.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AnalyticsAdminServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsAdminServiceTransport]] _transport_registry["grpc"] = AnalyticsAdminServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsAdminServiceGrpcAsyncIOTransport _transport_registry["rest"] = AnalyticsAdminServiceRestTransport diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/base.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/base.py index 1cfc7d8b4ef3..f3d290afbc0c 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/base.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.analytics.admin_v1beta import gapic_version as package_version from google.analytics.admin_v1beta.types import analytics_admin, resources diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc.py index cdbf6698363d..9565903d80a9 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.analytics.admin_v1beta.types import analytics_admin, resources @@ -901,12 +901,12 @@ def get_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "get_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/GetMeasurementProtocolSecret", - request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["get_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/GetMeasurementProtocolSecret", + request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["get_measurement_protocol_secret"] @@ -934,12 +934,12 @@ def list_measurement_protocol_secrets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_measurement_protocol_secrets" not in self._stubs: - self._stubs[ - "list_measurement_protocol_secrets" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/ListMeasurementProtocolSecrets", - request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, - response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + self._stubs["list_measurement_protocol_secrets"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/ListMeasurementProtocolSecrets", + request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, + response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + ) ) return self._stubs["list_measurement_protocol_secrets"] @@ -966,12 +966,12 @@ def create_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "create_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/CreateMeasurementProtocolSecret", - request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["create_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/CreateMeasurementProtocolSecret", + request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["create_measurement_protocol_secret"] @@ -997,12 +997,12 @@ def delete_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "delete_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/DeleteMeasurementProtocolSecret", - request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/DeleteMeasurementProtocolSecret", + request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_measurement_protocol_secret"] @@ -1029,12 +1029,12 @@ def update_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "update_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateMeasurementProtocolSecret", - request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["update_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateMeasurementProtocolSecret", + request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["update_measurement_protocol_secret"] @@ -1065,12 +1065,12 @@ def acknowledge_user_data_collection( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "acknowledge_user_data_collection" not in self._stubs: - self._stubs[ - "acknowledge_user_data_collection" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/AcknowledgeUserDataCollection", - request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, - response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + self._stubs["acknowledge_user_data_collection"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/AcknowledgeUserDataCollection", + request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, + response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + ) ) return self._stubs["acknowledge_user_data_collection"] @@ -1100,12 +1100,12 @@ def search_change_history_events( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_change_history_events" not in self._stubs: - self._stubs[ - "search_change_history_events" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/SearchChangeHistoryEvents", - request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, - response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + self._stubs["search_change_history_events"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/SearchChangeHistoryEvents", + request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, + response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + ) ) return self._stubs["search_change_history_events"] @@ -1684,12 +1684,12 @@ def get_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_retention_settings" not in self._stubs: - self._stubs[ - "get_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/GetDataRetentionSettings", - request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["get_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/GetDataRetentionSettings", + request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["get_data_retention_settings"] @@ -1716,12 +1716,12 @@ def update_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_retention_settings" not in self._stubs: - self._stubs[ - "update_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateDataRetentionSettings", - request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["update_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateDataRetentionSettings", + request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["update_data_retention_settings"] diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc_asyncio.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc_asyncio.py index 1a890f338ff9..f1492a1e5292 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc_asyncio.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.analytics.admin_v1beta.types import analytics_admin, resources @@ -924,12 +924,12 @@ def get_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "get_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/GetMeasurementProtocolSecret", - request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["get_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/GetMeasurementProtocolSecret", + request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["get_measurement_protocol_secret"] @@ -957,12 +957,12 @@ def list_measurement_protocol_secrets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_measurement_protocol_secrets" not in self._stubs: - self._stubs[ - "list_measurement_protocol_secrets" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/ListMeasurementProtocolSecrets", - request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, - response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + self._stubs["list_measurement_protocol_secrets"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/ListMeasurementProtocolSecrets", + request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, + response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + ) ) return self._stubs["list_measurement_protocol_secrets"] @@ -989,12 +989,12 @@ def create_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "create_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/CreateMeasurementProtocolSecret", - request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["create_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/CreateMeasurementProtocolSecret", + request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["create_measurement_protocol_secret"] @@ -1021,12 +1021,12 @@ def delete_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "delete_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/DeleteMeasurementProtocolSecret", - request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/DeleteMeasurementProtocolSecret", + request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_measurement_protocol_secret"] @@ -1053,12 +1053,12 @@ def update_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "update_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateMeasurementProtocolSecret", - request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["update_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateMeasurementProtocolSecret", + request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["update_measurement_protocol_secret"] @@ -1089,12 +1089,12 @@ def acknowledge_user_data_collection( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "acknowledge_user_data_collection" not in self._stubs: - self._stubs[ - "acknowledge_user_data_collection" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/AcknowledgeUserDataCollection", - request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, - response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + self._stubs["acknowledge_user_data_collection"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/AcknowledgeUserDataCollection", + request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, + response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + ) ) return self._stubs["acknowledge_user_data_collection"] @@ -1124,12 +1124,12 @@ def search_change_history_events( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_change_history_events" not in self._stubs: - self._stubs[ - "search_change_history_events" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/SearchChangeHistoryEvents", - request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, - response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + self._stubs["search_change_history_events"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/SearchChangeHistoryEvents", + request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, + response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + ) ) return self._stubs["search_change_history_events"] @@ -1731,12 +1731,12 @@ def get_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_retention_settings" not in self._stubs: - self._stubs[ - "get_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/GetDataRetentionSettings", - request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["get_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/GetDataRetentionSettings", + request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["get_data_retention_settings"] @@ -1763,12 +1763,12 @@ def update_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_retention_settings" not in self._stubs: - self._stubs[ - "update_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateDataRetentionSettings", - request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["update_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateDataRetentionSettings", + request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["update_data_retention_settings"] diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest.py index 7ae0c4fd0b6e..c38632009b51 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.analytics.admin_v1beta.types import analytics_admin, resources @@ -2976,9 +2976,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseAcknowledgeUserDataCollection._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseAcknowledgeUserDataCollection._get_http_options() request, metadata = self._interceptor.pre_acknowledge_user_data_collection( request, metadata @@ -3047,11 +3045,10 @@ def __call__( resp = self._interceptor.post_acknowledge_user_data_collection(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_acknowledge_user_data_collection_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_acknowledge_user_data_collection_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3133,9 +3130,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomDimension._get_http_options() request, metadata = self._interceptor.pre_archive_custom_dimension( request, metadata @@ -3249,9 +3244,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomMetric._get_http_options() request, metadata = self._interceptor.pre_archive_custom_metric( request, metadata @@ -3373,9 +3366,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateConversionEvent._get_http_options() request, metadata = self._interceptor.pre_create_conversion_event( request, metadata @@ -3529,9 +3520,7 @@ def __call__( A definition for a CustomDimension. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomDimension._get_http_options() request, metadata = self._interceptor.pre_create_custom_dimension( request, metadata @@ -3685,9 +3674,7 @@ def __call__( A definition for a custom metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomMetric._get_http_options() request, metadata = self._interceptor.pre_create_custom_metric( request, metadata @@ -3843,9 +3830,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateDataStream._get_http_options() request, metadata = self._interceptor.pre_create_data_stream( request, metadata @@ -4001,9 +3986,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateFirebaseLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateFirebaseLink._get_http_options() request, metadata = self._interceptor.pre_create_firebase_link( request, metadata @@ -4159,9 +4142,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateGoogleAdsLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateGoogleAdsLink._get_http_options() request, metadata = self._interceptor.pre_create_google_ads_link( request, metadata @@ -4317,9 +4298,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateKeyEvent._get_http_options() request, metadata = self._interceptor.pre_create_key_event( request, metadata @@ -4476,15 +4455,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateMeasurementProtocolSecret._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_measurement_protocol_secret( - request, metadata + request, metadata = ( + self._interceptor.pre_create_measurement_protocol_secret( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateMeasurementProtocolSecret._get_transcoded_request( http_options, request @@ -4550,11 +4526,10 @@ def __call__( resp = self._interceptor.post_create_measurement_protocol_secret(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_measurement_protocol_secret_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_measurement_protocol_secret_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4640,9 +4615,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateProperty._get_http_options() request, metadata = self._interceptor.pre_create_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateProperty._get_transcoded_request( @@ -4787,9 +4760,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccount._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccount._get_http_options() request, metadata = self._interceptor.pre_delete_account(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccount._get_transcoded_request( @@ -4895,9 +4866,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteConversionEvent._get_http_options() request, metadata = self._interceptor.pre_delete_conversion_event( request, metadata @@ -5007,9 +4976,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDataStream._get_http_options() request, metadata = self._interceptor.pre_delete_data_stream( request, metadata @@ -5119,9 +5086,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteFirebaseLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteFirebaseLink._get_http_options() request, metadata = self._interceptor.pre_delete_firebase_link( request, metadata @@ -5231,9 +5196,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteGoogleAdsLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteGoogleAdsLink._get_http_options() request, metadata = self._interceptor.pre_delete_google_ads_link( request, metadata @@ -5343,9 +5306,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteKeyEvent._get_http_options() request, metadata = self._interceptor.pre_delete_key_event( request, metadata @@ -5456,15 +5417,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteMeasurementProtocolSecret._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_measurement_protocol_secret( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_measurement_protocol_secret( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteMeasurementProtocolSecret._get_transcoded_request( http_options, request @@ -5575,9 +5533,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteProperty._get_http_options() request, metadata = self._interceptor.pre_delete_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteProperty._get_transcoded_request( @@ -5722,9 +5678,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetAccount._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetAccount._get_http_options() request, metadata = self._interceptor.pre_get_account(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetAccount._get_transcoded_request( @@ -5870,9 +5824,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetConversionEvent._get_http_options() request, metadata = self._interceptor.pre_get_conversion_event( request, metadata @@ -6020,9 +5972,7 @@ def __call__( A definition for a CustomDimension. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomDimension._get_http_options() request, metadata = self._interceptor.pre_get_custom_dimension( request, metadata @@ -6170,9 +6120,7 @@ def __call__( A definition for a custom metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomMetric._get_http_options() request, metadata = self._interceptor.pre_get_custom_metric( request, metadata @@ -6323,9 +6271,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDataRetentionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataRetentionSettings._get_http_options() request, metadata = self._interceptor.pre_get_data_retention_settings( request, metadata @@ -6474,9 +6420,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDataSharingSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataSharingSettings._get_http_options() request, metadata = self._interceptor.pre_get_data_sharing_settings( request, metadata @@ -6624,9 +6568,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataStream._get_http_options() request, metadata = self._interceptor.pre_get_data_stream(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataStream._get_transcoded_request( @@ -6771,9 +6713,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetKeyEvent._get_http_options() request, metadata = self._interceptor.pre_get_key_event(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetKeyEvent._get_transcoded_request( @@ -6922,9 +6862,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetMeasurementProtocolSecret._get_http_options() request, metadata = self._interceptor.pre_get_measurement_protocol_secret( request, metadata @@ -6988,11 +6926,10 @@ def __call__( resp = self._interceptor.post_get_measurement_protocol_secret(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_measurement_protocol_secret_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_measurement_protocol_secret_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -7076,9 +7013,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetProperty._get_http_options() request, metadata = self._interceptor.pre_get_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetProperty._get_transcoded_request( @@ -7221,9 +7156,7 @@ def __call__( Request message for ListAccounts RPC. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListAccounts._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListAccounts._get_http_options() request, metadata = self._interceptor.pre_list_accounts(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListAccounts._get_transcoded_request( @@ -7371,9 +7304,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListAccountSummaries._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListAccountSummaries._get_http_options() request, metadata = self._interceptor.pre_list_account_summaries( request, metadata @@ -7525,9 +7456,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListConversionEvents._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListConversionEvents._get_http_options() request, metadata = self._interceptor.pre_list_conversion_events( request, metadata @@ -7679,9 +7608,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListCustomDimensions._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListCustomDimensions._get_http_options() request, metadata = self._interceptor.pre_list_custom_dimensions( request, metadata @@ -7833,9 +7760,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListCustomMetrics._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListCustomMetrics._get_http_options() request, metadata = self._interceptor.pre_list_custom_metrics( request, metadata @@ -7987,9 +7912,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListDataStreams._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListDataStreams._get_http_options() request, metadata = self._interceptor.pre_list_data_streams( request, metadata @@ -8141,9 +8064,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListFirebaseLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListFirebaseLinks._get_http_options() request, metadata = self._interceptor.pre_list_firebase_links( request, metadata @@ -8295,9 +8216,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListGoogleAdsLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListGoogleAdsLinks._get_http_options() request, metadata = self._interceptor.pre_list_google_ads_links( request, metadata @@ -8448,9 +8367,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListKeyEvents._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListKeyEvents._get_http_options() request, metadata = self._interceptor.pre_list_key_events(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListKeyEvents._get_transcoded_request( @@ -8601,9 +8518,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListMeasurementProtocolSecrets._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListMeasurementProtocolSecrets._get_http_options() request, metadata = self._interceptor.pre_list_measurement_protocol_secrets( request, metadata @@ -8667,11 +8582,10 @@ def __call__( resp = self._interceptor.post_list_measurement_protocol_secrets(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_measurement_protocol_secrets_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_measurement_protocol_secrets_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8758,9 +8672,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListProperties._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListProperties._get_http_options() request, metadata = self._interceptor.pre_list_properties(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListProperties._get_transcoded_request( @@ -8909,9 +8821,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseProvisionAccountTicket._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseProvisionAccountTicket._get_http_options() request, metadata = self._interceptor.pre_provision_account_ticket( request, metadata @@ -9067,9 +8977,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseRunAccessReport._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseRunAccessReport._get_http_options() request, metadata = self._interceptor.pre_run_access_report( request, metadata @@ -9228,9 +9136,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseSearchChangeHistoryEvents._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseSearchChangeHistoryEvents._get_http_options() request, metadata = self._interceptor.pre_search_change_history_events( request, metadata @@ -9388,9 +9294,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccount._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccount._get_http_options() request, metadata = self._interceptor.pre_update_account(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccount._get_transcoded_request( @@ -9542,9 +9446,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateConversionEvent._get_http_options() request, metadata = self._interceptor.pre_update_conversion_event( request, metadata @@ -9698,9 +9600,7 @@ def __call__( A definition for a CustomDimension. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomDimension._get_http_options() request, metadata = self._interceptor.pre_update_custom_dimension( request, metadata @@ -9854,9 +9754,7 @@ def __call__( A definition for a custom metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomMetric._get_http_options() request, metadata = self._interceptor.pre_update_custom_metric( request, metadata @@ -10015,9 +9913,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataRetentionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataRetentionSettings._get_http_options() request, metadata = self._interceptor.pre_update_data_retention_settings( request, metadata @@ -10086,11 +9982,10 @@ def __call__( resp = self._interceptor.post_update_data_retention_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_data_retention_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_data_retention_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -10174,9 +10069,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataStream._get_http_options() request, metadata = self._interceptor.pre_update_data_stream( request, metadata @@ -10332,9 +10225,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateGoogleAdsLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateGoogleAdsLink._get_http_options() request, metadata = self._interceptor.pre_update_google_ads_link( request, metadata @@ -10490,9 +10381,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateKeyEvent._get_http_options() request, metadata = self._interceptor.pre_update_key_event( request, metadata @@ -10649,15 +10538,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateMeasurementProtocolSecret._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_measurement_protocol_secret( - request, metadata + request, metadata = ( + self._interceptor.pre_update_measurement_protocol_secret( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateMeasurementProtocolSecret._get_transcoded_request( http_options, request @@ -10723,11 +10609,10 @@ def __call__( resp = self._interceptor.post_update_measurement_protocol_secret(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_measurement_protocol_secret_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_measurement_protocol_secret_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -10813,9 +10698,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateProperty._get_http_options() request, metadata = self._interceptor.pre_update_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateProperty._get_transcoded_request( @@ -10917,7 +10800,9 @@ def acknowledge_user_data_collection( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AcknowledgeUserDataCollection(self._session, self._host, self._interceptor) # type: ignore + return self._AcknowledgeUserDataCollection( + self._session, self._host, self._interceptor + ) # type: ignore @property def archive_custom_dimension( @@ -10925,7 +10810,9 @@ def archive_custom_dimension( ) -> Callable[[analytics_admin.ArchiveCustomDimensionRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ArchiveCustomDimension(self._session, self._host, self._interceptor) # type: ignore + return self._ArchiveCustomDimension( + self._session, self._host, self._interceptor + ) # type: ignore @property def archive_custom_metric( @@ -11006,7 +10893,9 @@ def create_measurement_protocol_secret( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._CreateMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_property( @@ -11072,7 +10961,9 @@ def delete_measurement_protocol_secret( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_property( @@ -11127,7 +11018,9 @@ def get_data_retention_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetDataRetentionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetDataRetentionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_data_sharing_settings( @@ -11137,7 +11030,9 @@ def get_data_sharing_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetDataSharingSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetDataSharingSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_data_stream( @@ -11164,7 +11059,9 @@ def get_measurement_protocol_secret( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._GetMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_property( @@ -11280,7 +11177,9 @@ def list_measurement_protocol_secrets( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListMeasurementProtocolSecrets(self._session, self._host, self._interceptor) # type: ignore + return self._ListMeasurementProtocolSecrets( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_properties( @@ -11301,7 +11200,9 @@ def provision_account_ticket( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ProvisionAccountTicket(self._session, self._host, self._interceptor) # type: ignore + return self._ProvisionAccountTicket( + self._session, self._host, self._interceptor + ) # type: ignore @property def run_access_report( @@ -11323,7 +11224,9 @@ def search_change_history_events( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SearchChangeHistoryEvents(self._session, self._host, self._interceptor) # type: ignore + return self._SearchChangeHistoryEvents( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_account( @@ -11370,7 +11273,9 @@ def update_data_retention_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateDataRetentionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDataRetentionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_data_stream( @@ -11407,7 +11312,9 @@ def update_measurement_protocol_secret( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_property( diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest_base.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest_base.py index 26d603a6cd89..ca7ee388754c 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest_base.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.analytics.admin_v1beta.types import analytics_admin, resources diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/types/access_report.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/types/access_report.py index a885224d7d1d..d4eff10a8db6 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/types/access_report.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/types/access_report.py @@ -285,6 +285,7 @@ class MatchType(proto.Enum): Partial match for the regular expression with the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BEGINS_WITH = 2 @@ -355,6 +356,7 @@ class Operation(proto.Enum): GREATER_THAN_OR_EQUAL (5): Greater than or equal """ + OPERATION_UNSPECIFIED = 0 EQUAL = 1 LESS_THAN = 2 @@ -501,6 +503,7 @@ class OrderType(proto.Enum): values all have equal ordering value below all numeric values. """ + ORDER_TYPE_UNSPECIFIED = 0 ALPHANUMERIC = 1 CASE_INSENSITIVE_ALPHANUMERIC = 2 diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/types/analytics_admin.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/types/analytics_admin.py index 48c913148310..3f8c5b9339e3 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/types/analytics_admin.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/types/analytics_admin.py @@ -296,19 +296,19 @@ class RunAccessReportResponse(proto.Message): with account-level requests. """ - dimension_headers: MutableSequence[ - access_report.AccessDimensionHeader - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=access_report.AccessDimensionHeader, - ) - metric_headers: MutableSequence[ - access_report.AccessMetricHeader - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=access_report.AccessMetricHeader, + dimension_headers: MutableSequence[access_report.AccessDimensionHeader] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=access_report.AccessDimensionHeader, + ) + ) + metric_headers: MutableSequence[access_report.AccessMetricHeader] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=access_report.AccessMetricHeader, + ) ) rows: MutableSequence[access_report.AccessRow] = proto.RepeatedField( proto.MESSAGE, @@ -1046,12 +1046,12 @@ class SearchChangeHistoryEventsRequest(proto.Message): proto.STRING, number=2, ) - resource_type: MutableSequence[ - resources.ChangeHistoryResourceType - ] = proto.RepeatedField( - proto.ENUM, - number=3, - enum=resources.ChangeHistoryResourceType, + resource_type: MutableSequence[resources.ChangeHistoryResourceType] = ( + proto.RepeatedField( + proto.ENUM, + number=3, + enum=resources.ChangeHistoryResourceType, + ) ) action: MutableSequence[resources.ActionType] = proto.RepeatedField( proto.ENUM, @@ -1098,12 +1098,12 @@ class SearchChangeHistoryEventsResponse(proto.Message): def raw_page(self): return self - change_history_events: MutableSequence[ - resources.ChangeHistoryEvent - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.ChangeHistoryEvent, + change_history_events: MutableSequence[resources.ChangeHistoryEvent] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.ChangeHistoryEvent, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/types/resources.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/types/resources.py index 1c1e8cf070b9..8a8ac13e25e2 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/types/resources.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/types/resources.py @@ -110,6 +110,7 @@ class IndustryCategory(proto.Enum): SHOPPING (26): Shopping """ + INDUSTRY_CATEGORY_UNSPECIFIED = 0 AUTOMOTIVE = 1 BUSINESS_AND_INDUSTRIAL_MARKETS = 2 @@ -151,6 +152,7 @@ class ServiceLevel(proto.Enum): The paid, premium version of Google Analytics. """ + SERVICE_LEVEL_UNSPECIFIED = 0 GOOGLE_ANALYTICS_STANDARD = 1 GOOGLE_ANALYTICS_360 = 2 @@ -171,6 +173,7 @@ class ActorType(proto.Enum): Changes made by Google Analytics support team staff. """ + ACTOR_TYPE_UNSPECIFIED = 0 USER = 1 SYSTEM = 2 @@ -190,6 +193,7 @@ class ActionType(proto.Enum): DELETED (3): Resource was deleted in this change. """ + ACTION_TYPE_UNSPECIFIED = 0 CREATED = 1 UPDATED = 2 @@ -233,6 +237,7 @@ class ChangeHistoryResourceType(proto.Enum): ATTRIBUTION_SETTINGS (20): AttributionSettings resource """ + CHANGE_HISTORY_RESOURCE_TYPE_UNSPECIFIED = 0 ACCOUNT = 1 PROPERTY = 2 @@ -263,6 +268,7 @@ class PropertyType(proto.Enum): PROPERTY_TYPE_ROLLUP (3): Google Analytics rollup property """ + PROPERTY_TYPE_UNSPECIFIED = 0 PROPERTY_TYPE_ORDINARY = 1 PROPERTY_TYPE_SUBPROPERTY = 2 @@ -521,6 +527,7 @@ class DataStreamType(proto.Enum): IOS_APP_DATA_STREAM (3): iOS app data stream. """ + DATA_STREAM_TYPE_UNSPECIFIED = 0 WEB_DATA_STREAM = 1 ANDROID_APP_DATA_STREAM = 2 @@ -1182,6 +1189,7 @@ class ConversionCountingMethod(proto.Enum): An Event instance is considered a Conversion at most once per session per user. """ + CONVERSION_COUNTING_METHOD_UNSPECIFIED = 0 ONCE_PER_EVENT = 1 ONCE_PER_SESSION = 2 @@ -1303,6 +1311,7 @@ class CountingMethod(proto.Enum): An Event instance is considered a Key Event at most once per session per user. """ + COUNTING_METHOD_UNSPECIFIED = 0 ONCE_PER_EVENT = 1 ONCE_PER_SESSION = 2 @@ -1426,6 +1435,7 @@ class DimensionScope(proto.Enum): ITEM (3): Dimension scoped to eCommerce items """ + DIMENSION_SCOPE_UNSPECIFIED = 0 EVENT = 1 USER = 2 @@ -1529,6 +1539,7 @@ class MeasurementUnit(proto.Enum): HOURS (10): This metric measures hours. """ + MEASUREMENT_UNIT_UNSPECIFIED = 0 STANDARD = 1 CURRENCY = 2 @@ -1550,6 +1561,7 @@ class MetricScope(proto.Enum): EVENT (1): Metric scoped to an event. """ + METRIC_SCOPE_UNSPECIFIED = 0 EVENT = 1 @@ -1565,6 +1577,7 @@ class RestrictedMetricType(proto.Enum): REVENUE_DATA (2): Metric reports revenue data. """ + RESTRICTED_METRIC_TYPE_UNSPECIFIED = 0 COST_DATA = 1 REVENUE_DATA = 2 @@ -1647,6 +1660,7 @@ class RetentionDuration(proto.Enum): months. Available to 360 properties only. Available for event data only. """ + RETENTION_DURATION_UNSPECIFIED = 0 TWO_MONTHS = 1 FOURTEEN_MONTHS = 3 diff --git a/packages/google-analytics-admin/mypy.ini b/packages/google-analytics-admin/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-analytics-admin/mypy.ini +++ b/packages/google-analytics-admin/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-analytics-admin/noxfile.py b/packages/google-analytics-admin/noxfile.py index 68a3b308f553..5edb2d875944 100644 --- a/packages/google-analytics-admin/noxfile.py +++ b/packages/google-analytics-admin/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-analytics-admin/tests/unit/gapic/admin_v1alpha/test_analytics_admin_service.py b/packages/google-analytics-admin/tests/unit/gapic/admin_v1alpha/test_analytics_admin_service.py index a1027f11e799..227f7c10481e 100644 --- a/packages/google-analytics-admin/tests/unit/gapic/admin_v1alpha/test_analytics_admin_service.py +++ b/packages/google-analytics-admin/tests/unit/gapic/admin_v1alpha/test_analytics_admin_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.oauth2 import service_account 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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import google.type.date_pb2 as date_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.analytics.admin_v1alpha.services.analytics_admin_service import ( AnalyticsAdminServiceAsyncClient, @@ -63,6 +68,17 @@ pagers, transports, ) +from google.analytics.admin_v1alpha.types import ( + access_report, + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -70,14 +86,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import access_report, analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1013,10 +1021,9 @@ def test_analytics_admin_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1068,9 @@ def test_analytics_admin_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1106,9 @@ def test_analytics_admin_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1363,9 +1368,7 @@ def test_analytics_admin_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3034,9 +3037,9 @@ def test_list_account_summaries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_account_summaries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_account_summaries] = ( + mock_rpc + ) request = {} client.list_account_summaries(request) @@ -5146,9 +5149,9 @@ def test_create_firebase_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_firebase_link] = ( + mock_rpc + ) request = {} client.create_firebase_link(request) @@ -5497,9 +5500,9 @@ def test_delete_firebase_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_firebase_link] = ( + mock_rpc + ) request = {} client.delete_firebase_link(request) @@ -5832,9 +5835,9 @@ def test_list_firebase_links_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_firebase_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_firebase_links] = ( + mock_rpc + ) request = {} client.list_firebase_links(request) @@ -6378,9 +6381,9 @@ def test_get_global_site_tag_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_global_site_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_global_site_tag] = ( + mock_rpc + ) request = {} client.get_global_site_tag(request) @@ -6729,9 +6732,9 @@ def test_create_google_ads_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_google_ads_link] = ( + mock_rpc + ) request = {} client.create_google_ads_link(request) @@ -7090,9 +7093,9 @@ def test_update_google_ads_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_google_ads_link] = ( + mock_rpc + ) request = {} client.update_google_ads_link(request) @@ -7446,9 +7449,9 @@ def test_delete_google_ads_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_google_ads_link] = ( + mock_rpc + ) request = {} client.delete_google_ads_link(request) @@ -7782,9 +7785,9 @@ def test_list_google_ads_links_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_google_ads_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_google_ads_links] = ( + mock_rpc + ) request = {} client.list_google_ads_links(request) @@ -14834,9 +14837,9 @@ def test_get_conversion_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversion_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversion_event] = ( + mock_rpc + ) request = {} client.get_conversion_event(request) @@ -15521,9 +15524,9 @@ def test_list_conversion_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversion_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversion_events] = ( + mock_rpc + ) request = {} client.list_conversion_events(request) @@ -16067,9 +16070,9 @@ def test_create_key_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_key_event] = ( + mock_rpc + ) request = {} client.create_key_event(request) @@ -16410,9 +16413,9 @@ def test_update_key_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_key_event] = ( + mock_rpc + ) request = {} client.update_key_event(request) @@ -17081,9 +17084,9 @@ def test_delete_key_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_key_event] = ( + mock_rpc + ) request = {} client.delete_key_event(request) @@ -22861,9 +22864,9 @@ def test_list_custom_dimensions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_dimensions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_dimensions] = ( + mock_rpc + ) request = {} client.list_custom_dimensions(request) @@ -23746,9 +23749,9 @@ def test_get_custom_dimension_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_dimension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_dimension] = ( + mock_rpc + ) request = {} client.get_custom_dimension(request) @@ -24114,9 +24117,9 @@ def test_create_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_custom_metric] = ( + mock_rpc + ) request = {} client.create_custom_metric(request) @@ -24494,9 +24497,9 @@ def test_update_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_custom_metric] = ( + mock_rpc + ) request = {} client.update_custom_metric(request) @@ -24864,9 +24867,9 @@ def test_list_custom_metrics_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_metrics - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_metrics] = ( + mock_rpc + ) request = {} client.list_custom_metrics(request) @@ -25406,9 +25409,9 @@ def test_archive_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.archive_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.archive_custom_metric] = ( + mock_rpc + ) request = {} client.archive_custom_metric(request) @@ -25753,9 +25756,9 @@ def test_get_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_metric] = ( + mock_rpc + ) request = {} client.get_custom_metric(request) @@ -26854,9 +26857,9 @@ def test_create_data_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_stream] = ( + mock_rpc + ) request = {} client.create_data_stream(request) @@ -27231,9 +27234,9 @@ def test_delete_data_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_stream] = ( + mock_rpc + ) request = {} client.delete_data_stream(request) @@ -27564,9 +27567,9 @@ def test_update_data_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_stream] = ( + mock_rpc + ) request = {} client.update_data_stream(request) @@ -27944,9 +27947,9 @@ def test_list_data_streams_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_streams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_streams] = ( + mock_rpc + ) request = {} client.list_data_streams(request) @@ -30387,9 +30390,9 @@ def test_archive_audience_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.archive_audience - ] = mock_rpc + client._transport._wrapped_methods[client._transport.archive_audience] = ( + mock_rpc + ) request = {} client.archive_audience(request) @@ -30634,9 +30637,9 @@ def test_get_search_ads360_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_search_ads360_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_search_ads360_link] = ( + mock_rpc + ) request = {} client.get_search_ads360_link(request) @@ -33350,9 +33353,9 @@ def test_run_access_report_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_access_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_access_report] = ( + mock_rpc + ) request = {} client.run_access_report(request) @@ -33609,9 +33612,9 @@ def test_create_access_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_access_binding] = ( + mock_rpc + ) request = {} client.create_access_binding(request) @@ -33966,9 +33969,9 @@ def test_get_access_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_access_binding] = ( + mock_rpc + ) request = {} client.get_access_binding(request) @@ -34310,9 +34313,9 @@ def test_update_access_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_access_binding] = ( + mock_rpc + ) request = {} client.update_access_binding(request) @@ -34652,9 +34655,9 @@ def test_delete_access_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_access_binding] = ( + mock_rpc + ) request = {} client.delete_access_binding(request) @@ -34987,9 +34990,9 @@ def test_list_access_bindings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_access_bindings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_access_bindings] = ( + mock_rpc + ) request = {} client.list_access_bindings(request) @@ -36540,9 +36543,9 @@ def test_get_expanded_data_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_expanded_data_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_expanded_data_set] = ( + mock_rpc + ) request = {} client.get_expanded_data_set(request) @@ -38508,9 +38511,9 @@ def test_get_channel_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_channel_group] = ( + mock_rpc + ) request = {} client.get_channel_group(request) @@ -38859,9 +38862,9 @@ def test_list_channel_groups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_channel_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_channel_groups] = ( + mock_rpc + ) request = {} client.list_channel_groups(request) @@ -39411,9 +39414,9 @@ def test_create_channel_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_channel_group] = ( + mock_rpc + ) request = {} client.create_channel_group(request) @@ -39775,9 +39778,9 @@ def test_update_channel_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_channel_group] = ( + mock_rpc + ) request = {} client.update_channel_group(request) @@ -40132,9 +40135,9 @@ def test_delete_channel_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_channel_group] = ( + mock_rpc + ) request = {} client.delete_channel_group(request) @@ -40482,9 +40485,9 @@ def test_create_big_query_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_big_query_link] = ( + mock_rpc + ) request = {} client.create_big_query_link(request) @@ -40866,9 +40869,9 @@ def test_get_big_query_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_big_query_link] = ( + mock_rpc + ) request = {} client.get_big_query_link(request) @@ -41225,9 +41228,9 @@ def test_list_big_query_links_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_big_query_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_big_query_links] = ( + mock_rpc + ) request = {} client.list_big_query_links(request) @@ -41767,9 +41770,9 @@ def test_delete_big_query_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_big_query_link] = ( + mock_rpc + ) request = {} client.delete_big_query_link(request) @@ -42113,9 +42116,9 @@ def test_update_big_query_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_big_query_link] = ( + mock_rpc + ) request = {} client.update_big_query_link(request) @@ -43261,9 +43264,9 @@ def test_get_ad_sense_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ad_sense_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ad_sense_link] = ( + mock_rpc + ) request = {} client.get_ad_sense_link(request) @@ -43606,9 +43609,9 @@ def test_create_ad_sense_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_ad_sense_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_ad_sense_link] = ( + mock_rpc + ) request = {} client.create_ad_sense_link(request) @@ -43957,9 +43960,9 @@ def test_delete_ad_sense_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_ad_sense_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_ad_sense_link] = ( + mock_rpc + ) request = {} client.delete_ad_sense_link(request) @@ -44292,9 +44295,9 @@ def test_list_ad_sense_links_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_ad_sense_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_ad_sense_links] = ( + mock_rpc + ) request = {} client.list_ad_sense_links(request) @@ -44841,9 +44844,9 @@ def test_get_event_create_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_event_create_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_event_create_rule] = ( + mock_rpc + ) request = {} client.get_event_create_rule(request) @@ -46791,9 +46794,9 @@ def test_get_event_edit_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_event_edit_rule] = ( + mock_rpc + ) request = {} client.get_event_edit_rule(request) @@ -47140,9 +47143,9 @@ def test_list_event_edit_rules_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_event_edit_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_event_edit_rules] = ( + mock_rpc + ) request = {} client.list_event_edit_rules(request) @@ -47691,9 +47694,9 @@ def test_create_event_edit_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_event_edit_rule] = ( + mock_rpc + ) request = {} client.create_event_edit_rule(request) @@ -48048,9 +48051,9 @@ def test_update_event_edit_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_event_edit_rule] = ( + mock_rpc + ) request = {} client.update_event_edit_rule(request) @@ -48402,9 +48405,9 @@ def test_delete_event_edit_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_event_edit_rule] = ( + mock_rpc + ) request = {} client.delete_event_edit_rule(request) @@ -49717,9 +49720,9 @@ def test_get_calculated_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_calculated_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_calculated_metric] = ( + mock_rpc + ) request = {} client.get_calculated_metric(request) @@ -51735,9 +51738,9 @@ def test_create_rollup_property_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_rollup_property - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_rollup_property] = ( + mock_rpc + ) request = {} client.create_rollup_property(request) @@ -53509,9 +53512,9 @@ def test_provision_subproperty_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_subproperty - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_subproperty] = ( + mock_rpc + ) request = {} client.provision_subproperty(request) @@ -57668,9 +57671,9 @@ def test_submit_user_deletion_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.submit_user_deletion - ] = mock_rpc + client._transport._wrapped_methods[client._transport.submit_user_deletion] = ( + mock_rpc + ) request = {} client.submit_user_deletion(request) @@ -60233,9 +60236,9 @@ def test_list_account_summaries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_account_summaries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_account_summaries] = ( + mock_rpc + ) request = {} client.list_account_summaries(request) @@ -61255,9 +61258,9 @@ def test_create_firebase_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_firebase_link] = ( + mock_rpc + ) request = {} client.create_firebase_link(request) @@ -61447,9 +61450,9 @@ def test_delete_firebase_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_firebase_link] = ( + mock_rpc + ) request = {} client.delete_firebase_link(request) @@ -61623,9 +61626,9 @@ def test_list_firebase_links_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_firebase_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_firebase_links] = ( + mock_rpc + ) request = {} client.list_firebase_links(request) @@ -61882,9 +61885,9 @@ def test_get_global_site_tag_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_global_site_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_global_site_tag] = ( + mock_rpc + ) request = {} client.get_global_site_tag(request) @@ -62067,9 +62070,9 @@ def test_create_google_ads_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_google_ads_link] = ( + mock_rpc + ) request = {} client.create_google_ads_link(request) @@ -62260,9 +62263,9 @@ def test_update_google_ads_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_google_ads_link] = ( + mock_rpc + ) request = {} client.update_google_ads_link(request) @@ -62445,9 +62448,9 @@ def test_delete_google_ads_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_google_ads_link] = ( + mock_rpc + ) request = {} client.delete_google_ads_link(request) @@ -62622,9 +62625,9 @@ def test_list_google_ads_links_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_google_ads_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_google_ads_links] = ( + mock_rpc + ) request = {} client.list_google_ads_links(request) @@ -66294,9 +66297,9 @@ def test_get_conversion_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversion_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversion_event] = ( + mock_rpc + ) request = {} client.get_conversion_event(request) @@ -66655,9 +66658,9 @@ def test_list_conversion_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversion_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversion_events] = ( + mock_rpc + ) request = {} client.list_conversion_events(request) @@ -66913,9 +66916,9 @@ def test_create_key_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_key_event] = ( + mock_rpc + ) request = {} client.create_key_event(request) @@ -67103,9 +67106,9 @@ def test_update_key_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_key_event] = ( + mock_rpc + ) request = {} client.update_key_event(request) @@ -67468,9 +67471,9 @@ def test_delete_key_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_key_event] = ( + mock_rpc + ) request = {} client.delete_key_event(request) @@ -70497,9 +70500,9 @@ def test_list_custom_dimensions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_dimensions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_dimensions] = ( + mock_rpc + ) request = {} client.list_custom_dimensions(request) @@ -70936,9 +70939,9 @@ def test_get_custom_dimension_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_dimension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_dimension] = ( + mock_rpc + ) request = {} client.get_custom_dimension(request) @@ -71118,9 +71121,9 @@ def test_create_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_custom_metric] = ( + mock_rpc + ) request = {} client.create_custom_metric(request) @@ -71310,9 +71313,9 @@ def test_update_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_custom_metric] = ( + mock_rpc + ) request = {} client.update_custom_metric(request) @@ -71494,9 +71497,9 @@ def test_list_custom_metrics_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_metrics - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_metrics] = ( + mock_rpc + ) request = {} client.list_custom_metrics(request) @@ -71754,9 +71757,9 @@ def test_archive_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.archive_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.archive_custom_metric] = ( + mock_rpc + ) request = {} client.archive_custom_metric(request) @@ -71930,9 +71933,9 @@ def test_get_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_metric] = ( + mock_rpc + ) request = {} client.get_custom_metric(request) @@ -72491,9 +72494,9 @@ def test_create_data_stream_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_stream] = ( + mock_rpc + ) request = {} client.create_data_stream(request) @@ -72691,9 +72694,9 @@ def test_delete_data_stream_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_stream] = ( + mock_rpc + ) request = {} client.delete_data_stream(request) @@ -72867,9 +72870,9 @@ def test_update_data_stream_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_stream] = ( + mock_rpc + ) request = {} client.update_data_stream(request) @@ -73057,9 +73060,9 @@ def test_list_data_streams_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_streams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_streams] = ( + mock_rpc + ) request = {} client.list_data_streams(request) @@ -74297,9 +74300,9 @@ def test_archive_audience_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.archive_audience - ] = mock_rpc + client._transport._wrapped_methods[client._transport.archive_audience] = ( + mock_rpc + ) request = {} client.archive_audience(request) @@ -74420,9 +74423,9 @@ def test_get_search_ads360_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_search_ads360_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_search_ads360_link] = ( + mock_rpc + ) request = {} client.get_search_ads360_link(request) @@ -75798,9 +75801,9 @@ def test_run_access_report_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_access_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_access_report] = ( + mock_rpc + ) request = {} client.run_access_report(request) @@ -75839,9 +75842,9 @@ def test_create_access_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_access_binding] = ( + mock_rpc + ) request = {} client.create_access_binding(request) @@ -76031,9 +76034,9 @@ def test_get_access_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_access_binding] = ( + mock_rpc + ) request = {} client.get_access_binding(request) @@ -76213,9 +76216,9 @@ def test_update_access_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_access_binding] = ( + mock_rpc + ) request = {} client.update_access_binding(request) @@ -76394,9 +76397,9 @@ def test_delete_access_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_access_binding] = ( + mock_rpc + ) request = {} client.delete_access_binding(request) @@ -76570,9 +76573,9 @@ def test_list_access_bindings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_access_bindings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_access_bindings] = ( + mock_rpc + ) request = {} client.list_access_bindings(request) @@ -77383,9 +77386,9 @@ def test_get_expanded_data_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_expanded_data_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_expanded_data_set] = ( + mock_rpc + ) request = {} client.get_expanded_data_set(request) @@ -78389,9 +78392,9 @@ def test_get_channel_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_channel_group] = ( + mock_rpc + ) request = {} client.get_channel_group(request) @@ -78570,9 +78573,9 @@ def test_list_channel_groups_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_channel_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_channel_groups] = ( + mock_rpc + ) request = {} client.list_channel_groups(request) @@ -78829,9 +78832,9 @@ def test_create_channel_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_channel_group] = ( + mock_rpc + ) request = {} client.create_channel_group(request) @@ -79021,9 +79024,9 @@ def test_update_channel_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_channel_group] = ( + mock_rpc + ) request = {} client.update_channel_group(request) @@ -79213,9 +79216,9 @@ def test_delete_channel_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_channel_group] = ( + mock_rpc + ) request = {} client.delete_channel_group(request) @@ -79390,9 +79393,9 @@ def test_create_big_query_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_big_query_link] = ( + mock_rpc + ) request = {} client.create_big_query_link(request) @@ -79582,9 +79585,9 @@ def test_get_big_query_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_big_query_link] = ( + mock_rpc + ) request = {} client.get_big_query_link(request) @@ -79763,9 +79766,9 @@ def test_list_big_query_links_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_big_query_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_big_query_links] = ( + mock_rpc + ) request = {} client.list_big_query_links(request) @@ -80023,9 +80026,9 @@ def test_delete_big_query_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_big_query_link] = ( + mock_rpc + ) request = {} client.delete_big_query_link(request) @@ -80200,9 +80203,9 @@ def test_update_big_query_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_big_query_link] = ( + mock_rpc + ) request = {} client.update_big_query_link(request) @@ -80782,9 +80785,9 @@ def test_get_ad_sense_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ad_sense_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ad_sense_link] = ( + mock_rpc + ) request = {} client.get_ad_sense_link(request) @@ -80963,9 +80966,9 @@ def test_create_ad_sense_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_ad_sense_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_ad_sense_link] = ( + mock_rpc + ) request = {} client.create_ad_sense_link(request) @@ -81155,9 +81158,9 @@ def test_delete_ad_sense_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_ad_sense_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_ad_sense_link] = ( + mock_rpc + ) request = {} client.delete_ad_sense_link(request) @@ -81331,9 +81334,9 @@ def test_list_ad_sense_links_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_ad_sense_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_ad_sense_links] = ( + mock_rpc + ) request = {} client.list_ad_sense_links(request) @@ -81591,9 +81594,9 @@ def test_get_event_create_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_event_create_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_event_create_rule] = ( + mock_rpc + ) request = {} client.get_event_create_rule(request) @@ -82607,9 +82610,9 @@ def test_get_event_edit_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_event_edit_rule] = ( + mock_rpc + ) request = {} client.get_event_edit_rule(request) @@ -82792,9 +82795,9 @@ def test_list_event_edit_rules_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_event_edit_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_event_edit_rules] = ( + mock_rpc + ) request = {} client.list_event_edit_rules(request) @@ -83053,9 +83056,9 @@ def test_create_event_edit_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_event_edit_rule] = ( + mock_rpc + ) request = {} client.create_event_edit_rule(request) @@ -83247,9 +83250,9 @@ def test_update_event_edit_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_event_edit_rule] = ( + mock_rpc + ) request = {} client.update_event_edit_rule(request) @@ -83442,9 +83445,9 @@ def test_delete_event_edit_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_event_edit_rule] = ( + mock_rpc + ) request = {} client.delete_event_edit_rule(request) @@ -84139,9 +84142,9 @@ def test_get_calculated_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_calculated_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_calculated_metric] = ( + mock_rpc + ) request = {} client.get_calculated_metric(request) @@ -85172,9 +85175,9 @@ def test_create_rollup_property_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_rollup_property - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_rollup_property] = ( + mock_rpc + ) request = {} client.create_rollup_property(request) @@ -86138,9 +86141,9 @@ def test_provision_subproperty_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_subproperty - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_subproperty] = ( + mock_rpc + ) request = {} client.provision_subproperty(request) @@ -88337,9 +88340,9 @@ def test_submit_user_deletion_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.submit_user_deletion - ] = mock_rpc + client._transport._wrapped_methods[client._transport.submit_user_deletion] = ( + mock_rpc + ) request = {} client.submit_user_deletion(request) diff --git a/packages/google-analytics-admin/tests/unit/gapic/admin_v1beta/test_analytics_admin_service.py b/packages/google-analytics-admin/tests/unit/gapic/admin_v1beta/test_analytics_admin_service.py index f5e4606a8fc2..811581a0632d 100644 --- a/packages/google-analytics-admin/tests/unit/gapic/admin_v1beta/test_analytics_admin_service.py +++ b/packages/google-analytics-admin/tests/unit/gapic/admin_v1beta/test_analytics_admin_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.analytics.admin_v1beta.services.analytics_admin_service import ( AnalyticsAdminServiceAsyncClient, @@ -1001,10 +1006,9 @@ def test_analytics_admin_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1049,10 +1053,9 @@ def test_analytics_admin_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1088,10 +1091,9 @@ def test_analytics_admin_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1351,9 +1353,7 @@ def test_analytics_admin_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3020,9 +3020,9 @@ def test_list_account_summaries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_account_summaries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_account_summaries] = ( + mock_rpc + ) request = {} client.list_account_summaries(request) @@ -5132,9 +5132,9 @@ def test_create_firebase_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_firebase_link] = ( + mock_rpc + ) request = {} client.create_firebase_link(request) @@ -5483,9 +5483,9 @@ def test_delete_firebase_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_firebase_link] = ( + mock_rpc + ) request = {} client.delete_firebase_link(request) @@ -5818,9 +5818,9 @@ def test_list_firebase_links_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_firebase_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_firebase_links] = ( + mock_rpc + ) request = {} client.list_firebase_links(request) @@ -6369,9 +6369,9 @@ def test_create_google_ads_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_google_ads_link] = ( + mock_rpc + ) request = {} client.create_google_ads_link(request) @@ -6730,9 +6730,9 @@ def test_update_google_ads_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_google_ads_link] = ( + mock_rpc + ) request = {} client.update_google_ads_link(request) @@ -7086,9 +7086,9 @@ def test_delete_google_ads_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_google_ads_link] = ( + mock_rpc + ) request = {} client.delete_google_ads_link(request) @@ -7422,9 +7422,9 @@ def test_list_google_ads_links_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_google_ads_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_google_ads_links] = ( + mock_rpc + ) request = {} client.list_google_ads_links(request) @@ -11771,9 +11771,9 @@ def test_get_conversion_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversion_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversion_event] = ( + mock_rpc + ) request = {} client.get_conversion_event(request) @@ -12458,9 +12458,9 @@ def test_list_conversion_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversion_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversion_events] = ( + mock_rpc + ) request = {} client.list_conversion_events(request) @@ -13004,9 +13004,9 @@ def test_create_key_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_key_event] = ( + mock_rpc + ) request = {} client.create_key_event(request) @@ -13347,9 +13347,9 @@ def test_update_key_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_key_event] = ( + mock_rpc + ) request = {} client.update_key_event(request) @@ -14018,9 +14018,9 @@ def test_delete_key_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_key_event] = ( + mock_rpc + ) request = {} client.delete_key_event(request) @@ -15604,9 +15604,9 @@ def test_list_custom_dimensions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_dimensions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_dimensions] = ( + mock_rpc + ) request = {} client.list_custom_dimensions(request) @@ -16489,9 +16489,9 @@ def test_get_custom_dimension_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_dimension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_dimension] = ( + mock_rpc + ) request = {} client.get_custom_dimension(request) @@ -16857,9 +16857,9 @@ def test_create_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_custom_metric] = ( + mock_rpc + ) request = {} client.create_custom_metric(request) @@ -17237,9 +17237,9 @@ def test_update_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_custom_metric] = ( + mock_rpc + ) request = {} client.update_custom_metric(request) @@ -17607,9 +17607,9 @@ def test_list_custom_metrics_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_metrics - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_metrics] = ( + mock_rpc + ) request = {} client.list_custom_metrics(request) @@ -18149,9 +18149,9 @@ def test_archive_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.archive_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.archive_custom_metric] = ( + mock_rpc + ) request = {} client.archive_custom_metric(request) @@ -18496,9 +18496,9 @@ def test_get_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_metric] = ( + mock_rpc + ) request = {} client.get_custom_metric(request) @@ -19597,9 +19597,9 @@ def test_create_data_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_stream] = ( + mock_rpc + ) request = {} client.create_data_stream(request) @@ -19974,9 +19974,9 @@ def test_delete_data_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_stream] = ( + mock_rpc + ) request = {} client.delete_data_stream(request) @@ -20307,9 +20307,9 @@ def test_update_data_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_stream] = ( + mock_rpc + ) request = {} client.update_data_stream(request) @@ -20687,9 +20687,9 @@ def test_list_data_streams_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_streams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_streams] = ( + mock_rpc + ) request = {} client.list_data_streams(request) @@ -21561,9 +21561,9 @@ def test_run_access_report_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_access_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_access_report] = ( + mock_rpc + ) request = {} client.run_access_report(request) @@ -22420,9 +22420,9 @@ def test_list_account_summaries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_account_summaries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_account_summaries] = ( + mock_rpc + ) request = {} client.list_account_summaries(request) @@ -23442,9 +23442,9 @@ def test_create_firebase_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_firebase_link] = ( + mock_rpc + ) request = {} client.create_firebase_link(request) @@ -23634,9 +23634,9 @@ def test_delete_firebase_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_firebase_link] = ( + mock_rpc + ) request = {} client.delete_firebase_link(request) @@ -23810,9 +23810,9 @@ def test_list_firebase_links_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_firebase_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_firebase_links] = ( + mock_rpc + ) request = {} client.list_firebase_links(request) @@ -24070,9 +24070,9 @@ def test_create_google_ads_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_google_ads_link] = ( + mock_rpc + ) request = {} client.create_google_ads_link(request) @@ -24263,9 +24263,9 @@ def test_update_google_ads_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_google_ads_link] = ( + mock_rpc + ) request = {} client.update_google_ads_link(request) @@ -24448,9 +24448,9 @@ def test_delete_google_ads_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_google_ads_link] = ( + mock_rpc + ) request = {} client.delete_google_ads_link(request) @@ -24625,9 +24625,9 @@ def test_list_google_ads_links_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_google_ads_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_google_ads_links] = ( + mock_rpc + ) request = {} client.list_google_ads_links(request) @@ -26834,9 +26834,9 @@ def test_get_conversion_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversion_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversion_event] = ( + mock_rpc + ) request = {} client.get_conversion_event(request) @@ -27193,9 +27193,9 @@ def test_list_conversion_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversion_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversion_events] = ( + mock_rpc + ) request = {} client.list_conversion_events(request) @@ -27450,9 +27450,9 @@ def test_create_key_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_key_event] = ( + mock_rpc + ) request = {} client.create_key_event(request) @@ -27640,9 +27640,9 @@ def test_update_key_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_key_event] = ( + mock_rpc + ) request = {} client.update_key_event(request) @@ -28005,9 +28005,9 @@ def test_delete_key_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_key_event] = ( + mock_rpc + ) request = {} client.delete_key_event(request) @@ -28815,9 +28815,9 @@ def test_list_custom_dimensions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_dimensions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_dimensions] = ( + mock_rpc + ) request = {} client.list_custom_dimensions(request) @@ -29253,9 +29253,9 @@ def test_get_custom_dimension_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_dimension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_dimension] = ( + mock_rpc + ) request = {} client.get_custom_dimension(request) @@ -29434,9 +29434,9 @@ def test_create_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_custom_metric] = ( + mock_rpc + ) request = {} client.create_custom_metric(request) @@ -29626,9 +29626,9 @@ def test_update_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_custom_metric] = ( + mock_rpc + ) request = {} client.update_custom_metric(request) @@ -29810,9 +29810,9 @@ def test_list_custom_metrics_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_metrics - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_metrics] = ( + mock_rpc + ) request = {} client.list_custom_metrics(request) @@ -30070,9 +30070,9 @@ def test_archive_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.archive_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.archive_custom_metric] = ( + mock_rpc + ) request = {} client.archive_custom_metric(request) @@ -30246,9 +30246,9 @@ def test_get_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_metric] = ( + mock_rpc + ) request = {} client.get_custom_metric(request) @@ -30807,9 +30807,9 @@ def test_create_data_stream_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_stream] = ( + mock_rpc + ) request = {} client.create_data_stream(request) @@ -31007,9 +31007,9 @@ def test_delete_data_stream_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_stream] = ( + mock_rpc + ) request = {} client.delete_data_stream(request) @@ -31183,9 +31183,9 @@ def test_update_data_stream_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_stream] = ( + mock_rpc + ) request = {} client.update_data_stream(request) @@ -31373,9 +31373,9 @@ def test_list_data_streams_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_streams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_streams] = ( + mock_rpc + ) request = {} client.list_data_streams(request) @@ -31807,9 +31807,9 @@ def test_run_access_report_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_access_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_access_report] = ( + mock_rpc + ) request = {} client.run_access_report(request) diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/__init__.py b/packages/google-analytics-data/google/analytics/data_v1alpha/__init__.py index 89a66cbd6eb9..bf9e916a7bb6 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/__init__.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.alpha_analytics_data import ( AlphaAnalyticsDataAsyncClient, AlphaAnalyticsDataClient, diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/async_client.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/async_client.py index 3f03610d1bfa..bf99a162538c 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/async_client.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.data_v1alpha import gapic_version as package_version @@ -46,8 +46,8 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.analytics.data_v1alpha.services.alpha_analytics_data import pagers from google.analytics.data_v1alpha.types import analytics_data_api, data @@ -136,7 +136,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AlphaAnalyticsDataAsyncClient: The constructed client. """ - return AlphaAnalyticsDataClient.from_service_account_info.__func__(AlphaAnalyticsDataAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AlphaAnalyticsDataClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AlphaAnalyticsDataAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -152,7 +155,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AlphaAnalyticsDataAsyncClient: The constructed client. """ - return AlphaAnalyticsDataClient.from_service_account_file.__func__(AlphaAnalyticsDataAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AlphaAnalyticsDataClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AlphaAnalyticsDataAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -190,7 +196,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AlphaAnalyticsDataClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AlphaAnalyticsDataClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AlphaAnalyticsDataTransport: diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/client.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/client.py index 27ced416acc5..fc1547067e34 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/client.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.data_v1alpha import gapic_version as package_version @@ -63,8 +63,8 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.analytics.data_v1alpha.services.alpha_analytics_data import pagers from google.analytics.data_v1alpha.types import analytics_data_api, data @@ -83,9 +83,7 @@ class AlphaAnalyticsDataClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AlphaAnalyticsDataTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AlphaAnalyticsDataTransport]] _transport_registry["grpc"] = AlphaAnalyticsDataGrpcTransport _transport_registry["grpc_asyncio"] = AlphaAnalyticsDataGrpcAsyncIOTransport _transport_registry["rest"] = AlphaAnalyticsDataRestTransport @@ -680,11 +678,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AlphaAnalyticsDataClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AlphaAnalyticsDataClient._read_environment_variables() + ) self._client_cert_source = AlphaAnalyticsDataClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -719,8 +715,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AlphaAnalyticsDataTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/pagers.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/pagers.py index ce1d034a1f45..a9395ee465c5 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/pagers.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -225,7 +225,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -385,7 +385,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -461,7 +461,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/__init__.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/__init__.py index 02551ceb158c..9b9373222496 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/__init__.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import AlphaAnalyticsDataRestInterceptor, AlphaAnalyticsDataRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AlphaAnalyticsDataTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AlphaAnalyticsDataTransport]] _transport_registry["grpc"] = AlphaAnalyticsDataGrpcTransport _transport_registry["grpc_asyncio"] = AlphaAnalyticsDataGrpcAsyncIOTransport _transport_registry["rest"] = AlphaAnalyticsDataRestTransport diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/base.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/base.py index 6248ba4d7cbf..626fe9259e3b 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/base.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.data_v1alpha import gapic_version as package_version from google.analytics.data_v1alpha.types import analytics_data_api diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc.py index 336286c50ed7..a963d1392308 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.analytics.data_v1alpha.types import analytics_data_api @@ -526,12 +526,12 @@ def sheet_export_audience_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "sheet_export_audience_list" not in self._stubs: - self._stubs[ - "sheet_export_audience_list" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/SheetExportAudienceList", - request_serializer=analytics_data_api.SheetExportAudienceListRequest.serialize, - response_deserializer=analytics_data_api.SheetExportAudienceListResponse.deserialize, + self._stubs["sheet_export_audience_list"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/SheetExportAudienceList", + request_serializer=analytics_data_api.SheetExportAudienceListRequest.serialize, + response_deserializer=analytics_data_api.SheetExportAudienceListResponse.deserialize, + ) ) return self._stubs["sheet_export_audience_list"] @@ -658,12 +658,12 @@ def create_recurring_audience_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_recurring_audience_list" not in self._stubs: - self._stubs[ - "create_recurring_audience_list" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/CreateRecurringAudienceList", - request_serializer=analytics_data_api.CreateRecurringAudienceListRequest.serialize, - response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + self._stubs["create_recurring_audience_list"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/CreateRecurringAudienceList", + request_serializer=analytics_data_api.CreateRecurringAudienceListRequest.serialize, + response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + ) ) return self._stubs["create_recurring_audience_list"] @@ -700,12 +700,12 @@ def get_recurring_audience_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_recurring_audience_list" not in self._stubs: - self._stubs[ - "get_recurring_audience_list" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetRecurringAudienceList", - request_serializer=analytics_data_api.GetRecurringAudienceListRequest.serialize, - response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + self._stubs["get_recurring_audience_list"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetRecurringAudienceList", + request_serializer=analytics_data_api.GetRecurringAudienceListRequest.serialize, + response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + ) ) return self._stubs["get_recurring_audience_list"] @@ -743,12 +743,12 @@ def list_recurring_audience_lists( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_recurring_audience_lists" not in self._stubs: - self._stubs[ - "list_recurring_audience_lists" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/ListRecurringAudienceLists", - request_serializer=analytics_data_api.ListRecurringAudienceListsRequest.serialize, - response_deserializer=analytics_data_api.ListRecurringAudienceListsResponse.deserialize, + self._stubs["list_recurring_audience_lists"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/ListRecurringAudienceLists", + request_serializer=analytics_data_api.ListRecurringAudienceListsRequest.serialize, + response_deserializer=analytics_data_api.ListRecurringAudienceListsResponse.deserialize, + ) ) return self._stubs["list_recurring_audience_lists"] @@ -776,12 +776,12 @@ def get_property_quotas_snapshot( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_property_quotas_snapshot" not in self._stubs: - self._stubs[ - "get_property_quotas_snapshot" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetPropertyQuotasSnapshot", - request_serializer=analytics_data_api.GetPropertyQuotasSnapshotRequest.serialize, - response_deserializer=analytics_data_api.PropertyQuotasSnapshot.deserialize, + self._stubs["get_property_quotas_snapshot"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetPropertyQuotasSnapshot", + request_serializer=analytics_data_api.GetPropertyQuotasSnapshotRequest.serialize, + response_deserializer=analytics_data_api.PropertyQuotasSnapshot.deserialize, + ) ) return self._stubs["get_property_quotas_snapshot"] diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc_asyncio.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc_asyncio.py index eaa4dca9ef32..7fbb069e2861 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc_asyncio.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.analytics.data_v1alpha.types import analytics_data_api @@ -535,12 +535,12 @@ def sheet_export_audience_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "sheet_export_audience_list" not in self._stubs: - self._stubs[ - "sheet_export_audience_list" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/SheetExportAudienceList", - request_serializer=analytics_data_api.SheetExportAudienceListRequest.serialize, - response_deserializer=analytics_data_api.SheetExportAudienceListResponse.deserialize, + self._stubs["sheet_export_audience_list"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/SheetExportAudienceList", + request_serializer=analytics_data_api.SheetExportAudienceListRequest.serialize, + response_deserializer=analytics_data_api.SheetExportAudienceListResponse.deserialize, + ) ) return self._stubs["sheet_export_audience_list"] @@ -668,12 +668,12 @@ def create_recurring_audience_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_recurring_audience_list" not in self._stubs: - self._stubs[ - "create_recurring_audience_list" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/CreateRecurringAudienceList", - request_serializer=analytics_data_api.CreateRecurringAudienceListRequest.serialize, - response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + self._stubs["create_recurring_audience_list"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/CreateRecurringAudienceList", + request_serializer=analytics_data_api.CreateRecurringAudienceListRequest.serialize, + response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + ) ) return self._stubs["create_recurring_audience_list"] @@ -710,12 +710,12 @@ def get_recurring_audience_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_recurring_audience_list" not in self._stubs: - self._stubs[ - "get_recurring_audience_list" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetRecurringAudienceList", - request_serializer=analytics_data_api.GetRecurringAudienceListRequest.serialize, - response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + self._stubs["get_recurring_audience_list"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetRecurringAudienceList", + request_serializer=analytics_data_api.GetRecurringAudienceListRequest.serialize, + response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + ) ) return self._stubs["get_recurring_audience_list"] @@ -753,12 +753,12 @@ def list_recurring_audience_lists( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_recurring_audience_lists" not in self._stubs: - self._stubs[ - "list_recurring_audience_lists" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/ListRecurringAudienceLists", - request_serializer=analytics_data_api.ListRecurringAudienceListsRequest.serialize, - response_deserializer=analytics_data_api.ListRecurringAudienceListsResponse.deserialize, + self._stubs["list_recurring_audience_lists"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/ListRecurringAudienceLists", + request_serializer=analytics_data_api.ListRecurringAudienceListsRequest.serialize, + response_deserializer=analytics_data_api.ListRecurringAudienceListsResponse.deserialize, + ) ) return self._stubs["list_recurring_audience_lists"] @@ -786,12 +786,12 @@ def get_property_quotas_snapshot( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_property_quotas_snapshot" not in self._stubs: - self._stubs[ - "get_property_quotas_snapshot" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetPropertyQuotasSnapshot", - request_serializer=analytics_data_api.GetPropertyQuotasSnapshotRequest.serialize, - response_deserializer=analytics_data_api.PropertyQuotasSnapshot.deserialize, + self._stubs["get_property_quotas_snapshot"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetPropertyQuotasSnapshot", + request_serializer=analytics_data_api.GetPropertyQuotasSnapshotRequest.serialize, + response_deserializer=analytics_data_api.PropertyQuotasSnapshot.deserialize, + ) ) return self._stubs["get_property_quotas_snapshot"] diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/rest.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/rest.py index 90f99d884016..7fde7d0fc110 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/rest.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1084,9 +1084,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseCreateAudienceList._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseCreateAudienceList._get_http_options() request, metadata = self._interceptor.pre_create_audience_list( request, metadata @@ -1246,9 +1244,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseCreateRecurringAudienceList._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseCreateRecurringAudienceList._get_http_options() request, metadata = self._interceptor.pre_create_recurring_audience_list( request, metadata @@ -1317,11 +1313,10 @@ def __call__( resp = self._interceptor.post_create_recurring_audience_list(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_recurring_audience_list_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_recurring_audience_list_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1407,9 +1402,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseCreateReportTask._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseCreateReportTask._get_http_options() request, metadata = self._interceptor.pre_create_report_task( request, metadata @@ -1563,9 +1556,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseGetAudienceList._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseGetAudienceList._get_http_options() request, metadata = self._interceptor.pre_get_audience_list( request, metadata @@ -1715,9 +1706,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseGetPropertyQuotasSnapshot._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseGetPropertyQuotasSnapshot._get_http_options() request, metadata = self._interceptor.pre_get_property_quotas_snapshot( request, metadata @@ -1874,9 +1863,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseGetRecurringAudienceList._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseGetRecurringAudienceList._get_http_options() request, metadata = self._interceptor.pre_get_recurring_audience_list( request, metadata @@ -2026,9 +2013,7 @@ def __call__( A specific report task configuration. """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseGetReportTask._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseGetReportTask._get_http_options() request, metadata = self._interceptor.pre_get_report_task(request, metadata) transcoded_request = _BaseAlphaAnalyticsDataRestTransport._BaseGetReportTask._get_transcoded_request( @@ -2174,9 +2159,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseListAudienceLists._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseListAudienceLists._get_http_options() request, metadata = self._interceptor.pre_list_audience_lists( request, metadata @@ -2327,9 +2310,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseListRecurringAudienceLists._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseListRecurringAudienceLists._get_http_options() request, metadata = self._interceptor.pre_list_recurring_audience_lists( request, metadata @@ -2393,11 +2374,10 @@ def __call__( resp = self._interceptor.post_list_recurring_audience_lists(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_recurring_audience_lists_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_recurring_audience_lists_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2484,9 +2464,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseListReportTasks._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseListReportTasks._get_http_options() request, metadata = self._interceptor.pre_list_report_tasks( request, metadata @@ -2635,9 +2613,7 @@ def __call__( A list of users in an audience list. """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseQueryAudienceList._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseQueryAudienceList._get_http_options() request, metadata = self._interceptor.pre_query_audience_list( request, metadata @@ -2793,9 +2769,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseQueryReportTask._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseQueryReportTask._get_http_options() request, metadata = self._interceptor.pre_query_report_task( request, metadata @@ -2952,9 +2926,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseRunFunnelReport._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseRunFunnelReport._get_http_options() request, metadata = self._interceptor.pre_run_funnel_report( request, metadata @@ -3111,9 +3083,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseSheetExportAudienceList._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseSheetExportAudienceList._get_http_options() request, metadata = self._interceptor.pre_sheet_export_audience_list( request, metadata @@ -3233,7 +3203,9 @@ def create_recurring_audience_list( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateRecurringAudienceList(self._session, self._host, self._interceptor) # type: ignore + return self._CreateRecurringAudienceList( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_report_task( @@ -3264,7 +3236,9 @@ def get_property_quotas_snapshot( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetPropertyQuotasSnapshot(self._session, self._host, self._interceptor) # type: ignore + return self._GetPropertyQuotasSnapshot( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_recurring_audience_list( @@ -3275,7 +3249,9 @@ def get_recurring_audience_list( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetRecurringAudienceList(self._session, self._host, self._interceptor) # type: ignore + return self._GetRecurringAudienceList( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_report_task( @@ -3307,7 +3283,9 @@ def list_recurring_audience_lists( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListRecurringAudienceLists(self._session, self._host, self._interceptor) # type: ignore + return self._ListRecurringAudienceLists( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_report_tasks( @@ -3362,7 +3340,9 @@ def sheet_export_audience_list( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SheetExportAudienceList(self._session, self._host, self._interceptor) # type: ignore + return self._SheetExportAudienceList( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/types/analytics_data_api.py b/packages/google-analytics-data/google/analytics/data_v1alpha/types/analytics_data_api.py index 60fd23453677..8835dc589a2c 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/types/analytics_data_api.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/types/analytics_data_api.py @@ -356,12 +356,12 @@ class ListRecurringAudienceListsResponse(proto.Message): def raw_page(self): return self - recurring_audience_lists: MutableSequence[ - "RecurringAudienceList" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="RecurringAudienceList", + recurring_audience_lists: MutableSequence["RecurringAudienceList"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="RecurringAudienceList", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -652,6 +652,7 @@ class State(proto.Enum): possible that re-requesting this audience list will succeed. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -1086,6 +1087,7 @@ class FunnelVisualizationType(proto.Enum): visualization sub report in the response will contain the date dimension. """ + FUNNEL_VISUALIZATION_TYPE_UNSPECIFIED = 0 STANDARD_FUNNEL = 1 TRENDED_FUNNEL = 2 @@ -1340,12 +1342,12 @@ class ReportDefinition(proto.Message): proto.INT64, number=8, ) - metric_aggregations: MutableSequence[ - data.MetricAggregation - ] = proto.RepeatedField( - proto.ENUM, - number=9, - enum=data.MetricAggregation, + metric_aggregations: MutableSequence[data.MetricAggregation] = ( + proto.RepeatedField( + proto.ENUM, + number=9, + enum=data.MetricAggregation, + ) ) order_bys: MutableSequence[data.OrderBy] = proto.RepeatedField( proto.MESSAGE, @@ -1445,6 +1447,7 @@ class State(proto.Enum): FAILED (3): The report failed to be created. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/types/data.py b/packages/google-analytics-data/google/analytics/data_v1alpha/types/data.py index a056d130121a..d7d184615eae 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/types/data.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/types/data.py @@ -118,6 +118,7 @@ class UserCriteriaScoping(proto.Enum): If the criteria is satisfied by any events for the user, the user matches the criteria. """ + USER_CRITERIA_SCOPING_UNSPECIFIED = 0 USER_CRITERIA_WITHIN_SAME_EVENT = 1 USER_CRITERIA_WITHIN_SAME_SESSION = 2 @@ -139,6 +140,7 @@ class UserExclusionDuration(proto.Enum): Permanently exclude users from the segment if the user ever meets the ``userExclusionCriteria`` condition. """ + USER_EXCLUSION_DURATION_UNSPECIFIED = 0 USER_EXCLUSION_TEMPORARY = 1 USER_EXCLUSION_PERMANENT = 2 @@ -158,6 +160,7 @@ class SessionCriteriaScoping(proto.Enum): If the criteria is satisfied within one session, the session matches the criteria. """ + SESSION_CRITERIA_SCOPING_UNSPECIFIED = 0 SESSION_CRITERIA_WITHIN_SAME_EVENT = 1 SESSION_CRITERIA_WITHIN_SAME_SESSION = 2 @@ -179,6 +182,7 @@ class SessionExclusionDuration(proto.Enum): Permanently exclude sessions from the segment if the session ever meets the ``sessionExclusionCriteria`` condition. """ + SESSION_EXCLUSION_DURATION_UNSPECIFIED = 0 SESSION_EXCLUSION_TEMPORARY = 1 SESSION_EXCLUSION_PERMANENT = 2 @@ -195,6 +199,7 @@ class EventCriteriaScoping(proto.Enum): If the criteria is satisfied within one event, the event matches the criteria. """ + EVENT_CRITERIA_SCOPING_UNSPECIFIED = 0 EVENT_CRITERIA_WITHIN_SAME_EVENT = 1 @@ -211,6 +216,7 @@ class EventExclusionDuration(proto.Enum): Permanently exclude events from the segment if the event ever meets the ``eventExclusionCriteria`` condition. """ + EVENT_EXCLUSION_DURATION_UNSPECIFIED = 0 EVENT_EXCLUSION_PERMANENT = 1 @@ -230,6 +236,7 @@ class MetricAggregation(proto.Enum): COUNT (4): Count operator. """ + METRIC_AGGREGATION_UNSPECIFIED = 0 TOTAL = 1 MINIMUM = 5 @@ -278,6 +285,7 @@ class MetricType(proto.Enum): A length in kilometers; a special floating point type. """ + METRIC_TYPE_UNSPECIFIED = 0 TYPE_INTEGER = 1 TYPE_FLOAT = 2 @@ -305,6 +313,7 @@ class RestrictedMetricType(proto.Enum): REVENUE_DATA (2): Revenue metrics such as ``purchaseRevenue``. """ + RESTRICTED_METRIC_TYPE_UNSPECIFIED = 0 COST_DATA = 1 REVENUE_DATA = 2 @@ -330,6 +339,7 @@ class SamplingLevel(proto.Enum): explorations. To learn more, see https://support.google.com/analytics/answer/10896953. """ + SAMPLING_LEVEL_UNSPECIFIED = 0 LOW = 1 MEDIUM = 2 @@ -752,6 +762,7 @@ class MatchType(proto.Enum): Partial match for the regular expression with the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BEGINS_WITH = 2 @@ -823,6 +834,7 @@ class Operation(proto.Enum): GREATER_THAN_OR_EQUAL (5): Greater than or equal """ + OPERATION_UNSPECIFIED = 0 EQUAL = 1 LESS_THAN = 2 @@ -912,6 +924,7 @@ class OrderType(proto.Enum): values all have equal ordering value below all numeric values. """ + ORDER_TYPE_UNSPECIFIED = 0 ALPHANUMERIC = 1 CASE_INSENSITIVE_ALPHANUMERIC = 2 @@ -1180,6 +1193,7 @@ class Granularity(proto.Enum): ``dateRange`` is a month in duration and the request contains ``cohortNthMonth``. """ + GRANULARITY_UNSPECIFIED = 0 DAILY = 1 WEEKLY = 2 @@ -1333,12 +1347,12 @@ class ActiveMetricRestriction(proto.Message): number=1, optional=True, ) - restricted_metric_types: MutableSequence[ - "RestrictedMetricType" - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum="RestrictedMetricType", + restricted_metric_types: MutableSequence["RestrictedMetricType"] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum="RestrictedMetricType", + ) ) active_metric_restrictions: MutableSequence[ @@ -1886,19 +1900,19 @@ class UserSegmentCriteria(proto.Message): if ``andConditionGroups`` are specified. """ - and_condition_groups: MutableSequence[ - "UserSegmentConditionGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="UserSegmentConditionGroup", + and_condition_groups: MutableSequence["UserSegmentConditionGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="UserSegmentConditionGroup", + ) ) - and_sequence_groups: MutableSequence[ - "UserSegmentSequenceGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="UserSegmentSequenceGroup", + and_sequence_groups: MutableSequence["UserSegmentSequenceGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="UserSegmentSequenceGroup", + ) ) @@ -2100,12 +2114,12 @@ class SessionSegmentCriteria(proto.Message): of these ``andConditionGroups``. """ - and_condition_groups: MutableSequence[ - "SessionSegmentConditionGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SessionSegmentConditionGroup", + and_condition_groups: MutableSequence["SessionSegmentConditionGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SessionSegmentConditionGroup", + ) ) @@ -2215,12 +2229,12 @@ class EventSegmentCriteria(proto.Message): these ``andConditionGroups``. """ - and_condition_groups: MutableSequence[ - "EventSegmentConditionGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="EventSegmentConditionGroup", + and_condition_groups: MutableSequence["EventSegmentConditionGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="EventSegmentConditionGroup", + ) ) @@ -2646,12 +2660,12 @@ class SegmentParameterFilterExpressionList(proto.Message): expressions. """ - expressions: MutableSequence[ - "SegmentParameterFilterExpression" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SegmentParameterFilterExpression", + expressions: MutableSequence["SegmentParameterFilterExpression"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SegmentParameterFilterExpression", + ) ) @@ -3061,12 +3075,12 @@ class FunnelParameterFilterExpressionList(proto.Message): expressions. """ - expressions: MutableSequence[ - "FunnelParameterFilterExpression" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="FunnelParameterFilterExpression", + expressions: MutableSequence["FunnelParameterFilterExpression"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="FunnelParameterFilterExpression", + ) ) diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/__init__.py b/packages/google-analytics-data/google/analytics/data_v1beta/__init__.py index 4b96ba617004..51c6f64785e4 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/__init__.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.beta_analytics_data import ( BetaAnalyticsDataAsyncClient, BetaAnalyticsDataClient, diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/async_client.py b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/async_client.py index b60644e74200..35ab0e689b6a 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/async_client.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.data_v1beta import gapic_version as package_version @@ -46,8 +46,8 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.analytics.data_v1beta.services.beta_analytics_data import pagers from google.analytics.data_v1beta.types import analytics_data_api, data @@ -122,7 +122,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BetaAnalyticsDataAsyncClient: The constructed client. """ - return BetaAnalyticsDataClient.from_service_account_info.__func__(BetaAnalyticsDataAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BetaAnalyticsDataClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(BetaAnalyticsDataAsyncClient, 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: BetaAnalyticsDataAsyncClient: The constructed client. """ - return BetaAnalyticsDataClient.from_service_account_file.__func__(BetaAnalyticsDataAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BetaAnalyticsDataClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(BetaAnalyticsDataAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/client.py b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/client.py index 1a6f5723f2b4..dd34cf31bc7a 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/client.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.data_v1beta import gapic_version as package_version @@ -63,8 +63,8 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.analytics.data_v1beta.services.beta_analytics_data import pagers from google.analytics.data_v1beta.types import analytics_data_api, data @@ -83,9 +83,7 @@ class BetaAnalyticsDataClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BetaAnalyticsDataTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BetaAnalyticsDataTransport]] _transport_registry["grpc"] = BetaAnalyticsDataGrpcTransport _transport_registry["grpc_asyncio"] = BetaAnalyticsDataGrpcAsyncIOTransport _transport_registry["rest"] = BetaAnalyticsDataRestTransport @@ -642,11 +640,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BetaAnalyticsDataClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BetaAnalyticsDataClient._read_environment_variables() + ) self._client_cert_source = BetaAnalyticsDataClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -681,8 +677,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BetaAnalyticsDataTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/pagers.py b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/pagers.py index 8bdc52fcc23e..4f8380e1c421 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/pagers.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/base.py b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/base.py index 7c2efa9ff5ed..3b2504df2013 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/base.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.data_v1beta import gapic_version as package_version from google.analytics.data_v1beta.types import analytics_data_api diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc.py b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc.py index fac0f1e2e138..27570e9887c9 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.analytics.data_v1beta.types import analytics_data_api diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc_asyncio.py b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc_asyncio.py index 85258c7302e4..24a81044e26f 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc_asyncio.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.analytics.data_v1beta.types import analytics_data_api diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/rest.py b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/rest.py index a58ea9effeb1..73ff4adcb76c 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/rest.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -904,9 +904,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseBatchRunPivotReports._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseBatchRunPivotReports._get_http_options() request, metadata = self._interceptor.pre_batch_run_pivot_reports( request, metadata @@ -1066,9 +1064,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseBatchRunReports._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseBatchRunReports._get_http_options() request, metadata = self._interceptor.pre_batch_run_reports( request, metadata @@ -1228,9 +1224,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseCheckCompatibility._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseCheckCompatibility._get_http_options() request, metadata = self._interceptor.pre_check_compatibility( request, metadata @@ -1387,9 +1381,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseCreateAudienceExport._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseCreateAudienceExport._get_http_options() request, metadata = self._interceptor.pre_create_audience_export( request, metadata @@ -1546,9 +1538,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseGetAudienceExport._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseGetAudienceExport._get_http_options() request, metadata = self._interceptor.pre_get_audience_export( request, metadata @@ -1846,9 +1836,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseListAudienceExports._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseListAudienceExports._get_http_options() request, metadata = self._interceptor.pre_list_audience_exports( request, metadata @@ -2001,9 +1989,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseQueryAudienceExport._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseQueryAudienceExport._get_http_options() request, metadata = self._interceptor.pre_query_audience_export( request, metadata @@ -2161,9 +2147,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseRunPivotReport._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseRunPivotReport._get_http_options() request, metadata = self._interceptor.pre_run_pivot_report( request, metadata @@ -2319,9 +2303,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseRunRealtimeReport._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseRunRealtimeReport._get_http_options() request, metadata = self._interceptor.pre_run_realtime_report( request, metadata diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/types/analytics_data_api.py b/packages/google-analytics-data/google/analytics/data_v1beta/types/analytics_data_api.py index 100e62a5f81a..c35761558d39 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/types/analytics_data_api.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/types/analytics_data_api.py @@ -130,19 +130,19 @@ class CheckCompatibilityResponse(proto.Message): The compatibility of each metric. """ - dimension_compatibilities: MutableSequence[ - data.DimensionCompatibility - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=data.DimensionCompatibility, + dimension_compatibilities: MutableSequence[data.DimensionCompatibility] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=data.DimensionCompatibility, + ) ) - metric_compatibilities: MutableSequence[ - data.MetricCompatibility - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=data.MetricCompatibility, + metric_compatibilities: MutableSequence[data.MetricCompatibility] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=data.MetricCompatibility, + ) ) @@ -1226,6 +1226,7 @@ class State(proto.Enum): is possible that re-requesting this audience export will succeed. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/types/data.py b/packages/google-analytics-data/google/analytics/data_v1beta/types/data.py index 781bf84f8c65..279eab7d10eb 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/types/data.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/types/data.py @@ -77,6 +77,7 @@ class MetricAggregation(proto.Enum): COUNT (4): Count operator. """ + METRIC_AGGREGATION_UNSPECIFIED = 0 TOTAL = 1 MINIMUM = 5 @@ -125,6 +126,7 @@ class MetricType(proto.Enum): A length in kilometers; a special floating point type. """ + METRIC_TYPE_UNSPECIFIED = 0 TYPE_INTEGER = 1 TYPE_FLOAT = 2 @@ -152,6 +154,7 @@ class RestrictedMetricType(proto.Enum): REVENUE_DATA (2): Revenue metrics such as ``purchaseRevenue``. """ + RESTRICTED_METRIC_TYPE_UNSPECIFIED = 0 COST_DATA = 1 REVENUE_DATA = 2 @@ -172,6 +175,7 @@ class Compatibility(proto.Enum): dimension or metric cannot be successfully added to a report. """ + COMPATIBILITY_UNSPECIFIED = 0 COMPATIBLE = 1 INCOMPATIBLE = 2 @@ -673,6 +677,7 @@ class MatchType(proto.Enum): Partial match for the regular expression with the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BEGINS_WITH = 2 @@ -742,6 +747,7 @@ class Operation(proto.Enum): GREATER_THAN_OR_EQUAL (5): Greater than or equal """ + OPERATION_UNSPECIFIED = 0 EQUAL = 1 LESS_THAN = 2 @@ -896,6 +902,7 @@ class OrderType(proto.Enum): values all have equal ordering value below all numeric values. """ + ORDER_TYPE_UNSPECIFIED = 0 ALPHANUMERIC = 1 CASE_INSENSITIVE_ALPHANUMERIC = 2 @@ -968,12 +975,12 @@ class PivotSelection(proto.Message): proto.STRING, number=1, ) - pivot_selections: MutableSequence[ - "OrderBy.PivotOrderBy.PivotSelection" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="OrderBy.PivotOrderBy.PivotSelection", + pivot_selections: MutableSequence["OrderBy.PivotOrderBy.PivotSelection"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="OrderBy.PivotOrderBy.PivotSelection", + ) ) metric: MetricOrderBy = proto.Field( @@ -1235,6 +1242,7 @@ class Granularity(proto.Enum): ``dateRange`` is a month in duration and the request contains ``cohortNthMonth``. """ + GRANULARITY_UNSPECIFIED = 0 DAILY = 1 WEEKLY = 2 @@ -1386,12 +1394,12 @@ class ActiveMetricRestriction(proto.Message): number=1, optional=True, ) - restricted_metric_types: MutableSequence[ - "RestrictedMetricType" - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum="RestrictedMetricType", + restricted_metric_types: MutableSequence["RestrictedMetricType"] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum="RestrictedMetricType", + ) ) active_metric_restrictions: MutableSequence[ @@ -1530,12 +1538,12 @@ class PivotHeader(proto.Message): ``offset`` and ``limit`` are specified in the request. """ - pivot_dimension_headers: MutableSequence[ - "PivotDimensionHeader" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="PivotDimensionHeader", + pivot_dimension_headers: MutableSequence["PivotDimensionHeader"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="PivotDimensionHeader", + ) ) row_count: int = proto.Field( proto.INT32, @@ -1917,6 +1925,7 @@ class BlockedReason(proto.Enum): related metrics for this property, and this metric is cost related. """ + BLOCKED_REASON_UNSPECIFIED = 0 NO_REVENUE_METRICS = 1 NO_COST_METRICS = 2 diff --git a/packages/google-analytics-data/mypy.ini b/packages/google-analytics-data/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-analytics-data/mypy.ini +++ b/packages/google-analytics-data/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-analytics-data/noxfile.py b/packages/google-analytics-data/noxfile.py index 43fd9fb9b55c..2e27279ef4ed 100644 --- a/packages/google-analytics-data/noxfile.py +++ b/packages/google-analytics-data/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-analytics-data/tests/unit/gapic/data_v1alpha/test_alpha_analytics_data.py b/packages/google-analytics-data/tests/unit/gapic/data_v1alpha/test_alpha_analytics_data.py index 3c1c63e50f1c..795e573ec6ed 100644 --- a/packages/google-analytics-data/tests/unit/gapic/data_v1alpha/test_alpha_analytics_data.py +++ b/packages/google-analytics-data/tests/unit/gapic/data_v1alpha/test_alpha_analytics_data.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.analytics.data_v1alpha.services.alpha_analytics_data import ( AlphaAnalyticsDataAsyncClient, @@ -994,10 +994,9 @@ def test_alpha_analytics_data_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1041,9 @@ def test_alpha_analytics_data_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1081,10 +1079,9 @@ def test_alpha_analytics_data_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1336,9 +1333,7 @@ def test_alpha_analytics_data_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1455,9 +1450,9 @@ def test_run_funnel_report_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_funnel_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_funnel_report] = ( + mock_rpc + ) request = {} client.run_funnel_report(request) @@ -1708,9 +1703,9 @@ def test_create_audience_list_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_audience_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_audience_list] = ( + mock_rpc + ) request = {} client.create_audience_list(request) @@ -2067,9 +2062,9 @@ def test_query_audience_list_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_audience_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_audience_list] = ( + mock_rpc + ) request = {} client.query_audience_list(request) @@ -2774,9 +2769,9 @@ def test_get_audience_list_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_audience_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_audience_list] = ( + mock_rpc + ) request = {} client.get_audience_list(request) @@ -3134,9 +3129,9 @@ def test_list_audience_lists_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_audience_lists - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_audience_lists] = ( + mock_rpc + ) request = {} client.list_audience_lists(request) @@ -5307,9 +5302,9 @@ def test_create_report_task_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_report_task - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_report_task] = ( + mock_rpc + ) request = {} client.create_report_task(request) @@ -5664,9 +5659,9 @@ def test_query_report_task_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_report_task - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_report_task] = ( + mock_rpc + ) request = {} client.query_report_task(request) @@ -6330,9 +6325,9 @@ def test_list_report_tasks_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_report_tasks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_report_tasks] = ( + mock_rpc + ) request = {} client.list_report_tasks(request) @@ -6804,9 +6799,9 @@ def test_run_funnel_report_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_funnel_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_funnel_report] = ( + mock_rpc + ) request = {} client.run_funnel_report(request) @@ -6844,9 +6839,9 @@ def test_create_audience_list_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_audience_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_audience_list] = ( + mock_rpc + ) request = {} client.create_audience_list(request) @@ -7035,9 +7030,9 @@ def test_query_audience_list_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_audience_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_audience_list] = ( + mock_rpc + ) request = {} client.query_audience_list(request) @@ -7404,9 +7399,9 @@ def test_get_audience_list_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_audience_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_audience_list] = ( + mock_rpc + ) request = {} client.get_audience_list(request) @@ -7585,9 +7580,9 @@ def test_list_audience_lists_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_audience_lists - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_audience_lists] = ( + mock_rpc + ) request = {} client.list_audience_lists(request) @@ -8680,9 +8675,9 @@ def test_create_report_task_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_report_task - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_report_task] = ( + mock_rpc + ) request = {} client.create_report_task(request) @@ -8869,9 +8864,9 @@ def test_query_report_task_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_report_task - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_report_task] = ( + mock_rpc + ) request = {} client.query_report_task(request) @@ -9227,9 +9222,9 @@ def test_list_report_tasks_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_report_tasks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_report_tasks] = ( + mock_rpc + ) request = {} client.list_report_tasks(request) diff --git a/packages/google-analytics-data/tests/unit/gapic/data_v1beta/test_beta_analytics_data.py b/packages/google-analytics-data/tests/unit/gapic/data_v1beta/test_beta_analytics_data.py index b5c60812ac2e..6b5548885ea2 100644 --- a/packages/google-analytics-data/tests/unit/gapic/data_v1beta/test_beta_analytics_data.py +++ b/packages/google-analytics-data/tests/unit/gapic/data_v1beta/test_beta_analytics_data.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,16 +56,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.analytics.data_v1beta.services.beta_analytics_data import ( BetaAnalyticsDataAsyncClient, @@ -989,10 +989,9 @@ def test_beta_analytics_data_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1036,9 @@ def test_beta_analytics_data_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1076,10 +1074,9 @@ def test_beta_analytics_data_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1331,9 +1328,7 @@ def test_beta_analytics_data_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1690,9 +1685,9 @@ def test_run_pivot_report_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_pivot_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_pivot_report] = ( + mock_rpc + ) request = {} client.run_pivot_report(request) @@ -1938,9 +1933,9 @@ def test_batch_run_reports_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_run_reports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_run_reports] = ( + mock_rpc + ) request = {} client.batch_run_reports(request) @@ -2776,9 +2771,9 @@ def test_run_realtime_report_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_realtime_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_realtime_report] = ( + mock_rpc + ) request = {} client.run_realtime_report(request) @@ -3031,9 +3026,9 @@ def test_check_compatibility_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.check_compatibility - ] = mock_rpc + client._transport._wrapped_methods[client._transport.check_compatibility] = ( + mock_rpc + ) request = {} client.check_compatibility(request) @@ -3282,9 +3277,9 @@ def test_create_audience_export_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_audience_export - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_audience_export] = ( + mock_rpc + ) request = {} client.create_audience_export(request) @@ -3642,9 +3637,9 @@ def test_query_audience_export_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_audience_export - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_audience_export] = ( + mock_rpc + ) request = {} client.query_audience_export(request) @@ -3998,9 +3993,9 @@ def test_get_audience_export_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_audience_export - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_audience_export] = ( + mock_rpc + ) request = {} client.get_audience_export(request) @@ -4357,9 +4352,9 @@ def test_list_audience_exports_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_audience_exports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_audience_exports] = ( + mock_rpc + ) request = {} client.list_audience_exports(request) @@ -4867,9 +4862,9 @@ def test_run_pivot_report_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_pivot_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_pivot_report] = ( + mock_rpc + ) request = {} client.run_pivot_report(request) @@ -4905,9 +4900,9 @@ def test_batch_run_reports_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_run_reports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_run_reports] = ( + mock_rpc + ) request = {} client.batch_run_reports(request) @@ -5162,9 +5157,9 @@ def test_run_realtime_report_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_realtime_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_realtime_report] = ( + mock_rpc + ) request = {} client.run_realtime_report(request) @@ -5202,9 +5197,9 @@ def test_check_compatibility_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.check_compatibility - ] = mock_rpc + client._transport._wrapped_methods[client._transport.check_compatibility] = ( + mock_rpc + ) request = {} client.check_compatibility(request) @@ -5243,9 +5238,9 @@ def test_create_audience_export_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_audience_export - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_audience_export] = ( + mock_rpc + ) request = {} client.create_audience_export(request) @@ -5435,9 +5430,9 @@ def test_query_audience_export_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_audience_export - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_audience_export] = ( + mock_rpc + ) request = {} client.query_audience_export(request) @@ -5620,9 +5615,9 @@ def test_get_audience_export_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_audience_export - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_audience_export] = ( + mock_rpc + ) request = {} client.get_audience_export(request) @@ -5802,9 +5797,9 @@ def test_list_audience_exports_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_audience_exports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_audience_exports] = ( + mock_rpc + ) request = {} client.list_audience_exports(request) diff --git a/packages/google-apps-card/google/apps/card_v1/__init__.py b/packages/google-apps-card/google/apps/card_v1/__init__.py index d59ff54a4f08..08a54a5bace0 100644 --- a/packages/google-apps-card/google/apps/card_v1/__init__.py +++ b/packages/google-apps-card/google/apps/card_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.card import ( Action, BorderStyle, diff --git a/packages/google-apps-card/google/apps/card_v1/types/card.py b/packages/google-apps-card/google/apps/card_v1/types/card.py index c7875e4ddd0d..bbc23fe27660 100644 --- a/packages/google-apps-card/google/apps/card_v1/types/card.py +++ b/packages/google-apps-card/google/apps/card_v1/types/card.py @@ -270,6 +270,7 @@ class DividerStyle(proto.Enum): The result is equivalent to not adding a divider at all. """ + DIVIDER_STYLE_UNSPECIFIED = 0 SOLID_DIVIDER = 1 NO_DIVIDER = 2 @@ -293,6 +294,7 @@ class DisplayStyle(proto.Enum): Default value. The card is shown by replacing the view of the top card in the card stack. """ + DISPLAY_STYLE_UNSPECIFIED = 0 PEEK = 1 REPLACE = 2 @@ -942,6 +944,7 @@ class ImageType(proto.Enum): example, a 4x3 image becomes a circle with a diameter of 3. """ + SQUARE = 0 CIRCLE = 1 @@ -967,6 +970,7 @@ class HorizontalAlignment(proto.Enum): widgets to the right. For right-to-left layouts, aligns widgets to the left. """ + HORIZONTAL_ALIGNMENT_UNSPECIFIED = 0 START = 1 CENTER = 2 @@ -985,6 +989,7 @@ class VerticalAlignment(proto.Enum): BOTTOM (3): Alignment to the bottom position. """ + VERTICAL_ALIGNMENT_UNSPECIFIED = 0 TOP = 1 MIDDLE = 2 @@ -1117,6 +1122,7 @@ class TextSyntax(proto.Enum): MARKDOWN (2): The text is rendered as Markdown. """ + TEXT_SYNTAX_UNSPECIFIED = 0 HTML = 1 MARKDOWN = 2 @@ -1335,6 +1341,7 @@ class ControlType(proto.Enum): CHECK_BOX (2): A checkbox. """ + SWITCH = 0 CHECKBOX = 1 CHECK_BOX = 2 @@ -1564,6 +1571,7 @@ class Type(proto.Enum): The text input field has a fixed height of multiple lines. """ + SINGLE_LINE = 0 MULTIPLE_LINE = 1 @@ -1859,6 +1867,7 @@ class SelectionType(proto.Enum): `Google Workspace add-ons and Chat apps `__: """ + CHECK_BOX = 0 RADIO_BUTTON = 1 SWITCH = 2 @@ -1954,6 +1963,7 @@ class CommonDataSource(proto.Enum): view and select users from their Google Workspace organization. """ + UNKNOWN = 0 USER = 1 @@ -2091,6 +2101,7 @@ class DateTimePickerType(proto.Enum): TIME_ONLY (2): Users input a time. """ + DATE_AND_TIME = 0 DATE_ONLY = 1 TIME_ONLY = 2 @@ -2288,6 +2299,7 @@ class Type(proto.Enum): lowest priority actions, especially when presenting multiple options. """ + TYPE_UNSPECIFIED = 0 OUTLINED = 1 FILLED = 2 @@ -2559,6 +2571,7 @@ class ImageCropType(proto.Enum): Applies a rectangular crop with a 4:3 aspect ratio. """ + IMAGE_CROP_TYPE_UNSPECIFIED = 0 SQUARE = 1 CIRCLE = 2 @@ -2626,6 +2639,7 @@ class BorderType(proto.Enum): STROKE (2): Default value. Outline. """ + BORDER_TYPE_UNSPECIFIED = 0 NO_BORDER = 1 STROKE = 2 @@ -2790,6 +2804,7 @@ class GridItemLayout(proto.Enum): The title and subtitle are shown above the grid item's image. """ + GRID_ITEM_LAYOUT_UNSPECIFIED = 0 TEXT_BELOW = 1 TEXT_ABOVE = 2 @@ -2927,6 +2942,7 @@ class HorizontalSizeStyle(proto.Enum): possible and no more than 30% of the card's width. """ + HORIZONTAL_SIZE_STYLE_UNSPECIFIED = 0 FILL_AVAILABLE_SPACE = 1 FILL_MINIMUM_SPACE = 2 @@ -2949,6 +2965,7 @@ class VerticalAlignment(proto.Enum): BOTTOM (3): Aligns widgets to the bottom of a column. """ + VERTICAL_ALIGNMENT_UNSPECIFIED = 0 CENTER = 1 TOP = 2 @@ -3321,6 +3338,7 @@ class OpenAs(proto.Enum): The link opens as an overlay, such as a pop-up. """ + FULL_SIZE = 0 OVERLAY = 1 @@ -3350,6 +3368,7 @@ class OnClose(proto.Enum): the child window acts as a modal dialog and the parent card is blocked until the child window closes. """ + NOTHING = 0 RELOAD = 1 @@ -3464,6 +3483,7 @@ class LoadIndicator(proto.Enum): NONE (1): Nothing is displayed. """ + SPINNER = 0 NONE = 1 @@ -3504,6 +3524,7 @@ class Interaction(proto.Enum): `Google Chat apps `__: """ + INTERACTION_UNSPECIFIED = 0 OPEN_DIALOG = 1 @@ -3610,6 +3631,7 @@ class InputType(proto.Enum): A emoji selected from system-provided emoji picker. """ + INPUT_TYPE_UNSPECIFIED = 0 TEXT = 1 INTEGER = 2 @@ -3656,6 +3678,7 @@ class Layout(proto.Enum): The chips scroll horizontally if they don't fit in the available space. """ + LAYOUT_UNSPECIFIED = 0 WRAPPED = 1 HORIZONTAL_SCROLLABLE = 2 diff --git a/packages/google-apps-card/mypy.ini b/packages/google-apps-card/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-apps-card/mypy.ini +++ b/packages/google-apps-card/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-apps-card/noxfile.py b/packages/google-apps-card/noxfile.py index ef27bd4d0bc7..3af0c1f42160 100644 --- a/packages/google-apps-card/noxfile.py +++ b/packages/google-apps-card/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-apps-chat/google/apps/chat_v1/__init__.py b/packages/google-apps-chat/google/apps/chat_v1/__init__.py index ad1247a6c575..cd6270ac6cd6 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/__init__.py +++ b/packages/google-apps-chat/google/apps/chat_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.chat_service import ChatServiceAsyncClient, ChatServiceClient from .types.action_status import ActionStatus from .types.annotation import ( diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/async_client.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/async_client.py index 6c63e53782d4..b21c18cdcbe3 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/async_client.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.chat_v1 import gapic_version as package_version @@ -57,24 +57,26 @@ group, history_state, matched_url, + membership, + message, + reaction, + slash_command, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, + user, ) -from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, -) -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import slash_command -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state -from google.apps.chat_v1.types import space_setup, thread_read_state, user from .client import ChatServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ChatServiceTransport @@ -174,7 +176,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ChatServiceAsyncClient: The constructed client. """ - return ChatServiceClient.from_service_account_info.__func__(ChatServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ChatServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ChatServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -190,7 +195,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ChatServiceAsyncClient: The constructed client. """ - return ChatServiceClient.from_service_account_file.__func__(ChatServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ChatServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ChatServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/client.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/client.py index 6cc5c6933cc7..1bfbd8ea6255 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/client.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.chat_v1 import gapic_version as package_version @@ -74,24 +74,26 @@ group, history_state, matched_url, + membership, + message, + reaction, + slash_command, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, + user, ) -from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, -) -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import slash_command -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state -from google.apps.chat_v1.types import space_setup, thread_read_state, user from .transports.base import DEFAULT_CLIENT_INFO, ChatServiceTransport from .transports.grpc import ChatServiceGrpcTransport @@ -852,11 +854,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ChatServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ChatServiceClient._read_environment_variables() + ) self._client_cert_source = ChatServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -891,8 +891,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ChatServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/pagers.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/pagers.py index ab5e6af2e829..2fa61873496a 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/pagers.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/base.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/base.py index 04fca7f5b678..8cfaa0e3b91e 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/base.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/base.py @@ -17,33 +17,36 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.apps.chat_v1 import gapic_version as package_version from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, + attachment, + membership, + message, + reaction, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, ) -from google.apps.chat_v1.types import attachment -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state -from google.apps.chat_v1.types import space_setup, thread_read_state DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc.py index 15db4db6eaae..5b74e5c5050b 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc.py @@ -16,36 +16,39 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, + attachment, + membership, + message, + reaction, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, ) -from google.apps.chat_v1.types import attachment -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state -from google.apps.chat_v1.types import space_setup, thread_read_state from .base import DEFAULT_CLIENT_INFO, ChatServiceTransport @@ -2117,12 +2120,12 @@ def get_space_notification_setting( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_space_notification_setting" not in self._stubs: - self._stubs[ - "get_space_notification_setting" - ] = self._logged_channel.unary_unary( - "/google.chat.v1.ChatService/GetSpaceNotificationSetting", - request_serializer=space_notification_setting.GetSpaceNotificationSettingRequest.serialize, - response_deserializer=space_notification_setting.SpaceNotificationSetting.deserialize, + self._stubs["get_space_notification_setting"] = ( + self._logged_channel.unary_unary( + "/google.chat.v1.ChatService/GetSpaceNotificationSetting", + request_serializer=space_notification_setting.GetSpaceNotificationSettingRequest.serialize, + response_deserializer=space_notification_setting.SpaceNotificationSetting.deserialize, + ) ) return self._stubs["get_space_notification_setting"] @@ -2158,12 +2161,12 @@ def update_space_notification_setting( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_space_notification_setting" not in self._stubs: - self._stubs[ - "update_space_notification_setting" - ] = self._logged_channel.unary_unary( - "/google.chat.v1.ChatService/UpdateSpaceNotificationSetting", - request_serializer=gc_space_notification_setting.UpdateSpaceNotificationSettingRequest.serialize, - response_deserializer=gc_space_notification_setting.SpaceNotificationSetting.deserialize, + self._stubs["update_space_notification_setting"] = ( + self._logged_channel.unary_unary( + "/google.chat.v1.ChatService/UpdateSpaceNotificationSetting", + request_serializer=gc_space_notification_setting.UpdateSpaceNotificationSettingRequest.serialize, + response_deserializer=gc_space_notification_setting.SpaceNotificationSetting.deserialize, + ) ) return self._stubs["update_space_notification_setting"] diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc_asyncio.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc_asyncio.py index b93b4482bb8a..920864338584 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc_asyncio.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc_asyncio.py @@ -17,38 +17,41 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, + attachment, + membership, + message, + reaction, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, ) -from google.apps.chat_v1.types import attachment -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state -from google.apps.chat_v1.types import space_setup, thread_read_state from .base import DEFAULT_CLIENT_INFO, ChatServiceTransport from .grpc import ChatServiceGrpcTransport @@ -2152,12 +2155,12 @@ def get_space_notification_setting( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_space_notification_setting" not in self._stubs: - self._stubs[ - "get_space_notification_setting" - ] = self._logged_channel.unary_unary( - "/google.chat.v1.ChatService/GetSpaceNotificationSetting", - request_serializer=space_notification_setting.GetSpaceNotificationSettingRequest.serialize, - response_deserializer=space_notification_setting.SpaceNotificationSetting.deserialize, + self._stubs["get_space_notification_setting"] = ( + self._logged_channel.unary_unary( + "/google.chat.v1.ChatService/GetSpaceNotificationSetting", + request_serializer=space_notification_setting.GetSpaceNotificationSettingRequest.serialize, + response_deserializer=space_notification_setting.SpaceNotificationSetting.deserialize, + ) ) return self._stubs["get_space_notification_setting"] @@ -2193,12 +2196,12 @@ def update_space_notification_setting( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_space_notification_setting" not in self._stubs: - self._stubs[ - "update_space_notification_setting" - ] = self._logged_channel.unary_unary( - "/google.chat.v1.ChatService/UpdateSpaceNotificationSetting", - request_serializer=gc_space_notification_setting.UpdateSpaceNotificationSettingRequest.serialize, - response_deserializer=gc_space_notification_setting.SpaceNotificationSetting.deserialize, + self._stubs["update_space_notification_setting"] = ( + self._logged_channel.unary_unary( + "/google.chat.v1.ChatService/UpdateSpaceNotificationSetting", + request_serializer=gc_space_notification_setting.UpdateSpaceNotificationSettingRequest.serialize, + response_deserializer=gc_space_notification_setting.SpaceNotificationSetting.deserialize, + ) ) return self._stubs["update_space_notification_setting"] diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest.py index f3b74e8f0566..12860478aa6d 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest.py @@ -16,36 +16,39 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, + attachment, + membership, + message, + reaction, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, ) -from google.apps.chat_v1.types import attachment -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state -from google.apps.chat_v1.types import space_setup, thread_read_state from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseChatServiceRestTransport @@ -2027,9 +2030,7 @@ def __call__( """ - http_options = ( - _BaseChatServiceRestTransport._BaseCompleteImportSpace._get_http_options() - ) + http_options = _BaseChatServiceRestTransport._BaseCompleteImportSpace._get_http_options() request, metadata = self._interceptor.pre_complete_import_space( request, metadata @@ -4592,9 +4593,7 @@ def __call__( """ - http_options = ( - _BaseChatServiceRestTransport._BaseGetSpaceNotificationSetting._get_http_options() - ) + http_options = _BaseChatServiceRestTransport._BaseGetSpaceNotificationSetting._get_http_options() request, metadata = self._interceptor.pre_get_space_notification_setting( request, metadata @@ -4660,11 +4659,10 @@ def __call__( resp = self._interceptor.post_get_space_notification_setting(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_space_notification_setting_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_space_notification_setting_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4901,9 +4899,7 @@ def __call__( """ - http_options = ( - _BaseChatServiceRestTransport._BaseGetThreadReadState._get_http_options() - ) + http_options = _BaseChatServiceRestTransport._BaseGetThreadReadState._get_http_options() request, metadata = self._interceptor.pre_get_thread_read_state( request, metadata @@ -6738,9 +6734,7 @@ def __call__( """ - http_options = ( - _BaseChatServiceRestTransport._BaseUpdateSpaceNotificationSetting._get_http_options() - ) + http_options = _BaseChatServiceRestTransport._BaseUpdateSpaceNotificationSetting._get_http_options() request, metadata = self._interceptor.pre_update_space_notification_setting( request, metadata @@ -6811,11 +6805,10 @@ def __call__( resp = self._interceptor.post_update_space_notification_setting(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_space_notification_setting_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_space_notification_setting_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6903,9 +6896,7 @@ def __call__( """ - http_options = ( - _BaseChatServiceRestTransport._BaseUpdateSpaceReadState._get_http_options() - ) + http_options = _BaseChatServiceRestTransport._BaseUpdateSpaceReadState._get_http_options() request, metadata = self._interceptor.pre_update_space_read_state( request, metadata @@ -7303,7 +7294,9 @@ def get_space_notification_setting( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetSpaceNotificationSetting(self._session, self._host, self._interceptor) # type: ignore + return self._GetSpaceNotificationSetting( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_space_read_state( @@ -7424,7 +7417,9 @@ def update_space_notification_setting( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateSpaceNotificationSetting(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSpaceNotificationSetting( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_space_read_state( diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest_base.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest_base.py index 6de5c85f24bf..096dc810d09c 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest_base.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest_base.py @@ -17,27 +17,30 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, + attachment, + membership, + message, + reaction, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, ) -from google.apps.chat_v1.types import attachment -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state -from google.apps.chat_v1.types import space_setup, thread_read_state from .base import DEFAULT_CLIENT_INFO, ChatServiceTransport diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/__init__.py b/packages/google-apps-chat/google/apps/chat_v1/types/__init__.py index c9aa601a9f07..5d3e0c542903 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/__init__.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .action_status import ActionStatus +from .action_status import ( + ActionStatus, +) from .annotation import ( Annotation, AnnotationType, @@ -34,8 +36,12 @@ UploadAttachmentRequest, UploadAttachmentResponse, ) -from .contextual_addon import ContextualAddOnMarkup -from .deletion_metadata import DeletionMetadata +from .contextual_addon import ( + ContextualAddOnMarkup, +) +from .deletion_metadata import ( + DeletionMetadata, +) from .event_payload import ( MembershipBatchCreatedEventData, MembershipBatchDeletedEventData, @@ -56,9 +62,15 @@ SpaceBatchUpdatedEventData, SpaceUpdatedEventData, ) -from .group import Group -from .history_state import HistoryState -from .matched_url import MatchedUrl +from .group import ( + Group, +) +from .history_state import ( + HistoryState, +) +from .matched_url import ( + MatchedUrl, +) from .membership import ( CreateMembershipRequest, DeleteMembershipRequest, @@ -102,7 +114,9 @@ ListReactionsResponse, Reaction, ) -from .slash_command import SlashCommand +from .slash_command import ( + SlashCommand, +) from .space import ( CompleteImportSpaceRequest, CompleteImportSpaceResponse, @@ -133,10 +147,19 @@ SpaceReadState, UpdateSpaceReadStateRequest, ) -from .space_setup import SetUpSpaceRequest -from .thread_read_state import GetThreadReadStateRequest, ThreadReadState -from .user import User -from .widgets import WidgetMarkup +from .space_setup import ( + SetUpSpaceRequest, +) +from .thread_read_state import ( + GetThreadReadStateRequest, + ThreadReadState, +) +from .user import ( + User, +) +from .widgets import ( + WidgetMarkup, +) __all__ = ( "ActionStatus", diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/annotation.py b/packages/google-apps-chat/google/apps/chat_v1/types/annotation.py index bdbe3ea2d6f9..43122b2cbd03 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/annotation.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/annotation.py @@ -54,6 +54,7 @@ class AnnotationType(proto.Enum): CUSTOM_EMOJI (4): A custom emoji annotation. """ + ANNOTATION_TYPE_UNSPECIFIED = 0 USER_MENTION = 1 SLASH_COMMAND = 2 @@ -192,6 +193,7 @@ class Type(proto.Enum): MENTION (2): Mention user in space. """ + TYPE_UNSPECIFIED = 0 ADD = 1 MENTION = 2 @@ -236,6 +238,7 @@ class Type(proto.Enum): INVOKE (2): Invoke slash command in space. """ + TYPE_UNSPECIFIED = 0 ADD = 1 INVOKE = 2 @@ -324,6 +327,7 @@ class RichLinkType(proto.Enum): A Calendar message rich link type. For example, a Calendar chip. """ + RICH_LINK_TYPE_UNSPECIFIED = 0 DRIVE_FILE = 1 CHAT_SPACE = 2 @@ -462,6 +466,7 @@ class Type(proto.Enum): HUDDLE (2): The Meet space is a huddle. """ + TYPE_UNSPECIFIED = 0 MEETING = 1 HUDDLE = 2 @@ -483,6 +488,7 @@ class HuddleStatus(proto.Enum): Meet space URI and identifiers will no longer be valid. """ + HUDDLE_STATUS_UNSPECIFIED = 0 STARTED = 1 ENDED = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/attachment.py b/packages/google-apps-chat/google/apps/chat_v1/types/attachment.py index e412a68b54ad..8bc734843cfe 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/attachment.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/attachment.py @@ -92,6 +92,7 @@ class Source(proto.Enum): UPLOADED_CONTENT (2): The file is uploaded to Chat. """ + SOURCE_UNSPECIFIED = 0 DRIVE_FILE = 1 UPLOADED_CONTENT = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/contextual_addon.py b/packages/google-apps-chat/google/apps/chat_v1/types/contextual_addon.py index f5a89b77f5bc..559cfc028137 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/contextual_addon.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/contextual_addon.py @@ -80,6 +80,7 @@ class ImageStyle(proto.Enum): AVATAR (2): Circular border. """ + IMAGE_STYLE_UNSPECIFIED = 0 IMAGE = 1 AVATAR = 2 @@ -164,19 +165,19 @@ class CardAction(proto.Message): number=1, message="ContextualAddOnMarkup.Card.CardHeader", ) - sections: MutableSequence[ - "ContextualAddOnMarkup.Card.Section" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ContextualAddOnMarkup.Card.Section", + sections: MutableSequence["ContextualAddOnMarkup.Card.Section"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ContextualAddOnMarkup.Card.Section", + ) ) - card_actions: MutableSequence[ - "ContextualAddOnMarkup.Card.CardAction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="ContextualAddOnMarkup.Card.CardAction", + card_actions: MutableSequence["ContextualAddOnMarkup.Card.CardAction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="ContextualAddOnMarkup.Card.CardAction", + ) ) name: str = proto.Field( proto.STRING, diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/deletion_metadata.py b/packages/google-apps-chat/google/apps/chat_v1/types/deletion_metadata.py index 6603304076c4..f64ee5c0288d 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/deletion_metadata.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/deletion_metadata.py @@ -67,6 +67,7 @@ class DeletionType(proto.Enum): A member of the space deleted the message. Users can delete messages sent by apps. """ + DELETION_TYPE_UNSPECIFIED = 0 CREATOR = 1 SPACE_OWNER = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/history_state.py b/packages/google-apps-chat/google/apps/chat_v1/types/history_state.py index bf707dfef069..27c6e067cad7 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/history_state.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/history_state.py @@ -42,6 +42,7 @@ class HistoryState(proto.Enum): rules `__ specify for how long messages and threads are kept. """ + HISTORY_STATE_UNSPECIFIED = 0 HISTORY_OFF = 1 HISTORY_ON = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/membership.py b/packages/google-apps-chat/google/apps/chat_v1/types/membership.py index ffc38dc10f2a..2803d5c5e32d 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/membership.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/membership.py @@ -112,6 +112,7 @@ class MembershipState(proto.Enum): doesn't have a pending invitation to join the space. """ + MEMBERSHIP_STATE_UNSPECIFIED = 0 JOINED = 1 INVITED = 2 @@ -193,6 +194,7 @@ class MembershipRole(proto.Enum): To learn more, see `Manage space settings `__. """ + MEMBERSHIP_ROLE_UNSPECIFIED = 0 ROLE_MEMBER = 1 ROLE_MANAGER = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/message.py b/packages/google-apps-chat/google/apps/chat_v1/types/message.py index c1ab90451161..62d1982e4823 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/message.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/message.py @@ -17,21 +17,18 @@ from typing import MutableMapping, MutableSequence -from google.apps.card_v1.types import card as gac_card 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 google.apps.card_v1.types import card as gac_card from google.apps.chat_v1.types import action_status as gc_action_status -from google.apps.chat_v1.types import annotation +from google.apps.chat_v1.types import annotation, contextual_addon, reaction, user from google.apps.chat_v1.types import attachment as gc_attachment -from google.apps.chat_v1.types import contextual_addon from google.apps.chat_v1.types import deletion_metadata as gc_deletion_metadata from google.apps.chat_v1.types import matched_url as gc_matched_url -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import slash_command as gc_slash_command from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import user __protobuf__ = proto.module( package="google.chat.v1", @@ -296,12 +293,12 @@ class Message(proto.Message): proto.STRING, number=43, ) - cards: MutableSequence[ - contextual_addon.ContextualAddOnMarkup.Card - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=contextual_addon.ContextualAddOnMarkup.Card, + cards: MutableSequence[contextual_addon.ContextualAddOnMarkup.Card] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=contextual_addon.ContextualAddOnMarkup.Card, + ) ) cards_v2: MutableSequence["CardWithId"] = proto.RepeatedField( proto.MESSAGE, @@ -359,12 +356,12 @@ class Message(proto.Message): proto.STRING, number=32, ) - emoji_reaction_summaries: MutableSequence[ - reaction.EmojiReactionSummary - ] = proto.RepeatedField( - proto.MESSAGE, - number=33, - message=reaction.EmojiReactionSummary, + emoji_reaction_summaries: MutableSequence[reaction.EmojiReactionSummary] = ( + proto.RepeatedField( + proto.MESSAGE, + number=33, + message=reaction.EmojiReactionSummary, + ) ) private_message_viewer: user.User = proto.Field( proto.MESSAGE, @@ -466,6 +463,7 @@ class QuoteType(proto.Enum): You can't quote a message reply from a different thread. """ + QUOTE_TYPE_UNSPECIFIED = 0 REPLY = 1 @@ -655,6 +653,7 @@ class ResponseType(proto.Enum): UPDATE_WIDGET (7): Widget text autocomplete options query. """ + TYPE_UNSPECIFIED = 0 NEW_MESSAGE = 1 UPDATE_MESSAGE = 2 @@ -671,12 +670,12 @@ class SelectionItems(proto.Message): An array of the SelectionItem objects. """ - items: MutableSequence[ - gac_card.SelectionInput.SelectionItem - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gac_card.SelectionInput.SelectionItem, + items: MutableSequence[gac_card.SelectionInput.SelectionItem] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gac_card.SelectionInput.SelectionItem, + ) ) class UpdatedWidget(proto.Message): @@ -937,6 +936,7 @@ class MessageReplyOption(proto.Enum): message creation fails, a ``NOT_FOUND`` error is returned instead. """ + MESSAGE_REPLY_OPTION_UNSPECIFIED = 0 REPLY_MESSAGE_FALLBACK_TO_NEW_THREAD = 1 REPLY_MESSAGE_OR_FAIL = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/space.py b/packages/google-apps-chat/google/apps/chat_v1/types/space.py index a8ba58ae3f9b..97b540196a84 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/space.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/space.py @@ -236,6 +236,7 @@ class Type(proto.Enum): doesn't include direct messages between two humans. """ + TYPE_UNSPECIFIED = 0 ROOM = 1 DM = 2 @@ -257,6 +258,7 @@ class SpaceType(proto.Enum): 1:1 messages between two humans or a human and a Chat app. """ + SPACE_TYPE_UNSPECIFIED = 0 SPACE = 1 GROUP_CHAT = 2 @@ -281,6 +283,7 @@ class SpaceThreadingState(proto.Enum): Direct messages (DMs) between two people and group conversations between 3 or more people. """ + SPACE_THREADING_STATE_UNSPECIFIED = 0 THREADED_MESSAGES = 2 GROUPED_MESSAGES = 3 @@ -303,6 +306,7 @@ class PredefinedPermissionSettings(proto.Enum): space where only space managers can post messages. """ + PREDEFINED_PERMISSION_SETTINGS_UNSPECIFIED = 0 COLLABORATION_SPACE = 1 ANNOUNCEMENT_SPACE = 2 @@ -421,6 +425,7 @@ class AccessState(proto.Enum): Creating discoverable spaces requires `user authentication `__. """ + ACCESS_STATE_UNSPECIFIED = 0 PRIVATE = 1 DISCOVERABLE = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/space_notification_setting.py b/packages/google-apps-chat/google/apps/chat_v1/types/space_notification_setting.py index 69a7d8e640ef..be5027ddfb54 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/space_notification_setting.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/space_notification_setting.py @@ -73,6 +73,7 @@ class NotificationSetting(proto.Enum): OFF (4): Notification is off. """ + NOTIFICATION_SETTING_UNSPECIFIED = 0 ALL = 1 MAIN_CONVERSATIONS = 2 @@ -93,6 +94,7 @@ class MuteSetting(proto.Enum): for the space, regardless of the notification setting. """ + MUTE_SETTING_UNSPECIFIED = 0 UNMUTED = 1 MUTED = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/user.py b/packages/google-apps-chat/google/apps/chat_v1/types/user.py index 5cc0a8e5bb96..eb0d8a3e3b56 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/user.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/user.py @@ -85,6 +85,7 @@ class Type(proto.Enum): BOT (2): Chat app user. """ + TYPE_UNSPECIFIED = 0 HUMAN = 1 BOT = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/widgets.py b/packages/google-apps-chat/google/apps/chat_v1/types/widgets.py index f73fa43efc6e..8460571e6c96 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/widgets.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/widgets.py @@ -122,6 +122,7 @@ class Icon(proto.Enum): VIDEO_PLAY (29): No description available. """ + ICON_UNSPECIFIED = 0 AIRPLANE = 1 BOOKMARK = 26 @@ -493,12 +494,12 @@ class ActionParameter(proto.Message): proto.STRING, number=1, ) - parameters: MutableSequence[ - "WidgetMarkup.FormAction.ActionParameter" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="WidgetMarkup.FormAction.ActionParameter", + parameters: MutableSequence["WidgetMarkup.FormAction.ActionParameter"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="WidgetMarkup.FormAction.ActionParameter", + ) ) text_paragraph: TextParagraph = proto.Field( diff --git a/packages/google-apps-chat/mypy.ini b/packages/google-apps-chat/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-apps-chat/mypy.ini +++ b/packages/google-apps-chat/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-apps-chat/noxfile.py b/packages/google-apps-chat/noxfile.py index a237afad67d3..1d1acec6715b 100644 --- a/packages/google-apps-chat/noxfile.py +++ b/packages/google-apps-chat/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-apps-chat/tests/unit/gapic/chat_v1/test_chat_service.py b/packages/google-apps-chat/tests/unit/gapic/chat_v1/test_chat_service.py index e62af2c951a9..95c5c80c37ee 100644 --- a/packages/google-apps-chat/tests/unit/gapic/chat_v1/test_chat_service.py +++ b/packages/google-apps-chat/tests/unit/gapic/chat_v1/test_chat_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,20 +43,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries -from google.apps.card_v1.types import card import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import google.rpc.code_pb2 as code_pb2 # type: ignore import google.type.color_pb2 as color_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.apps.card_v1.types import card +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.apps.chat_v1.services.chat_service import ( ChatServiceAsyncClient, @@ -74,23 +79,26 @@ group, history_state, matched_url, + membership, + message, + reaction, + slash_command, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, + user, + widgets, ) -from google.apps.chat_v1.types import space_setup, thread_read_state, user, widgets -from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, -) -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import slash_command -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state CRED_INFO_JSON = { @@ -955,10 +963,9 @@ def test_chat_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1010,9 @@ def test_chat_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1048,9 @@ def test_chat_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1278,9 +1283,7 @@ def test_chat_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2314,9 +2317,9 @@ def test_list_memberships_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_memberships - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_memberships] = ( + mock_rpc + ) request = {} client.list_memberships(request) @@ -4513,9 +4516,9 @@ def test_upload_attachment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.upload_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.upload_attachment] = ( + mock_rpc + ) request = {} client.upload_attachment(request) @@ -7128,9 +7131,9 @@ def test_complete_import_space_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_import_space - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_import_space] = ( + mock_rpc + ) request = {} client.complete_import_space(request) @@ -7408,9 +7411,9 @@ def test_find_direct_message_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.find_direct_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.find_direct_message] = ( + mock_rpc + ) request = {} client.find_direct_message(request) @@ -7627,9 +7630,9 @@ def test_create_membership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_membership] = ( + mock_rpc + ) request = {} client.create_membership(request) @@ -7980,9 +7983,9 @@ def test_update_membership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_membership] = ( + mock_rpc + ) request = {} client.update_membership(request) @@ -8337,9 +8340,9 @@ def test_delete_membership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_membership] = ( + mock_rpc + ) request = {} client.delete_membership(request) @@ -9849,9 +9852,9 @@ def test_create_custom_emoji_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_custom_emoji - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_custom_emoji] = ( + mock_rpc + ) request = {} client.create_custom_emoji(request) @@ -10131,9 +10134,9 @@ def test_get_custom_emoji_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_emoji - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_emoji] = ( + mock_rpc + ) request = {} client.get_custom_emoji(request) @@ -10470,9 +10473,9 @@ def test_list_custom_emojis_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_emojis - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_emojis] = ( + mock_rpc + ) request = {} client.list_custom_emojis(request) @@ -10856,9 +10859,9 @@ def test_delete_custom_emoji_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_custom_emoji - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_custom_emoji] = ( + mock_rpc + ) request = {} client.delete_custom_emoji(request) @@ -11188,9 +11191,9 @@ def test_get_space_read_state_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_space_read_state - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_space_read_state] = ( + mock_rpc + ) request = {} client.get_space_read_state(request) @@ -11880,9 +11883,9 @@ def test_get_thread_read_state_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_thread_read_state - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_thread_read_state] = ( + mock_rpc + ) request = {} client.get_thread_read_state(request) @@ -12551,9 +12554,9 @@ def test_list_space_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_space_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_space_events] = ( + mock_rpc + ) request = {} client.list_space_events(request) @@ -14242,9 +14245,9 @@ def test_list_memberships_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_memberships - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_memberships] = ( + mock_rpc + ) request = {} client.list_memberships(request) @@ -15400,9 +15403,9 @@ def test_upload_attachment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.upload_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.upload_attachment] = ( + mock_rpc + ) request = {} client.upload_attachment(request) @@ -16667,9 +16670,9 @@ def test_complete_import_space_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_import_space - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_import_space] = ( + mock_rpc + ) request = {} client.complete_import_space(request) @@ -16792,9 +16795,9 @@ def test_find_direct_message_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.find_direct_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.find_direct_message] = ( + mock_rpc + ) request = {} client.find_direct_message(request) @@ -16925,9 +16928,9 @@ def test_create_membership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_membership] = ( + mock_rpc + ) request = {} client.create_membership(request) @@ -17116,9 +17119,9 @@ def test_update_membership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_membership] = ( + mock_rpc + ) request = {} client.update_membership(request) @@ -17313,9 +17316,9 @@ def test_delete_membership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_membership] = ( + mock_rpc + ) request = {} client.delete_membership(request) @@ -18110,9 +18113,9 @@ def test_create_custom_emoji_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_custom_emoji - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_custom_emoji] = ( + mock_rpc + ) request = {} client.create_custom_emoji(request) @@ -18284,9 +18287,9 @@ def test_get_custom_emoji_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_emoji - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_emoji] = ( + mock_rpc + ) request = {} client.get_custom_emoji(request) @@ -18464,9 +18467,9 @@ def test_list_custom_emojis_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_emojis - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_emojis] = ( + mock_rpc + ) request = {} client.list_custom_emojis(request) @@ -18565,9 +18568,9 @@ def test_delete_custom_emoji_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_custom_emoji - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_custom_emoji] = ( + mock_rpc + ) request = {} client.delete_custom_emoji(request) @@ -18740,9 +18743,9 @@ def test_get_space_read_state_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_space_read_state - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_space_read_state] = ( + mock_rpc + ) request = {} client.get_space_read_state(request) @@ -19115,9 +19118,9 @@ def test_get_thread_read_state_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_thread_read_state - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_thread_read_state] = ( + mock_rpc + ) request = {} client.get_thread_read_state(request) @@ -19473,9 +19476,9 @@ def test_list_space_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_space_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_space_events] = ( + mock_rpc + ) request = {} client.list_space_events(request) diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/__init__.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/__init__.py index e01c4b385ea4..a4efa0e0ad9f 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/__init__.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.subscriptions_service import ( SubscriptionsServiceAsyncClient, SubscriptionsServiceClient, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/async_client.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/async_client.py index 1db5a69177a7..a62289ae9b2f 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/async_client.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.events_subscriptions_v1 import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.longrunning import operations_pb2 # type: ignore from google.apps.events_subscriptions_v1.services.subscriptions_service import pagers from google.apps.events_subscriptions_v1.types import ( @@ -132,7 +132,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SubscriptionsServiceAsyncClient: The constructed client. """ - return SubscriptionsServiceClient.from_service_account_info.__func__(SubscriptionsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SubscriptionsServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SubscriptionsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +151,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SubscriptionsServiceAsyncClient: The constructed client. """ - return SubscriptionsServiceClient.from_service_account_file.__func__(SubscriptionsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SubscriptionsServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SubscriptionsServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -186,7 +192,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SubscriptionsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SubscriptionsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SubscriptionsServiceTransport: diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/client.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/client.py index 105807ddefdb..e275254e3ec8 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/client.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.events_subscriptions_v1 import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.longrunning import operations_pb2 # type: ignore from google.apps.events_subscriptions_v1.services.subscriptions_service import pagers from google.apps.events_subscriptions_v1.types import ( @@ -89,9 +89,7 @@ class SubscriptionsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SubscriptionsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SubscriptionsServiceTransport]] _transport_registry["grpc"] = SubscriptionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SubscriptionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SubscriptionsServiceRestTransport @@ -662,11 +660,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SubscriptionsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SubscriptionsServiceClient._read_environment_variables() + ) self._client_cert_source = SubscriptionsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -701,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SubscriptionsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/pagers.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/pagers.py index 313749a191f1..44e003b7f689 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/pagers.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/__init__.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/__init__.py index 9bb0413d8e7a..9e94d24ae563 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/__init__.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SubscriptionsServiceRestInterceptor, SubscriptionsServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SubscriptionsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SubscriptionsServiceTransport]] _transport_registry["grpc"] = SubscriptionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SubscriptionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SubscriptionsServiceRestTransport diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/base.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/base.py index cea83063948e..87e36dd552ba 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/base.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.events_subscriptions_v1 import gapic_version as package_version from google.apps.events_subscriptions_v1.types import ( diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc.py index a37a3730cc32..39fd42071c2d 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.apps.events_subscriptions_v1.types import ( subscription_resource, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc_asyncio.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc_asyncio.py index bef661160025..0ce652006f7b 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc_asyncio.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.apps.events_subscriptions_v1.types import ( subscription_resource, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/rest.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/rest.py index a52ee1c5a38d..65032f193995 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/rest.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -638,9 +638,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseCreateSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseCreateSubscription._get_http_options() request, metadata = self._interceptor.pre_create_subscription( request, metadata @@ -794,9 +792,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseDeleteSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseDeleteSubscription._get_http_options() request, metadata = self._interceptor.pre_delete_subscription( request, metadata @@ -946,9 +942,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseGetSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseGetSubscription._get_http_options() request, metadata = self._interceptor.pre_get_subscription( request, metadata @@ -1098,9 +1092,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseListSubscriptions._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseListSubscriptions._get_http_options() request, metadata = self._interceptor.pre_list_subscriptions( request, metadata @@ -1256,9 +1248,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseReactivateSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseReactivateSubscription._get_http_options() request, metadata = self._interceptor.pre_reactivate_subscription( request, metadata @@ -1413,9 +1403,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseUpdateSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseUpdateSubscription._get_http_options() request, metadata = self._interceptor.pre_update_subscription( request, metadata @@ -1560,7 +1548,9 @@ def reactivate_subscription( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ReactivateSubscription(self._session, self._host, self._interceptor) # type: ignore + return self._ReactivateSubscription( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_subscription( @@ -1630,9 +1620,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSubscriptionsServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/__init__.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/__init__.py index 44deb4175f8c..632c208c1268 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/__init__.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/__init__.py @@ -13,7 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .subscription_resource import NotificationEndpoint, PayloadOptions, Subscription +from .subscription_resource import ( + NotificationEndpoint, + PayloadOptions, + Subscription, +) from .subscriptions_service import ( CreateSubscriptionMetadata, CreateSubscriptionRequest, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscription_resource.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscription_resource.py index d39f70f2e2fc..e2566a75df04 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscription_resource.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscription_resource.py @@ -160,6 +160,7 @@ class State(proto.Enum): DELETED (3): The subscription is deleted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -199,6 +200,7 @@ class ErrorType(proto.Enum): OTHER (5): An unidentified error has occurred. """ + ERROR_TYPE_UNSPECIFIED = 0 USER_SCOPE_REVOKED = 1 RESOURCE_DELETED = 2 diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscriptions_service.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscriptions_service.py index 347df5963f98..1e0a01ddf969 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscriptions_service.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscriptions_service.py @@ -265,12 +265,12 @@ class ListSubscriptionsResponse(proto.Message): def raw_page(self): return self - subscriptions: MutableSequence[ - subscription_resource.Subscription - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=subscription_resource.Subscription, + subscriptions: MutableSequence[subscription_resource.Subscription] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=subscription_resource.Subscription, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/__init__.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/__init__.py index 6c5a8fa412d4..6eddc19d87a0 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/__init__.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.subscriptions_service import ( SubscriptionsServiceAsyncClient, SubscriptionsServiceClient, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/async_client.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/async_client.py index 5348e0a098c7..7d44a9c9b117 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/async_client.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.events_subscriptions_v1beta import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.longrunning import operations_pb2 # type: ignore from google.apps.events_subscriptions_v1beta.services.subscriptions_service import ( pagers, @@ -134,7 +134,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SubscriptionsServiceAsyncClient: The constructed client. """ - return SubscriptionsServiceClient.from_service_account_info.__func__(SubscriptionsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SubscriptionsServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SubscriptionsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -150,7 +153,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SubscriptionsServiceAsyncClient: The constructed client. """ - return SubscriptionsServiceClient.from_service_account_file.__func__(SubscriptionsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SubscriptionsServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SubscriptionsServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -188,7 +194,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SubscriptionsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SubscriptionsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SubscriptionsServiceTransport: diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/client.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/client.py index 8dfb830898c1..371973e741a8 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/client.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.events_subscriptions_v1beta import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.longrunning import operations_pb2 # type: ignore from google.apps.events_subscriptions_v1beta.services.subscriptions_service import ( pagers, @@ -91,9 +91,7 @@ class SubscriptionsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SubscriptionsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SubscriptionsServiceTransport]] _transport_registry["grpc"] = SubscriptionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SubscriptionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SubscriptionsServiceRestTransport @@ -664,11 +662,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SubscriptionsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SubscriptionsServiceClient._read_environment_variables() + ) self._client_cert_source = SubscriptionsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -703,8 +699,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SubscriptionsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/pagers.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/pagers.py index b961b6a6b358..a40bee07ddc2 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/pagers.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/__init__.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/__init__.py index 9bb0413d8e7a..9e94d24ae563 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/__init__.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SubscriptionsServiceRestInterceptor, SubscriptionsServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SubscriptionsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SubscriptionsServiceTransport]] _transport_registry["grpc"] = SubscriptionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SubscriptionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SubscriptionsServiceRestTransport diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/base.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/base.py index f65b7a4246c4..c3c9e1156820 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/base.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.events_subscriptions_v1beta import gapic_version as package_version from google.apps.events_subscriptions_v1beta.types import ( diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc.py index 7f3f96e5f648..d2f551a2601d 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.apps.events_subscriptions_v1beta.types import ( subscription_resource, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc_asyncio.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc_asyncio.py index daf393c60460..3d76f5a03e84 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc_asyncio.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.apps.events_subscriptions_v1beta.types import ( subscription_resource, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/rest.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/rest.py index 403ed2b5c672..00d3d950633a 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/rest.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -638,9 +638,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseCreateSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseCreateSubscription._get_http_options() request, metadata = self._interceptor.pre_create_subscription( request, metadata @@ -794,9 +792,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseDeleteSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseDeleteSubscription._get_http_options() request, metadata = self._interceptor.pre_delete_subscription( request, metadata @@ -946,9 +942,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseGetSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseGetSubscription._get_http_options() request, metadata = self._interceptor.pre_get_subscription( request, metadata @@ -1098,9 +1092,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseListSubscriptions._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseListSubscriptions._get_http_options() request, metadata = self._interceptor.pre_list_subscriptions( request, metadata @@ -1256,9 +1248,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseReactivateSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseReactivateSubscription._get_http_options() request, metadata = self._interceptor.pre_reactivate_subscription( request, metadata @@ -1413,9 +1403,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseUpdateSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseUpdateSubscription._get_http_options() request, metadata = self._interceptor.pre_update_subscription( request, metadata @@ -1560,7 +1548,9 @@ def reactivate_subscription( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ReactivateSubscription(self._session, self._host, self._interceptor) # type: ignore + return self._ReactivateSubscription( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_subscription( @@ -1630,9 +1620,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSubscriptionsServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/__init__.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/__init__.py index 44deb4175f8c..632c208c1268 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/__init__.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/__init__.py @@ -13,7 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .subscription_resource import NotificationEndpoint, PayloadOptions, Subscription +from .subscription_resource import ( + NotificationEndpoint, + PayloadOptions, + Subscription, +) from .subscriptions_service import ( CreateSubscriptionMetadata, CreateSubscriptionRequest, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscription_resource.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscription_resource.py index c660c9380000..d2b2d0845b32 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscription_resource.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscription_resource.py @@ -164,6 +164,7 @@ class State(proto.Enum): DELETED (3): The subscription is deleted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -203,6 +204,7 @@ class ErrorType(proto.Enum): OTHER (5): An unidentified error has occurred. """ + ERROR_TYPE_UNSPECIFIED = 0 USER_SCOPE_REVOKED = 1 RESOURCE_DELETED = 2 diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscriptions_service.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscriptions_service.py index c8c57f30431a..a4164d19f9d8 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscriptions_service.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscriptions_service.py @@ -273,12 +273,12 @@ class ListSubscriptionsResponse(proto.Message): def raw_page(self): return self - subscriptions: MutableSequence[ - subscription_resource.Subscription - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=subscription_resource.Subscription, + subscriptions: MutableSequence[subscription_resource.Subscription] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=subscription_resource.Subscription, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-apps-events-subscriptions/mypy.ini b/packages/google-apps-events-subscriptions/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-apps-events-subscriptions/mypy.ini +++ b/packages/google-apps-events-subscriptions/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-apps-events-subscriptions/noxfile.py b/packages/google-apps-events-subscriptions/noxfile.py index 2c6b5fa3dede..08db113075f3 100644 --- a/packages/google-apps-events-subscriptions/noxfile.py +++ b/packages/google-apps-events-subscriptions/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1/test_subscriptions_service.py b/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1/test_subscriptions_service.py index 7ebad3e5c617..07c5a86a3bfe 100644 --- a/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1/test_subscriptions_service.py +++ b/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1/test_subscriptions_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.apps.events_subscriptions_v1.services.subscriptions_service import ( SubscriptionsServiceAsyncClient, @@ -1009,10 +1009,9 @@ def test_subscriptions_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1056,9 @@ def test_subscriptions_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1096,10 +1094,9 @@ def test_subscriptions_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1359,9 +1356,7 @@ def test_subscriptions_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1478,9 +1473,9 @@ def test_create_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_subscription] = ( + mock_rpc + ) request = {} client.create_subscription(request) @@ -1773,9 +1768,9 @@ def test_delete_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_subscription] = ( + mock_rpc + ) request = {} client.delete_subscription(request) @@ -2135,9 +2130,9 @@ def test_get_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_subscription] = ( + mock_rpc + ) request = {} client.get_subscription(request) @@ -2488,9 +2483,9 @@ def test_list_subscriptions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_subscriptions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_subscriptions] = ( + mock_rpc + ) request = {} client.list_subscriptions(request) @@ -2957,9 +2952,9 @@ def test_update_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_subscription] = ( + mock_rpc + ) request = {} client.update_subscription(request) @@ -3607,9 +3602,9 @@ def test_create_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_subscription] = ( + mock_rpc + ) request = {} client.create_subscription(request) @@ -3788,9 +3783,9 @@ def test_delete_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_subscription] = ( + mock_rpc + ) request = {} client.delete_subscription(request) @@ -3982,9 +3977,9 @@ def test_get_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_subscription] = ( + mock_rpc + ) request = {} client.get_subscription(request) @@ -4162,9 +4157,9 @@ def test_list_subscriptions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_subscriptions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_subscriptions] = ( + mock_rpc + ) request = {} client.list_subscriptions(request) @@ -4433,9 +4428,9 @@ def test_update_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_subscription] = ( + mock_rpc + ) request = {} client.update_subscription(request) diff --git a/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1beta/test_subscriptions_service.py b/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1beta/test_subscriptions_service.py index 33ff167f326e..acd262e8dac7 100644 --- a/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1beta/test_subscriptions_service.py +++ b/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1beta/test_subscriptions_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.apps.events_subscriptions_v1beta.services.subscriptions_service import ( SubscriptionsServiceAsyncClient, @@ -1009,10 +1009,9 @@ def test_subscriptions_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1056,9 @@ def test_subscriptions_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1096,10 +1094,9 @@ def test_subscriptions_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1359,9 +1356,7 @@ def test_subscriptions_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1483,9 +1478,9 @@ def test_create_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_subscription] = ( + mock_rpc + ) request = {} client.create_subscription(request) @@ -1790,9 +1785,9 @@ def test_delete_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_subscription] = ( + mock_rpc + ) request = {} client.delete_subscription(request) @@ -2152,9 +2147,9 @@ def test_get_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_subscription] = ( + mock_rpc + ) request = {} client.get_subscription(request) @@ -2505,9 +2500,9 @@ def test_list_subscriptions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_subscriptions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_subscriptions] = ( + mock_rpc + ) request = {} client.list_subscriptions(request) @@ -2974,9 +2969,9 @@ def test_update_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_subscription] = ( + mock_rpc + ) request = {} client.update_subscription(request) @@ -3636,9 +3631,9 @@ def test_create_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_subscription] = ( + mock_rpc + ) request = {} client.create_subscription(request) @@ -3821,9 +3816,9 @@ def test_delete_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_subscription] = ( + mock_rpc + ) request = {} client.delete_subscription(request) @@ -4015,9 +4010,9 @@ def test_get_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_subscription] = ( + mock_rpc + ) request = {} client.get_subscription(request) @@ -4195,9 +4190,9 @@ def test_list_subscriptions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_subscriptions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_subscriptions] = ( + mock_rpc + ) request = {} client.list_subscriptions(request) @@ -4466,9 +4461,9 @@ def test_update_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_subscription] = ( + mock_rpc + ) request = {} client.update_subscription(request) diff --git a/packages/google-apps-meet/google/apps/meet_v2/__init__.py b/packages/google-apps-meet/google/apps/meet_v2/__init__.py index 91cb681c80ee..caa399bf9ecc 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/__init__.py +++ b/packages/google-apps-meet/google/apps/meet_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.conference_records_service import ( ConferenceRecordsServiceAsyncClient, ConferenceRecordsServiceClient, diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/async_client.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/async_client.py index a3f13a1fe606..6ced5e69c195 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/async_client.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2 import gapic_version as package_version @@ -151,7 +151,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConferenceRecordsServiceAsyncClient: The constructed client. """ - return ConferenceRecordsServiceClient.from_service_account_info.__func__(ConferenceRecordsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConferenceRecordsServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConferenceRecordsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -167,7 +170,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConferenceRecordsServiceAsyncClient: The constructed client. """ - return ConferenceRecordsServiceClient.from_service_account_file.__func__(ConferenceRecordsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConferenceRecordsServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + ConferenceRecordsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -205,7 +213,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConferenceRecordsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConferenceRecordsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConferenceRecordsServiceTransport: diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/client.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/client.py index c4e0342e7743..b19c9c54cc1e 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/client.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2 import gapic_version as package_version @@ -80,9 +80,7 @@ class ConferenceRecordsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConferenceRecordsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConferenceRecordsServiceTransport]] _transport_registry["grpc"] = ConferenceRecordsServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConferenceRecordsServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConferenceRecordsServiceRestTransport @@ -742,11 +740,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConferenceRecordsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConferenceRecordsServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConferenceRecordsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -783,8 +779,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConferenceRecordsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/pagers.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/pagers.py index c94defa50854..bf69c806c497 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/pagers.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/__init__.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/__init__.py index 6c3d88f8cf95..332bd007118b 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/__init__.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConferenceRecordsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConferenceRecordsServiceTransport]] _transport_registry["grpc"] = ConferenceRecordsServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConferenceRecordsServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConferenceRecordsServiceRestTransport diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/base.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/base.py index 7bf39dcc76cb..aa002a3134d0 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/base.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2 import gapic_version as package_version from google.apps.meet_v2.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc.py index 4c6aa8625f22..231ad3e69673 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.apps.meet_v2.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc_asyncio.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc_asyncio.py index f50d12da7315..d6e2980fa0b5 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc_asyncio.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.apps.meet_v2.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/rest.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/rest.py index 814c378e728f..57908da6b142 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/rest.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -891,9 +891,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetConferenceRecord._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetConferenceRecord._get_http_options() request, metadata = self._interceptor.pre_get_conference_record( request, metadata @@ -1040,9 +1038,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetParticipant._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetParticipant._get_http_options() request, metadata = self._interceptor.pre_get_participant(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseGetParticipant._get_transcoded_request( @@ -1196,9 +1192,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetParticipantSession._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetParticipantSession._get_http_options() request, metadata = self._interceptor.pre_get_participant_session( request, metadata @@ -1346,9 +1340,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetRecording._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetRecording._get_http_options() request, metadata = self._interceptor.pre_get_recording(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseGetRecording._get_transcoded_request( @@ -1497,9 +1489,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetTranscript._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetTranscript._get_http_options() request, metadata = self._interceptor.pre_get_transcript(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseGetTranscript._get_transcoded_request( @@ -1647,9 +1637,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetTranscriptEntry._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetTranscriptEntry._get_http_options() request, metadata = self._interceptor.pre_get_transcript_entry( request, metadata @@ -1799,9 +1787,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListConferenceRecords._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListConferenceRecords._get_http_options() request, metadata = self._interceptor.pre_list_conference_records( request, metadata @@ -1949,9 +1935,7 @@ def __call__( Response of ListParticipants method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListParticipants._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListParticipants._get_http_options() request, metadata = self._interceptor.pre_list_participants( request, metadata @@ -2102,9 +2086,7 @@ def __call__( Response of ListParticipants method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListParticipantSessions._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListParticipantSessions._get_http_options() request, metadata = self._interceptor.pre_list_participant_sessions( request, metadata @@ -2251,9 +2233,7 @@ def __call__( Response for ListRecordings method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListRecordings._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListRecordings._get_http_options() request, metadata = self._interceptor.pre_list_recordings(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseListRecordings._get_transcoded_request( @@ -2401,9 +2381,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListTranscriptEntries._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListTranscriptEntries._get_http_options() request, metadata = self._interceptor.pre_list_transcript_entries( request, metadata @@ -2550,9 +2528,7 @@ def __call__( Response for ListTranscripts method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListTranscripts._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListTranscripts._get_http_options() request, metadata = self._interceptor.pre_list_transcripts( request, metadata @@ -2719,7 +2695,9 @@ def list_participant_sessions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListParticipantSessions(self._session, self._host, self._interceptor) # type: ignore + return self._ListParticipantSessions( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_recordings( diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/async_client.py b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/async_client.py index d6628dc93986..4778e31319d0 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/async_client.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2 import gapic_version as package_version @@ -118,7 +118,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SpacesServiceAsyncClient: The constructed client. """ - return SpacesServiceClient.from_service_account_info.__func__(SpacesServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SpacesServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SpacesServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +137,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SpacesServiceAsyncClient: The constructed client. """ - return SpacesServiceClient.from_service_account_file.__func__(SpacesServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SpacesServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SpacesServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/client.py b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/client.py index c677dc919cab..7cb4c64002f1 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/client.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2 import gapic_version as package_version @@ -627,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SpacesServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SpacesServiceClient._read_environment_variables() + ) self._client_cert_source = SpacesServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -666,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SpacesServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/base.py b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/base.py index db71596f73d9..d29771d937b0 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/base.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.apps.meet_v2 import gapic_version as package_version from google.apps.meet_v2.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc.py b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc.py index 4b1d57ceef77..5cc533c7b0a9 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.apps.meet_v2.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc_asyncio.py b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc_asyncio.py index 4b22fdc173a3..80eecf91769e 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc_asyncio.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.apps.meet_v2.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest.py b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest.py index 9beb4c4b70b0..d72035b2e2f4 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.apps.meet_v2.types import resource, service @@ -550,9 +550,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSpacesServiceRestTransport._BaseEndActiveConference._get_http_options() - ) + http_options = _BaseSpacesServiceRestTransport._BaseEndActiveConference._get_http_options() request, metadata = self._interceptor.pre_end_active_conference( request, metadata diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest_base.py b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest_base.py index 764e3509726f..4b7b6ecc7323 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest_base.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.apps.meet_v2.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2/types/resource.py b/packages/google-apps-meet/google/apps/meet_v2/types/resource.py index 39586ece8850..8ddb31ac6c2d 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/types/resource.py +++ b/packages/google-apps-meet/google/apps/meet_v2/types/resource.py @@ -157,6 +157,7 @@ class AccessType(proto.Enum): Only invitees can join without knocking. Everyone else must knock. """ + ACCESS_TYPE_UNSPECIFIED = 0 OPEN = 1 TRUSTED = 2 @@ -179,6 +180,7 @@ class EntryPointAccess(proto.Enum): Meet Embed SDK Web or mobile Meet SDKs to create owned entry points. """ + ENTRY_POINT_ACCESS_UNSPECIFIED = 0 ALL = 1 CREATOR_APP_ONLY = 2 @@ -453,6 +455,7 @@ class State(proto.Enum): Recording file is generated and ready to download. """ + STATE_UNSPECIFIED = 0 STARTED = 1 ENDED = 2 @@ -556,6 +559,7 @@ class State(proto.Enum): Transcript file is generated and ready to download. """ + STATE_UNSPECIFIED = 0 STARTED = 1 ENDED = 2 diff --git a/packages/google-apps-meet/google/apps/meet_v2/types/service.py b/packages/google-apps-meet/google/apps/meet_v2/types/service.py index afc6c0d5592e..3d40f163f79f 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/types/service.py +++ b/packages/google-apps-meet/google/apps/meet_v2/types/service.py @@ -231,12 +231,12 @@ class ListConferenceRecordsResponse(proto.Message): def raw_page(self): return self - conference_records: MutableSequence[ - resource.ConferenceRecord - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resource.ConferenceRecord, + conference_records: MutableSequence[resource.ConferenceRecord] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resource.ConferenceRecord, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -419,12 +419,12 @@ class ListParticipantSessionsResponse(proto.Message): def raw_page(self): return self - participant_sessions: MutableSequence[ - resource.ParticipantSession - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resource.ParticipantSession, + participant_sessions: MutableSequence[resource.ParticipantSession] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resource.ParticipantSession, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/__init__.py b/packages/google-apps-meet/google/apps/meet_v2beta/__init__.py index 0ec4f3e13903..3dee22129df4 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/__init__.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.conference_records_service import ( ConferenceRecordsServiceAsyncClient, ConferenceRecordsServiceClient, diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/async_client.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/async_client.py index ae9d59fe7562..2b066417b6b4 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/async_client.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2beta import gapic_version as package_version @@ -151,7 +151,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConferenceRecordsServiceAsyncClient: The constructed client. """ - return ConferenceRecordsServiceClient.from_service_account_info.__func__(ConferenceRecordsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConferenceRecordsServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConferenceRecordsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -167,7 +170,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConferenceRecordsServiceAsyncClient: The constructed client. """ - return ConferenceRecordsServiceClient.from_service_account_file.__func__(ConferenceRecordsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConferenceRecordsServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + ConferenceRecordsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -205,7 +213,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConferenceRecordsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConferenceRecordsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConferenceRecordsServiceTransport: diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/client.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/client.py index b9d99cf39bb3..69e5f4cd3fc2 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/client.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2beta import gapic_version as package_version @@ -80,9 +80,7 @@ class ConferenceRecordsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConferenceRecordsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConferenceRecordsServiceTransport]] _transport_registry["grpc"] = ConferenceRecordsServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConferenceRecordsServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConferenceRecordsServiceRestTransport @@ -742,11 +740,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConferenceRecordsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConferenceRecordsServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConferenceRecordsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -783,8 +779,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConferenceRecordsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/pagers.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/pagers.py index e6a70b25671e..a1ad96be7301 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/pagers.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/__init__.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/__init__.py index 6c3d88f8cf95..332bd007118b 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/__init__.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConferenceRecordsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConferenceRecordsServiceTransport]] _transport_registry["grpc"] = ConferenceRecordsServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConferenceRecordsServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConferenceRecordsServiceRestTransport diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/base.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/base.py index 2fdb7d4a8fa6..d76b6664ec76 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/base.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2beta import gapic_version as package_version from google.apps.meet_v2beta.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc.py index 288385b56ff4..382eb7bbc2a7 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.apps.meet_v2beta.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc_asyncio.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc_asyncio.py index 99420c42470f..0ad1fa40bcb0 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc_asyncio.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.apps.meet_v2beta.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/rest.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/rest.py index afa7b4292777..d153e4fa6a0f 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/rest.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -891,9 +891,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetConferenceRecord._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetConferenceRecord._get_http_options() request, metadata = self._interceptor.pre_get_conference_record( request, metadata @@ -1040,9 +1038,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetParticipant._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetParticipant._get_http_options() request, metadata = self._interceptor.pre_get_participant(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseGetParticipant._get_transcoded_request( @@ -1196,9 +1192,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetParticipantSession._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetParticipantSession._get_http_options() request, metadata = self._interceptor.pre_get_participant_session( request, metadata @@ -1346,9 +1340,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetRecording._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetRecording._get_http_options() request, metadata = self._interceptor.pre_get_recording(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseGetRecording._get_transcoded_request( @@ -1497,9 +1489,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetTranscript._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetTranscript._get_http_options() request, metadata = self._interceptor.pre_get_transcript(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseGetTranscript._get_transcoded_request( @@ -1647,9 +1637,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetTranscriptEntry._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetTranscriptEntry._get_http_options() request, metadata = self._interceptor.pre_get_transcript_entry( request, metadata @@ -1799,9 +1787,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListConferenceRecords._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListConferenceRecords._get_http_options() request, metadata = self._interceptor.pre_list_conference_records( request, metadata @@ -1949,9 +1935,7 @@ def __call__( Response of ListParticipants method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListParticipants._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListParticipants._get_http_options() request, metadata = self._interceptor.pre_list_participants( request, metadata @@ -2102,9 +2086,7 @@ def __call__( Response of ListParticipants method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListParticipantSessions._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListParticipantSessions._get_http_options() request, metadata = self._interceptor.pre_list_participant_sessions( request, metadata @@ -2251,9 +2233,7 @@ def __call__( Response for ListRecordings method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListRecordings._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListRecordings._get_http_options() request, metadata = self._interceptor.pre_list_recordings(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseListRecordings._get_transcoded_request( @@ -2401,9 +2381,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListTranscriptEntries._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListTranscriptEntries._get_http_options() request, metadata = self._interceptor.pre_list_transcript_entries( request, metadata @@ -2550,9 +2528,7 @@ def __call__( Response for ListTranscripts method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListTranscripts._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListTranscripts._get_http_options() request, metadata = self._interceptor.pre_list_transcripts( request, metadata @@ -2719,7 +2695,9 @@ def list_participant_sessions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListParticipantSessions(self._session, self._host, self._interceptor) # type: ignore + return self._ListParticipantSessions( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_recordings( diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/async_client.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/async_client.py index 9015f3fc466d..50b4b9133a5a 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/async_client.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2beta import gapic_version as package_version @@ -121,7 +121,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SpacesServiceAsyncClient: The constructed client. """ - return SpacesServiceClient.from_service_account_info.__func__(SpacesServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SpacesServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SpacesServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +140,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SpacesServiceAsyncClient: The constructed client. """ - return SpacesServiceClient.from_service_account_file.__func__(SpacesServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SpacesServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SpacesServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/client.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/client.py index 31cfd0581ab6..8cd34b022a28 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/client.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2beta import gapic_version as package_version @@ -645,11 +645,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SpacesServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SpacesServiceClient._read_environment_variables() + ) self._client_cert_source = SpacesServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -684,8 +682,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SpacesServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/pagers.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/pagers.py index fe74ccc78d5a..e38e2b492387 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/pagers.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/base.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/base.py index f95a6acd2173..24661d9788cc 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/base.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.apps.meet_v2beta import gapic_version as package_version from google.apps.meet_v2beta.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc.py index 6265fe313211..ed8ca49b27cd 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.apps.meet_v2beta.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc_asyncio.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc_asyncio.py index a502f8d1f3ff..70f96e397218 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc_asyncio.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.apps.meet_v2beta.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest.py index 0e87266e6448..c67cd089ad1f 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.apps.meet_v2beta.types import resource, service @@ -640,9 +640,7 @@ def __call__( """ - http_options = ( - _BaseSpacesServiceRestTransport._BaseConnectActiveConference._get_http_options() - ) + http_options = _BaseSpacesServiceRestTransport._BaseConnectActiveConference._get_http_options() request, metadata = self._interceptor.pre_connect_active_conference( request, metadata @@ -1211,9 +1209,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSpacesServiceRestTransport._BaseEndActiveConference._get_http_options() - ) + http_options = _BaseSpacesServiceRestTransport._BaseEndActiveConference._get_http_options() request, metadata = self._interceptor.pre_end_active_conference( request, metadata @@ -1889,7 +1885,9 @@ def connect_active_conference( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ConnectActiveConference(self._session, self._host, self._interceptor) # type: ignore + return self._ConnectActiveConference( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_member(self) -> Callable[[service.CreateMemberRequest], resource.Member]: diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest_base.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest_base.py index 46f34c0cdf52..8a19aef0c997 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest_base.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.apps.meet_v2beta.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/types/resource.py b/packages/google-apps-meet/google/apps/meet_v2beta/types/resource.py index b704e64af02e..1c7ac157b1e9 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/types/resource.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/types/resource.py @@ -178,6 +178,7 @@ class AccessType(proto.Enum): Only invitees can join without knocking. Everyone else must knock. """ + ACCESS_TYPE_UNSPECIFIED = 0 OPEN = 1 TRUSTED = 2 @@ -200,6 +201,7 @@ class EntryPointAccess(proto.Enum): Meet Embed SDK Web or mobile Meet SDKs to create owned entry points. """ + ENTRY_POINT_ACCESS_UNSPECIFIED = 0 ALL = 1 CREATOR_APP_ONLY = 2 @@ -222,6 +224,7 @@ class Moderation(proto.Enum): ON (2): Moderation is on. """ + MODERATION_UNSPECIFIED = 0 OFF = 1 ON = 2 @@ -240,6 +243,7 @@ class AttendanceReportGenerationType(proto.Enum): DO_NOT_GENERATE (2): Attendance report will not be generated. """ + ATTENDANCE_REPORT_GENERATION_TYPE_UNSPECIFIED = 0 GENERATE_REPORT = 1 DO_NOT_GENERATE = 2 @@ -276,6 +280,7 @@ class RestrictionType(proto.Enum): NO_RESTRICTION (2): All Participants have permissions. """ + RESTRICTION_TYPE_UNSPECIFIED = 0 HOSTS_ONLY = 1 NO_RESTRICTION = 2 @@ -295,6 +300,7 @@ class DefaultJoinAsViewerType(proto.Enum): OFF (2): Users will by default join as contributors. """ + DEFAULT_JOIN_AS_VIEWER_TYPE_UNSPECIFIED = 0 ON = 1 OFF = 2 @@ -352,6 +358,7 @@ class AutoGenerationType(proto.Enum): OFF (2): The artifact is not generated automatically. """ + AUTO_GENERATION_TYPE_UNSPECIFIED = 0 ON = 1 OFF = 2 @@ -495,6 +502,7 @@ class Role(proto.Enum): COHOST (1): Co-host role. """ + ROLE_UNSPECIFIED = 0 COHOST = 1 @@ -775,6 +783,7 @@ class State(proto.Enum): Recording file is generated and ready to download. """ + STATE_UNSPECIFIED = 0 STARTED = 1 ENDED = 2 @@ -878,6 +887,7 @@ class State(proto.Enum): Transcript file is generated and ready to download. """ + STATE_UNSPECIFIED = 0 STARTED = 1 ENDED = 2 diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/types/service.py b/packages/google-apps-meet/google/apps/meet_v2beta/types/service.py index 7bd23e2c25af..92a4a45980f2 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/types/service.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/types/service.py @@ -406,12 +406,12 @@ class ListConferenceRecordsResponse(proto.Message): def raw_page(self): return self - conference_records: MutableSequence[ - resource.ConferenceRecord - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resource.ConferenceRecord, + conference_records: MutableSequence[resource.ConferenceRecord] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resource.ConferenceRecord, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -594,12 +594,12 @@ class ListParticipantSessionsResponse(proto.Message): def raw_page(self): return self - participant_sessions: MutableSequence[ - resource.ParticipantSession - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resource.ParticipantSession, + participant_sessions: MutableSequence[resource.ParticipantSession] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resource.ParticipantSession, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-apps-meet/mypy.ini b/packages/google-apps-meet/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-apps-meet/mypy.ini +++ b/packages/google-apps-meet/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-apps-meet/noxfile.py b/packages/google-apps-meet/noxfile.py index 2cb5aff4f295..e9ab129ca3f9 100644 --- a/packages/google-apps-meet/noxfile.py +++ b/packages/google-apps-meet/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_conference_records_service.py b/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_conference_records_service.py index 622c08c4d227..af2a1046da66 100644 --- a/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_conference_records_service.py +++ b/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_conference_records_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.apps.meet_v2.services.conference_records_service import ( ConferenceRecordsServiceAsyncClient, @@ -1004,10 +1009,9 @@ def test_conference_records_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1052,10 +1056,9 @@ def test_conference_records_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1091,10 +1094,9 @@ def test_conference_records_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1355,9 +1357,7 @@ def test_conference_records_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1476,9 +1476,9 @@ def test_get_conference_record_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conference_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conference_record] = ( + mock_rpc + ) request = {} client.get_conference_record(request) @@ -2538,9 +2538,9 @@ def test_list_participants_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -5136,9 +5136,9 @@ def test_list_transcripts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transcripts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transcripts] = ( + mock_rpc + ) request = {} client.list_transcripts(request) @@ -5667,9 +5667,9 @@ def test_get_transcript_entry_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transcript_entry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transcript_entry] = ( + mock_rpc + ) request = {} client.get_transcript_entry(request) @@ -6493,9 +6493,9 @@ def test_get_conference_record_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conference_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conference_record] = ( + mock_rpc + ) request = {} client.get_conference_record(request) @@ -6952,9 +6952,9 @@ def test_list_participants_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -8260,9 +8260,9 @@ def test_list_transcripts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transcripts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transcripts] = ( + mock_rpc + ) request = {} client.list_transcripts(request) @@ -8517,9 +8517,9 @@ def test_get_transcript_entry_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transcript_entry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transcript_entry] = ( + mock_rpc + ) request = {} client.get_transcript_entry(request) diff --git a/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_spaces_service.py b/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_spaces_service.py index 8f12387435b0..0ecd762a837f 100644 --- a/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_spaces_service.py +++ b/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_spaces_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.apps.meet_v2.services.spaces_service import ( SpacesServiceAsyncClient, @@ -941,10 +946,9 @@ def test_spaces_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +993,9 @@ def test_spaces_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1031,9 @@ def test_spaces_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1278,9 +1280,7 @@ def test_spaces_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2317,9 +2317,9 @@ def test_end_active_conference_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.end_active_conference - ] = mock_rpc + client._transport._wrapped_methods[client._transport.end_active_conference] = ( + mock_rpc + ) request = {} client.end_active_conference(request) @@ -3020,9 +3020,9 @@ def test_end_active_conference_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.end_active_conference - ] = mock_rpc + client._transport._wrapped_methods[client._transport.end_active_conference] = ( + mock_rpc + ) request = {} client.end_active_conference(request) diff --git a/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_conference_records_service.py b/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_conference_records_service.py index 143924ae393d..2657b73a1dd8 100644 --- a/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_conference_records_service.py +++ b/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_conference_records_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.apps.meet_v2beta.services.conference_records_service import ( ConferenceRecordsServiceAsyncClient, @@ -1004,10 +1009,9 @@ def test_conference_records_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1052,10 +1056,9 @@ def test_conference_records_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1091,10 +1094,9 @@ def test_conference_records_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1355,9 +1357,7 @@ def test_conference_records_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1476,9 +1476,9 @@ def test_get_conference_record_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conference_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conference_record] = ( + mock_rpc + ) request = {} client.get_conference_record(request) @@ -2538,9 +2538,9 @@ def test_list_participants_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -5136,9 +5136,9 @@ def test_list_transcripts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transcripts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transcripts] = ( + mock_rpc + ) request = {} client.list_transcripts(request) @@ -5667,9 +5667,9 @@ def test_get_transcript_entry_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transcript_entry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transcript_entry] = ( + mock_rpc + ) request = {} client.get_transcript_entry(request) @@ -6493,9 +6493,9 @@ def test_get_conference_record_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conference_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conference_record] = ( + mock_rpc + ) request = {} client.get_conference_record(request) @@ -6953,9 +6953,9 @@ def test_list_participants_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -8265,9 +8265,9 @@ def test_list_transcripts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transcripts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transcripts] = ( + mock_rpc + ) request = {} client.list_transcripts(request) @@ -8523,9 +8523,9 @@ def test_get_transcript_entry_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transcript_entry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transcript_entry] = ( + mock_rpc + ) request = {} client.get_transcript_entry(request) diff --git a/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_spaces_service.py b/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_spaces_service.py index 8ca1618fc668..5ae15c07615b 100644 --- a/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_spaces_service.py +++ b/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_spaces_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.apps.meet_v2beta.services.spaces_service import ( SpacesServiceAsyncClient, @@ -942,10 +947,9 @@ def test_spaces_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -990,10 +994,9 @@ def test_spaces_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1029,10 +1032,9 @@ def test_spaces_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1279,9 +1281,7 @@ def test_spaces_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2669,9 +2669,9 @@ def test_end_active_conference_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.end_active_conference - ] = mock_rpc + client._transport._wrapped_methods[client._transport.end_active_conference] = ( + mock_rpc + ) request = {} client.end_active_conference(request) @@ -5070,9 +5070,9 @@ def test_end_active_conference_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.end_active_conference - ] = mock_rpc + client._transport._wrapped_methods[client._transport.end_active_conference] = ( + mock_rpc + ) request = {} client.end_active_conference(request) diff --git a/packages/google-apps-script-type/google/apps/script/type/__init__.py b/packages/google-apps-script-type/google/apps/script/type/__init__.py index 1549239a5319..097954ea1698 100644 --- a/packages/google-apps-script-type/google/apps/script/type/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.addon_widget_set import AddOnWidgetSet from .types.extension_point import ( HomepageExtensionPoint, diff --git a/packages/google-apps-script-type/google/apps/script/type/calendar/__init__.py b/packages/google-apps-script-type/google/apps/script/type/calendar/__init__.py index fd11d871fa35..4cbfb5f0bcc4 100644 --- a/packages/google-apps-script-type/google/apps/script/type/calendar/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/calendar/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.calendar_addon_manifest import ( CalendarAddOnManifest, CalendarExtensionPoint, diff --git a/packages/google-apps-script-type/google/apps/script/type/calendar/types/calendar_addon_manifest.py b/packages/google-apps-script-type/google/apps/script/type/calendar/types/calendar_addon_manifest.py index 69c708bd37b2..566d4461cce8 100644 --- a/packages/google-apps-script-type/google/apps/script/type/calendar/types/calendar_addon_manifest.py +++ b/packages/google-apps-script-type/google/apps/script/type/calendar/types/calendar_addon_manifest.py @@ -87,6 +87,7 @@ class EventAccess(proto.Enum): fields including the metadata, attendees, and conference data and the ability to perform all actions. """ + UNSPECIFIED = 0 METADATA = 1 READ = 3 diff --git a/packages/google-apps-script-type/google/apps/script/type/docs/__init__.py b/packages/google-apps-script-type/google/apps/script/type/docs/__init__.py index 8628680e3fd8..cc67ccfa9f1a 100644 --- a/packages/google-apps-script-type/google/apps/script/type/docs/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/docs/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.docs_addon_manifest import DocsAddOnManifest, DocsExtensionPoint if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-apps-script-type/google/apps/script/type/docs/types/__init__.py b/packages/google-apps-script-type/google/apps/script/type/docs/types/__init__.py index 4d5f1812db24..077a3bcd90e4 100644 --- a/packages/google-apps-script-type/google/apps/script/type/docs/types/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/docs/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .docs_addon_manifest import DocsAddOnManifest, DocsExtensionPoint +from .docs_addon_manifest import ( + DocsAddOnManifest, + DocsExtensionPoint, +) __all__ = ( "DocsAddOnManifest", diff --git a/packages/google-apps-script-type/google/apps/script/type/drive/__init__.py b/packages/google-apps-script-type/google/apps/script/type/drive/__init__.py index 9064f77464ea..55f7ff0e58e7 100644 --- a/packages/google-apps-script-type/google/apps/script/type/drive/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/drive/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.drive_addon_manifest import DriveAddOnManifest, DriveExtensionPoint if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-apps-script-type/google/apps/script/type/drive/types/__init__.py b/packages/google-apps-script-type/google/apps/script/type/drive/types/__init__.py index dec9df4f1820..cd6a41ce1224 100644 --- a/packages/google-apps-script-type/google/apps/script/type/drive/types/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/drive/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .drive_addon_manifest import DriveAddOnManifest, DriveExtensionPoint +from .drive_addon_manifest import ( + DriveAddOnManifest, + DriveExtensionPoint, +) __all__ = ( "DriveAddOnManifest", diff --git a/packages/google-apps-script-type/google/apps/script/type/gmail/__init__.py b/packages/google-apps-script-type/google/apps/script/type/gmail/__init__.py index 5de1e21c7db2..8a0180942fc0 100644 --- a/packages/google-apps-script-type/google/apps/script/type/gmail/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/gmail/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.gmail_addon_manifest import ( ComposeTrigger, ContextualTrigger, diff --git a/packages/google-apps-script-type/google/apps/script/type/gmail/types/gmail_addon_manifest.py b/packages/google-apps-script-type/google/apps/script/type/gmail/types/gmail_addon_manifest.py index 2f67a4aabe94..040aa2175f24 100644 --- a/packages/google-apps-script-type/google/apps/script/type/gmail/types/gmail_addon_manifest.py +++ b/packages/google-apps-script-type/google/apps/script/type/gmail/types/gmail_addon_manifest.py @@ -176,16 +176,17 @@ class DraftAccess(proto.Enum): compose addon is triggered. This includes the audience list (To/cc list) of a draft message. """ + UNSPECIFIED = 0 NONE = 1 METADATA = 2 - actions: MutableSequence[ - extension_point.MenuItemExtensionPoint - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=extension_point.MenuItemExtensionPoint, + actions: MutableSequence[extension_point.MenuItemExtensionPoint] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=extension_point.MenuItemExtensionPoint, + ) ) draft_access: DraftAccess = proto.Field( proto.ENUM, diff --git a/packages/google-apps-script-type/google/apps/script/type/sheets/__init__.py b/packages/google-apps-script-type/google/apps/script/type/sheets/__init__.py index 564cf7c0c1f5..0cd2b0f690e5 100644 --- a/packages/google-apps-script-type/google/apps/script/type/sheets/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/sheets/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.sheets_addon_manifest import SheetsAddOnManifest, SheetsExtensionPoint if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-apps-script-type/google/apps/script/type/sheets/types/__init__.py b/packages/google-apps-script-type/google/apps/script/type/sheets/types/__init__.py index df8312895eed..17e611f23640 100644 --- a/packages/google-apps-script-type/google/apps/script/type/sheets/types/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/sheets/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .sheets_addon_manifest import SheetsAddOnManifest, SheetsExtensionPoint +from .sheets_addon_manifest import ( + SheetsAddOnManifest, + SheetsExtensionPoint, +) __all__ = ( "SheetsAddOnManifest", diff --git a/packages/google-apps-script-type/google/apps/script/type/slides/__init__.py b/packages/google-apps-script-type/google/apps/script/type/slides/__init__.py index f21cae748a52..9f4c23022394 100644 --- a/packages/google-apps-script-type/google/apps/script/type/slides/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/slides/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.slides_addon_manifest import SlidesAddOnManifest, SlidesExtensionPoint if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-apps-script-type/google/apps/script/type/slides/types/__init__.py b/packages/google-apps-script-type/google/apps/script/type/slides/types/__init__.py index a7f0840f9dad..d7b3f750cd35 100644 --- a/packages/google-apps-script-type/google/apps/script/type/slides/types/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/slides/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .slides_addon_manifest import SlidesAddOnManifest, SlidesExtensionPoint +from .slides_addon_manifest import ( + SlidesAddOnManifest, + SlidesExtensionPoint, +) __all__ = ( "SlidesAddOnManifest", diff --git a/packages/google-apps-script-type/google/apps/script/type/types/__init__.py b/packages/google-apps-script-type/google/apps/script/type/types/__init__.py index 098c1dc74989..29a1062c7599 100644 --- a/packages/google-apps-script-type/google/apps/script/type/types/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .addon_widget_set import AddOnWidgetSet +from .addon_widget_set import ( + AddOnWidgetSet, +) from .extension_point import ( HomepageExtensionPoint, MenuItemExtensionPoint, diff --git a/packages/google-apps-script-type/google/apps/script/type/types/addon_widget_set.py b/packages/google-apps-script-type/google/apps/script/type/types/addon_widget_set.py index 7619e681c2a5..4006b1c5fd4d 100644 --- a/packages/google-apps-script-type/google/apps/script/type/types/addon_widget_set.py +++ b/packages/google-apps-script-type/google/apps/script/type/types/addon_widget_set.py @@ -59,6 +59,7 @@ class WidgetType(proto.Enum): A Gmail add-on action that applies to the addon compose UI. """ + WIDGET_TYPE_UNSPECIFIED = 0 DATE_PICKER = 1 STYLED_BUTTONS = 2 diff --git a/packages/google-apps-script-type/google/apps/script/type/types/script_manifest.py b/packages/google-apps-script-type/google/apps/script/type/types/script_manifest.py index 9451b5309770..cec4f6a655db 100644 --- a/packages/google-apps-script-type/google/apps/script/type/types/script_manifest.py +++ b/packages/google-apps-script-type/google/apps/script/type/types/script_manifest.py @@ -48,6 +48,7 @@ class HttpAuthorizationHeader(proto.Enum): NONE (3): Do not send an Authentication header """ + HTTP_AUTHORIZATION_HEADER_UNSPECIFIED = 0 SYSTEM_ID_TOKEN = 1 USER_ID_TOKEN = 2 diff --git a/packages/google-apps-script-type/mypy.ini b/packages/google-apps-script-type/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-apps-script-type/mypy.ini +++ b/packages/google-apps-script-type/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-apps-script-type/noxfile.py b/packages/google-apps-script-type/noxfile.py index 2f26ca0c1a9e..a59993b053f0 100644 --- a/packages/google-apps-script-type/noxfile.py +++ b/packages/google-apps-script-type/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/__init__.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/__init__.py index f27dec6ff7a9..650f0bbe2a0e 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/__init__.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.tables_service import TablesServiceAsyncClient, TablesServiceClient from .types.tables import ( BatchCreateRowsRequest, diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/async_client.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/async_client.py index 5f2a035a00f5..e5f1e28a0c78 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/async_client.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.area120.tables_v1alpha1 import gapic_version as package_version @@ -133,7 +133,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TablesServiceAsyncClient: The constructed client. """ - return TablesServiceClient.from_service_account_info.__func__(TablesServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + TablesServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(TablesServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +152,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TablesServiceAsyncClient: The constructed client. """ - return TablesServiceClient.from_service_account_file.__func__(TablesServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + TablesServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(TablesServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/client.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/client.py index aa1583d943eb..1b5a03ac3865 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/client.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.area120.tables_v1alpha1 import gapic_version as package_version @@ -659,11 +659,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TablesServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TablesServiceClient._read_environment_variables() + ) self._client_cert_source = TablesServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -698,8 +696,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TablesServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/pagers.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/pagers.py index 5bdb8bf16787..9166d2d32105 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/pagers.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/base.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/base.py index 0cda056d415b..d648b39f918b 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/base.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.area120.tables_v1alpha1 import gapic_version as package_version from google.area120.tables_v1alpha1.types import tables diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc.py index 796b675f9392..1395c30512c4 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.area120.tables_v1alpha1.types import tables diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc_asyncio.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc_asyncio.py index 994cf15d1064..4c4055ac251d 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc_asyncio.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.area120.tables_v1alpha1.types import tables diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest.py index b913bdfdb3ac..8a95d8c06fce 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.area120.tables_v1alpha1.types import tables diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest_base.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest_base.py index c061929dae54..3e44560b01e2 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest_base.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.area120.tables_v1alpha1.types import tables diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/types/tables.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/types/tables.py index 4b900b03a8e2..ec05eb53b2a3 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/types/tables.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/types/tables.py @@ -63,6 +63,7 @@ class View(proto.Enum): Uses internally generated column id to identify values. """ + VIEW_UNSPECIFIED = 0 COLUMN_ID_VIEW = 1 diff --git a/packages/google-area120-tables/mypy.ini b/packages/google-area120-tables/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-area120-tables/mypy.ini +++ b/packages/google-area120-tables/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-area120-tables/noxfile.py b/packages/google-area120-tables/noxfile.py index 327e59149d7d..f0c908b7011d 100644 --- a/packages/google-area120-tables/noxfile.py +++ b/packages/google-area120-tables/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py b/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py index 159ede85096e..b85f4de07366 100644 --- a/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py +++ b/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.area120.tables_v1alpha1.services.tables_service import ( TablesServiceAsyncClient, @@ -943,10 +948,9 @@ def test_tables_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -991,10 +995,9 @@ def test_tables_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1033,9 @@ def test_tables_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1280,9 +1282,7 @@ def test_tables_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3946,9 +3946,9 @@ def test_batch_create_rows_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_rows - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_rows] = ( + mock_rpc + ) request = {} client.batch_create_rows(request) @@ -4516,9 +4516,9 @@ def test_batch_update_rows_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_rows - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_rows] = ( + mock_rpc + ) request = {} client.batch_update_rows(request) @@ -5072,9 +5072,9 @@ def test_batch_delete_rows_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_rows - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_rows] = ( + mock_rpc + ) request = {} client.batch_delete_rows(request) @@ -6409,9 +6409,9 @@ def test_batch_create_rows_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_rows - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_rows] = ( + mock_rpc + ) request = {} client.batch_create_rows(request) @@ -6727,9 +6727,9 @@ def test_batch_update_rows_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_rows - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_rows] = ( + mock_rpc + ) request = {} client.batch_update_rows(request) @@ -7027,9 +7027,9 @@ def test_batch_delete_rows_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_rows - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_rows] = ( + mock_rpc + ) request = {} client.batch_delete_rows(request) diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/__init__.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/__init__.py index 148c477931b7..c5ec929a2123 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/__init__.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.access_approval import AccessApprovalAsyncClient, AccessApprovalClient from .types.accessapproval import ( AccessApprovalServiceAccount, diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/async_client.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/async_client.py index 57759bab4f69..8573338f49f9 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/async_client.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.accessapproval_v1 import gapic_version as package_version @@ -165,7 +165,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AccessApprovalAsyncClient: The constructed client. """ - return AccessApprovalClient.from_service_account_info.__func__(AccessApprovalAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AccessApprovalClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AccessApprovalAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -181,7 +184,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AccessApprovalAsyncClient: The constructed client. """ - return AccessApprovalClient.from_service_account_file.__func__(AccessApprovalAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AccessApprovalClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AccessApprovalAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/client.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/client.py index 56b4441aac13..fba24683e9f7 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/client.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.accessapproval_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class AccessApprovalClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AccessApprovalTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AccessApprovalTransport]] _transport_registry["grpc"] = AccessApprovalGrpcTransport _transport_registry["grpc_asyncio"] = AccessApprovalGrpcAsyncIOTransport _transport_registry["rest"] = AccessApprovalRestTransport @@ -686,11 +684,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AccessApprovalClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AccessApprovalClient._read_environment_variables() + ) self._client_cert_source = AccessApprovalClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -725,8 +721,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AccessApprovalTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/pagers.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/pagers.py index b4e44e675f37..a6a730711737 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/pagers.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/base.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/base.py index b777ec512b1c..d38492a7f73c 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/base.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.accessapproval_v1 import gapic_version as package_version from google.cloud.accessapproval_v1.types import accessapproval diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc.py index 07fd1e4ae0fc..28d227fe9043 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.accessapproval_v1.types import accessapproval @@ -516,12 +516,12 @@ def invalidate_approval_request( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "invalidate_approval_request" not in self._stubs: - self._stubs[ - "invalidate_approval_request" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/InvalidateApprovalRequest", - request_serializer=accessapproval.InvalidateApprovalRequestMessage.serialize, - response_deserializer=accessapproval.ApprovalRequest.deserialize, + self._stubs["invalidate_approval_request"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/InvalidateApprovalRequest", + request_serializer=accessapproval.InvalidateApprovalRequestMessage.serialize, + response_deserializer=accessapproval.ApprovalRequest.deserialize, + ) ) return self._stubs["invalidate_approval_request"] @@ -548,12 +548,12 @@ def get_access_approval_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_access_approval_settings" not in self._stubs: - self._stubs[ - "get_access_approval_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalSettings", - request_serializer=accessapproval.GetAccessApprovalSettingsMessage.serialize, - response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + self._stubs["get_access_approval_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalSettings", + request_serializer=accessapproval.GetAccessApprovalSettingsMessage.serialize, + response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + ) ) return self._stubs["get_access_approval_settings"] @@ -582,12 +582,12 @@ def update_access_approval_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_access_approval_settings" not in self._stubs: - self._stubs[ - "update_access_approval_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/UpdateAccessApprovalSettings", - request_serializer=accessapproval.UpdateAccessApprovalSettingsMessage.serialize, - response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + self._stubs["update_access_approval_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/UpdateAccessApprovalSettings", + request_serializer=accessapproval.UpdateAccessApprovalSettingsMessage.serialize, + response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + ) ) return self._stubs["update_access_approval_settings"] @@ -620,12 +620,12 @@ def delete_access_approval_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_access_approval_settings" not in self._stubs: - self._stubs[ - "delete_access_approval_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/DeleteAccessApprovalSettings", - request_serializer=accessapproval.DeleteAccessApprovalSettingsMessage.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_access_approval_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/DeleteAccessApprovalSettings", + request_serializer=accessapproval.DeleteAccessApprovalSettingsMessage.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_access_approval_settings"] @@ -654,12 +654,12 @@ def get_access_approval_service_account( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_access_approval_service_account" not in self._stubs: - self._stubs[ - "get_access_approval_service_account" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalServiceAccount", - request_serializer=accessapproval.GetAccessApprovalServiceAccountMessage.serialize, - response_deserializer=accessapproval.AccessApprovalServiceAccount.deserialize, + self._stubs["get_access_approval_service_account"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalServiceAccount", + request_serializer=accessapproval.GetAccessApprovalServiceAccountMessage.serialize, + response_deserializer=accessapproval.AccessApprovalServiceAccount.deserialize, + ) ) return self._stubs["get_access_approval_service_account"] diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc_asyncio.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc_asyncio.py index 3bcaeb14b3e8..74454dd68364 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc_asyncio.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.accessapproval_v1.types import accessapproval @@ -527,12 +527,12 @@ def invalidate_approval_request( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "invalidate_approval_request" not in self._stubs: - self._stubs[ - "invalidate_approval_request" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/InvalidateApprovalRequest", - request_serializer=accessapproval.InvalidateApprovalRequestMessage.serialize, - response_deserializer=accessapproval.ApprovalRequest.deserialize, + self._stubs["invalidate_approval_request"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/InvalidateApprovalRequest", + request_serializer=accessapproval.InvalidateApprovalRequestMessage.serialize, + response_deserializer=accessapproval.ApprovalRequest.deserialize, + ) ) return self._stubs["invalidate_approval_request"] @@ -559,12 +559,12 @@ def get_access_approval_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_access_approval_settings" not in self._stubs: - self._stubs[ - "get_access_approval_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalSettings", - request_serializer=accessapproval.GetAccessApprovalSettingsMessage.serialize, - response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + self._stubs["get_access_approval_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalSettings", + request_serializer=accessapproval.GetAccessApprovalSettingsMessage.serialize, + response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + ) ) return self._stubs["get_access_approval_settings"] @@ -593,12 +593,12 @@ def update_access_approval_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_access_approval_settings" not in self._stubs: - self._stubs[ - "update_access_approval_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/UpdateAccessApprovalSettings", - request_serializer=accessapproval.UpdateAccessApprovalSettingsMessage.serialize, - response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + self._stubs["update_access_approval_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/UpdateAccessApprovalSettings", + request_serializer=accessapproval.UpdateAccessApprovalSettingsMessage.serialize, + response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + ) ) return self._stubs["update_access_approval_settings"] @@ -631,12 +631,12 @@ def delete_access_approval_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_access_approval_settings" not in self._stubs: - self._stubs[ - "delete_access_approval_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/DeleteAccessApprovalSettings", - request_serializer=accessapproval.DeleteAccessApprovalSettingsMessage.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_access_approval_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/DeleteAccessApprovalSettings", + request_serializer=accessapproval.DeleteAccessApprovalSettingsMessage.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_access_approval_settings"] @@ -665,12 +665,12 @@ def get_access_approval_service_account( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_access_approval_service_account" not in self._stubs: - self._stubs[ - "get_access_approval_service_account" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalServiceAccount", - request_serializer=accessapproval.GetAccessApprovalServiceAccountMessage.serialize, - response_deserializer=accessapproval.AccessApprovalServiceAccount.deserialize, + self._stubs["get_access_approval_service_account"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalServiceAccount", + request_serializer=accessapproval.GetAccessApprovalServiceAccountMessage.serialize, + response_deserializer=accessapproval.AccessApprovalServiceAccount.deserialize, + ) ) return self._stubs["get_access_approval_service_account"] diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest.py index 2440b0f56600..6119ab7b910c 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.accessapproval_v1.types import accessapproval @@ -745,9 +745,7 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseApproveApprovalRequest._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseApproveApprovalRequest._get_http_options() request, metadata = self._interceptor.pre_approve_approval_request( request, metadata @@ -897,9 +895,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseDeleteAccessApprovalSettings._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseDeleteAccessApprovalSettings._get_http_options() request, metadata = self._interceptor.pre_delete_access_approval_settings( request, metadata @@ -1016,9 +1012,7 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseDismissApprovalRequest._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseDismissApprovalRequest._get_http_options() request, metadata = self._interceptor.pre_dismiss_approval_request( request, metadata @@ -1175,15 +1169,12 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseGetAccessApprovalServiceAccount._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseGetAccessApprovalServiceAccount._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_access_approval_service_account( - request, metadata + request, metadata = ( + self._interceptor.pre_get_access_approval_service_account( + request, metadata + ) ) transcoded_request = _BaseAccessApprovalRestTransport._BaseGetAccessApprovalServiceAccount._get_transcoded_request( http_options, request @@ -1244,11 +1235,10 @@ def __call__( resp = self._interceptor.post_get_access_approval_service_account(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_access_approval_service_account_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_access_approval_service_account_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1335,9 +1325,7 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseGetAccessApprovalSettings._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseGetAccessApprovalSettings._get_http_options() request, metadata = self._interceptor.pre_get_access_approval_settings( request, metadata @@ -1487,9 +1475,7 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseGetApprovalRequest._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseGetApprovalRequest._get_http_options() request, metadata = self._interceptor.pre_get_approval_request( request, metadata @@ -1639,9 +1625,7 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseInvalidateApprovalRequest._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseInvalidateApprovalRequest._get_http_options() request, metadata = self._interceptor.pre_invalidate_approval_request( request, metadata @@ -1795,9 +1779,7 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseListApprovalRequests._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseListApprovalRequests._get_http_options() request, metadata = self._interceptor.pre_list_approval_requests( request, metadata @@ -1950,9 +1932,7 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseUpdateAccessApprovalSettings._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseUpdateAccessApprovalSettings._get_http_options() request, metadata = self._interceptor.pre_update_access_approval_settings( request, metadata @@ -2023,11 +2003,10 @@ def __call__( resp = self._interceptor.post_update_access_approval_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_access_approval_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_access_approval_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2062,7 +2041,9 @@ def approve_approval_request( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ApproveApprovalRequest(self._session, self._host, self._interceptor) # type: ignore + return self._ApproveApprovalRequest( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_access_approval_settings( @@ -2072,7 +2053,9 @@ def delete_access_approval_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteAccessApprovalSettings(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteAccessApprovalSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def dismiss_approval_request( @@ -2082,7 +2065,9 @@ def dismiss_approval_request( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DismissApprovalRequest(self._session, self._host, self._interceptor) # type: ignore + return self._DismissApprovalRequest( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_access_approval_service_account( @@ -2093,7 +2078,9 @@ def get_access_approval_service_account( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetAccessApprovalServiceAccount(self._session, self._host, self._interceptor) # type: ignore + return self._GetAccessApprovalServiceAccount( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_access_approval_settings( @@ -2104,7 +2091,9 @@ def get_access_approval_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetAccessApprovalSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetAccessApprovalSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_approval_request( @@ -2125,7 +2114,9 @@ def invalidate_approval_request( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._InvalidateApprovalRequest(self._session, self._host, self._interceptor) # type: ignore + return self._InvalidateApprovalRequest( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_approval_requests( @@ -2147,7 +2138,9 @@ def update_access_approval_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateAccessApprovalSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAccessApprovalSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest_base.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest_base.py index 3949db215d9b..2cec35eac893 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest_base.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.accessapproval_v1.types import accessapproval diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/types/accessapproval.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/types/accessapproval.py index 7ef98dac972c..9983545a8d80 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/types/accessapproval.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/types/accessapproval.py @@ -60,6 +60,7 @@ class EnrollmentLevel(proto.Enum): Service is enrolled in Access Approval for all requests """ + ENROLLMENT_LEVEL_UNSPECIFIED = 0 BLOCK_ALL = 1 @@ -158,6 +159,7 @@ class Type(proto.Enum): to diagnose or resolve a suspected issue in services or a known outage. """ + TYPE_UNSPECIFIED = 0 CUSTOMER_INITIATED_SUPPORT = 1 GOOGLE_INITIATED_SERVICE = 2 diff --git a/packages/google-cloud-access-approval/mypy.ini b/packages/google-cloud-access-approval/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-access-approval/mypy.ini +++ b/packages/google-cloud-access-approval/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-access-approval/noxfile.py b/packages/google-cloud-access-approval/noxfile.py index 21fd26f8a906..e708d5bd7dec 100644 --- a/packages/google-cloud-access-approval/noxfile.py +++ b/packages/google-cloud-access-approval/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-access-approval/tests/unit/gapic/accessapproval_v1/test_access_approval.py b/packages/google-cloud-access-approval/tests/unit/gapic/accessapproval_v1/test_access_approval.py index 2c589716823a..8c7248d9a6b3 100644 --- a/packages/google-cloud-access-approval/tests/unit/gapic/accessapproval_v1/test_access_approval.py +++ b/packages/google-cloud-access-approval/tests/unit/gapic/accessapproval_v1/test_access_approval.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.accessapproval_v1.services.access_approval import ( AccessApprovalAsyncClient, @@ -947,10 +952,9 @@ def test_access_approval_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -995,10 +999,9 @@ def test_access_approval_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1034,10 +1037,9 @@ def test_access_approval_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1284,9 +1286,7 @@ def test_access_approval_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1404,9 +1404,9 @@ def test_list_approval_requests_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_approval_requests - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_approval_requests] = ( + mock_rpc + ) request = {} client.list_approval_requests(request) @@ -1950,9 +1950,9 @@ def test_get_approval_request_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_approval_request - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_approval_request] = ( + mock_rpc + ) request = {} client.get_approval_request(request) @@ -4420,9 +4420,9 @@ def test_list_approval_requests_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_approval_requests - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_approval_requests] = ( + mock_rpc + ) request = {} client.list_approval_requests(request) @@ -4580,9 +4580,9 @@ def test_get_approval_request_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_approval_request - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_approval_request] = ( + mock_rpc + ) request = {} client.get_approval_request(request) diff --git a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/type/device_resources_pb2.py b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/type/device_resources_pb2.py index 9aa7402f7788..769b02815fe5 100644 --- a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/type/device_resources_pb2.py +++ b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/type/device_resources_pb2.py @@ -18,6 +18,7 @@ # source: google/identity/accesscontextmanager/type/device_resources.proto # Protobuf Python Version: 4.25.3 """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database diff --git a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_context_manager_pb2.py b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_context_manager_pb2.py index a5fccf621ef9..accc75c92063 100644 --- a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_context_manager_pb2.py +++ b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_context_manager_pb2.py @@ -18,6 +18,7 @@ # source: google/identity/accesscontextmanager/v1/access_context_manager.proto # Protobuf Python Version: 4.25.3 """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database diff --git a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_level_pb2.py b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_level_pb2.py index c29c1e796d29..08cd949e9c0b 100644 --- a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_level_pb2.py +++ b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_level_pb2.py @@ -18,6 +18,7 @@ # source: google/identity/accesscontextmanager/v1/access_level.proto # Protobuf Python Version: 4.25.3 """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database diff --git a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_level_pb2.pyi b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_level_pb2.pyi index e02ef157b139..b97e687528b9 100644 --- a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_level_pb2.pyi +++ b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_level_pb2.pyi @@ -68,11 +68,11 @@ class AccessLevel(_message.Message): class BasicLevel(_message.Message): __slots__ = ("conditions", "combining_function") - class ConditionCombiningFunction(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () AND: _ClassVar[BasicLevel.ConditionCombiningFunction] OR: _ClassVar[BasicLevel.ConditionCombiningFunction] + AND: BasicLevel.ConditionCombiningFunction OR: BasicLevel.ConditionCombiningFunction CONDITIONS_FIELD_NUMBER: _ClassVar[int] diff --git a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_policy_pb2.py b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_policy_pb2.py index 50f7aa352871..91c6163e56ef 100644 --- a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_policy_pb2.py +++ b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/access_policy_pb2.py @@ -18,6 +18,7 @@ # source: google/identity/accesscontextmanager/v1/access_policy.proto # Protobuf Python Version: 4.25.3 """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database diff --git a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/gcp_user_access_binding_pb2.py b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/gcp_user_access_binding_pb2.py index 146166962cdb..2d0f851254ad 100644 --- a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/gcp_user_access_binding_pb2.py +++ b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/gcp_user_access_binding_pb2.py @@ -18,6 +18,7 @@ # source: google/identity/accesscontextmanager/v1/gcp_user_access_binding.proto # Protobuf Python Version: 4.25.3 """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database diff --git a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/service_perimeter_pb2.py b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/service_perimeter_pb2.py index efc833133371..92e494aee078 100644 --- a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/service_perimeter_pb2.py +++ b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/service_perimeter_pb2.py @@ -18,6 +18,7 @@ # source: google/identity/accesscontextmanager/v1/service_perimeter.proto # Protobuf Python Version: 4.25.3 """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database diff --git a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/service_perimeter_pb2.pyi b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/service_perimeter_pb2.pyi index ff42a2fc7b8c..5b1abfcdbbd2 100644 --- a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/service_perimeter_pb2.pyi +++ b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/v1/service_perimeter_pb2.pyi @@ -39,11 +39,11 @@ class ServicePerimeter(_message.Message): "spec", "use_explicit_dry_run_spec", ) - class PerimeterType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () PERIMETER_TYPE_REGULAR: _ClassVar[ServicePerimeter.PerimeterType] PERIMETER_TYPE_BRIDGE: _ClassVar[ServicePerimeter.PerimeterType] + PERIMETER_TYPE_REGULAR: ServicePerimeter.PerimeterType PERIMETER_TYPE_BRIDGE: ServicePerimeter.PerimeterType NAME_FIELD_NUMBER: _ClassVar[int] @@ -86,18 +86,17 @@ class ServicePerimeterConfig(_message.Message): "ingress_policies", "egress_policies", ) - class IdentityType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () IDENTITY_TYPE_UNSPECIFIED: _ClassVar[ServicePerimeterConfig.IdentityType] ANY_IDENTITY: _ClassVar[ServicePerimeterConfig.IdentityType] ANY_USER_ACCOUNT: _ClassVar[ServicePerimeterConfig.IdentityType] ANY_SERVICE_ACCOUNT: _ClassVar[ServicePerimeterConfig.IdentityType] + IDENTITY_TYPE_UNSPECIFIED: ServicePerimeterConfig.IdentityType ANY_IDENTITY: ServicePerimeterConfig.IdentityType ANY_USER_ACCOUNT: ServicePerimeterConfig.IdentityType ANY_SERVICE_ACCOUNT: ServicePerimeterConfig.IdentityType - class VpcAccessibleServices(_message.Message): __slots__ = ("enable_restriction", "allowed_services") ENABLE_RESTRICTION_FIELD_NUMBER: _ClassVar[int] @@ -247,6 +246,7 @@ class ServicePerimeterConfig(_message.Message): _Union[ServicePerimeterConfig.EgressTo, _Mapping] ] = ..., ) -> None: ... + RESOURCES_FIELD_NUMBER: _ClassVar[int] ACCESS_LEVELS_FIELD_NUMBER: _ClassVar[int] RESTRICTED_SERVICES_FIELD_NUMBER: _ClassVar[int] diff --git a/packages/google-cloud-access-context-manager/noxfile.py b/packages/google-cloud-access-context-manager/noxfile.py index e6b927e1aa52..ed9f00a9c902 100644 --- a/packages/google-cloud-access-context-manager/noxfile.py +++ b/packages/google-cloud-access-context-manager/noxfile.py @@ -142,6 +142,15 @@ def format(session): ) +@nox.session(python=DEFAULT_PYTHON_VERSION) +def mypy(session): + """Run the type checker.""" + + # TODO(https://github.com/googleapis/google-cloud-python/issues/13362): + # Enable mypy once this bug is fixed. + session.skip("Skip mypy since this library doesn't have py.typed") + + @nox.session(python=DEFAULT_PYTHON_VERSION) def lint_setup_py(session): """Verify that setup.py is valid (including RST check).""" diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/__init__.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/__init__.py index cab7a20a8b3a..02fafaef59e7 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/__init__.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.advisory_notifications_service import ( AdvisoryNotificationsServiceAsyncClient, AdvisoryNotificationsServiceClient, diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/async_client.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/async_client.py index 7d7a3c652511..2b00aa9a3aee 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/async_client.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.advisorynotifications_v1 import gapic_version as package_version @@ -133,7 +133,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AdvisoryNotificationsServiceAsyncClient: The constructed client. """ - return AdvisoryNotificationsServiceClient.from_service_account_info.__func__(AdvisoryNotificationsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AdvisoryNotificationsServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + AdvisoryNotificationsServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +154,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AdvisoryNotificationsServiceAsyncClient: The constructed client. """ - return AdvisoryNotificationsServiceClient.from_service_account_file.__func__(AdvisoryNotificationsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AdvisoryNotificationsServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + AdvisoryNotificationsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -187,7 +197,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AdvisoryNotificationsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AdvisoryNotificationsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AdvisoryNotificationsServiceTransport: diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/client.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/client.py index 17a528cb12fe..47cec9048972 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/client.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.advisorynotifications_v1 import gapic_version as package_version @@ -82,13 +82,11 @@ class AdvisoryNotificationsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AdvisoryNotificationsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AdvisoryNotificationsServiceTransport]] _transport_registry["grpc"] = AdvisoryNotificationsServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = AdvisoryNotificationsServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + AdvisoryNotificationsServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = AdvisoryNotificationsServiceRestTransport def get_transport_class( @@ -658,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AdvisoryNotificationsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AdvisoryNotificationsServiceClient._read_environment_variables() + ) self._client_cert_source = ( AdvisoryNotificationsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -701,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AdvisoryNotificationsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/pagers.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/pagers.py index fd4146045561..a916fc5e4858 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/pagers.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/__init__.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/__init__.py index 375a4715f5ac..8281a9413abe 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/__init__.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AdvisoryNotificationsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AdvisoryNotificationsServiceTransport]] _transport_registry["grpc"] = AdvisoryNotificationsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AdvisoryNotificationsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AdvisoryNotificationsServiceRestTransport diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/base.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/base.py index 49aca7758441..1528dbcbeafe 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/base.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.advisorynotifications_v1 import gapic_version as package_version from google.cloud.advisorynotifications_v1.types import service diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc.py index 8008e2472964..e8d913c28d4e 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.advisorynotifications_v1.types import service diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc_asyncio.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc_asyncio.py index d698e618ff63..91ff73349717 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.advisorynotifications_v1.types import service diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/rest.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/rest.py index e5d3ebd5122d..91ddddfc9f8a 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/rest.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -442,9 +442,7 @@ def __call__( """ - http_options = ( - _BaseAdvisoryNotificationsServiceRestTransport._BaseGetNotification._get_http_options() - ) + http_options = _BaseAdvisoryNotificationsServiceRestTransport._BaseGetNotification._get_http_options() request, metadata = self._interceptor.pre_get_notification( request, metadata @@ -589,9 +587,7 @@ def __call__( Settings for Advisory Notifications. """ - http_options = ( - _BaseAdvisoryNotificationsServiceRestTransport._BaseGetSettings._get_http_options() - ) + http_options = _BaseAdvisoryNotificationsServiceRestTransport._BaseGetSettings._get_http_options() request, metadata = self._interceptor.pre_get_settings(request, metadata) transcoded_request = _BaseAdvisoryNotificationsServiceRestTransport._BaseGetSettings._get_transcoded_request( @@ -739,9 +735,7 @@ def __call__( """ - http_options = ( - _BaseAdvisoryNotificationsServiceRestTransport._BaseListNotifications._get_http_options() - ) + http_options = _BaseAdvisoryNotificationsServiceRestTransport._BaseListNotifications._get_http_options() request, metadata = self._interceptor.pre_list_notifications( request, metadata @@ -889,9 +883,7 @@ def __call__( Settings for Advisory Notifications. """ - http_options = ( - _BaseAdvisoryNotificationsServiceRestTransport._BaseUpdateSettings._get_http_options() - ) + http_options = _BaseAdvisoryNotificationsServiceRestTransport._BaseUpdateSettings._get_http_options() request, metadata = self._interceptor.pre_update_settings(request, metadata) transcoded_request = _BaseAdvisoryNotificationsServiceRestTransport._BaseUpdateSettings._get_transcoded_request( diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/types/service.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/types/service.py index 4269894c4281..8e0fea7a0bc4 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/types/service.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/types/service.py @@ -58,6 +58,7 @@ class NotificationView(proto.Enum): FULL (2): Include everything. """ + NOTIFICATION_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -86,6 +87,7 @@ class LocalizationState(proto.Enum): Localization for requested language is completed. """ + LOCALIZATION_STATE_UNSPECIFIED = 0 LOCALIZATION_STATE_NOT_APPLICABLE = 1 LOCALIZATION_STATE_PENDING = 2 @@ -107,6 +109,7 @@ class NotificationType(proto.Enum): NOTIFICATION_TYPE_THREAT_HORIZONS (4): Threat horizons MSA """ + NOTIFICATION_TYPE_UNSPECIFIED = 0 NOTIFICATION_TYPE_SECURITY_PRIVACY_ADVISORY = 1 NOTIFICATION_TYPE_SENSITIVE_ACTIONS = 2 diff --git a/packages/google-cloud-advisorynotifications/mypy.ini b/packages/google-cloud-advisorynotifications/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-advisorynotifications/mypy.ini +++ b/packages/google-cloud-advisorynotifications/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-advisorynotifications/noxfile.py b/packages/google-cloud-advisorynotifications/noxfile.py index a6c29ad86e31..8dc5fb9a50ed 100644 --- a/packages/google-cloud-advisorynotifications/noxfile.py +++ b/packages/google-cloud-advisorynotifications/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-advisorynotifications/tests/unit/gapic/advisorynotifications_v1/test_advisory_notifications_service.py b/packages/google-cloud-advisorynotifications/tests/unit/gapic/advisorynotifications_v1/test_advisory_notifications_service.py index 8834d72d27c1..305ca1b6cc37 100644 --- a/packages/google-cloud-advisorynotifications/tests/unit/gapic/advisorynotifications_v1/test_advisory_notifications_service.py +++ b/packages/google-cloud-advisorynotifications/tests/unit/gapic/advisorynotifications_v1/test_advisory_notifications_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.advisorynotifications_v1.services.advisory_notifications_service import ( AdvisoryNotificationsServiceAsyncClient, @@ -1035,10 +1040,9 @@ def test_advisory_notifications_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1083,10 +1087,9 @@ def test_advisory_notifications_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1122,10 +1125,9 @@ def test_advisory_notifications_service_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1390,9 +1392,7 @@ def test_advisory_notifications_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1511,9 +1511,9 @@ def test_list_notifications_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_notifications - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_notifications] = ( + mock_rpc + ) request = {} client.list_notifications(request) @@ -2057,9 +2057,9 @@ def test_get_notification_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_notification - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_notification] = ( + mock_rpc + ) request = {} client.get_notification(request) @@ -2967,9 +2967,9 @@ def test_list_notifications_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_notifications - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_notifications] = ( + mock_rpc + ) request = {} client.list_notifications(request) @@ -3227,9 +3227,9 @@ def test_get_notification_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_notification - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_notification] = ( + mock_rpc + ) request = {} client.get_notification(request) diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/__init__.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/__init__.py index 00f62310d636..0e9e13b85f1e 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/__init__.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.resources import MetadataExchangeRequest, MetadataExchangeResponse if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/__init__.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/__init__.py index d4c190d538f6..104cb8c050d7 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/__init__.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .resources import MetadataExchangeRequest, MetadataExchangeResponse +from .resources import ( + MetadataExchangeRequest, + MetadataExchangeResponse, +) __all__ = ( "MetadataExchangeRequest", diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/resources.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/resources.py index d02f6884ae54..709771ca5cf4 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/resources.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/resources.py @@ -60,6 +60,7 @@ class AuthType(proto.Enum): AUTO_IAM (2): Automatic IAM authentication """ + AUTH_TYPE_UNSPECIFIED = 0 DB_NATIVE = 1 AUTO_IAM = 2 @@ -103,6 +104,7 @@ class ResponseCode(proto.Enum): ERROR (2): Failure """ + RESPONSE_CODE_UNSPECIFIED = 0 OK = 1 ERROR = 2 diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/__init__.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/__init__.py index 9e28f46b2d13..9fa9c91250f0 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/__init__.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.resources import MetadataExchangeRequest, MetadataExchangeResponse if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/__init__.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/__init__.py index d4c190d538f6..104cb8c050d7 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/__init__.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .resources import MetadataExchangeRequest, MetadataExchangeResponse +from .resources import ( + MetadataExchangeRequest, + MetadataExchangeResponse, +) __all__ = ( "MetadataExchangeRequest", diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/resources.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/resources.py index 95ac129fbd0e..3b573256f02e 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/resources.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/resources.py @@ -60,6 +60,7 @@ class AuthType(proto.Enum): AUTO_IAM (2): Automatic IAM authentication """ + AUTH_TYPE_UNSPECIFIED = 0 DB_NATIVE = 1 AUTO_IAM = 2 @@ -103,6 +104,7 @@ class ResponseCode(proto.Enum): ERROR (2): Failure """ + RESPONSE_CODE_UNSPECIFIED = 0 OK = 1 ERROR = 2 diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/__init__.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/__init__.py index c998f9173468..0e05c0b64696 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/__init__.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.resources import MetadataExchangeRequest, MetadataExchangeResponse if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/__init__.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/__init__.py index d4c190d538f6..104cb8c050d7 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/__init__.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .resources import MetadataExchangeRequest, MetadataExchangeResponse +from .resources import ( + MetadataExchangeRequest, + MetadataExchangeResponse, +) __all__ = ( "MetadataExchangeRequest", diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/resources.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/resources.py index 0d991f382b62..7e6d57ed7e5b 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/resources.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/resources.py @@ -60,6 +60,7 @@ class AuthType(proto.Enum): AUTO_IAM (2): Automatic IAM authentication """ + AUTH_TYPE_UNSPECIFIED = 0 DB_NATIVE = 1 AUTO_IAM = 2 @@ -103,6 +104,7 @@ class ResponseCode(proto.Enum): ERROR (2): Failure """ + RESPONSE_CODE_UNSPECIFIED = 0 OK = 1 ERROR = 2 diff --git a/packages/google-cloud-alloydb-connectors/mypy.ini b/packages/google-cloud-alloydb-connectors/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-alloydb-connectors/mypy.ini +++ b/packages/google-cloud-alloydb-connectors/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-alloydb-connectors/noxfile.py b/packages/google-cloud-alloydb-connectors/noxfile.py index efa4b186b653..18764e3b95f9 100644 --- a/packages/google-cloud-alloydb-connectors/noxfile.py +++ b/packages/google-cloud-alloydb-connectors/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/__init__.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/__init__.py index 88023f4d1454..6849b3ac2d54 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/__init__.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.alloy_db_admin import AlloyDBAdminAsyncClient, AlloyDBAdminClient from .services.alloy_dbcsql_admin import ( AlloyDBCSQLAdminAsyncClient, diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/async_client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/async_client.py index 0bd6c8a6d3f3..518ebc19544e 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/async_client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1 import gapic_version as package_version @@ -46,13 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1.services.alloy_db_admin import pagers from google.cloud.alloydb_v1.types import csql_resources, data_model, resources, service @@ -149,7 +151,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AlloyDBAdminAsyncClient: The constructed client. """ - return AlloyDBAdminClient.from_service_account_info.__func__(AlloyDBAdminAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AlloyDBAdminClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AlloyDBAdminAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -165,7 +170,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AlloyDBAdminAsyncClient: The constructed client. """ - return AlloyDBAdminClient.from_service_account_file.__func__(AlloyDBAdminAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AlloyDBAdminClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AlloyDBAdminAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/client.py index 1f7619d305f5..0ac012522395 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1 import gapic_version as package_version @@ -63,13 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1.services.alloy_db_admin import pagers from google.cloud.alloydb_v1.types import csql_resources, data_model, resources, service @@ -859,11 +861,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AlloyDBAdminClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AlloyDBAdminClient._read_environment_variables() + ) self._client_cert_source = AlloyDBAdminClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -898,8 +898,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AlloyDBAdminTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/pagers.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/pagers.py index 81a21cc4b1cb..a9504d1a369d 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/pagers.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/base.py index fe071e9d2878..b3813310d6dc 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.alloydb_v1 import gapic_version as package_version from google.cloud.alloydb_v1.types import resources, service @@ -811,13 +813,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc.py index fcb06abfcc19..6b1ca683c616 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.alloydb_v1.types import resources, service @@ -1123,12 +1125,12 @@ def list_supported_database_flags( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_supported_database_flags" not in self._stubs: - self._stubs[ - "list_supported_database_flags" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1.AlloyDBAdmin/ListSupportedDatabaseFlags", - request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, - response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + self._stubs["list_supported_database_flags"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1.AlloyDBAdmin/ListSupportedDatabaseFlags", + request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, + response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + ) ) return self._stubs["list_supported_database_flags"] @@ -1160,12 +1162,12 @@ def generate_client_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_client_certificate" not in self._stubs: - self._stubs[ - "generate_client_certificate" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1.AlloyDBAdmin/GenerateClientCertificate", - request_serializer=service.GenerateClientCertificateRequest.serialize, - response_deserializer=service.GenerateClientCertificateResponse.deserialize, + self._stubs["generate_client_certificate"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1.AlloyDBAdmin/GenerateClientCertificate", + request_serializer=service.GenerateClientCertificateRequest.serialize, + response_deserializer=service.GenerateClientCertificateResponse.deserialize, + ) ) return self._stubs["generate_client_certificate"] diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc_asyncio.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc_asyncio.py index a123361c85f9..6c118b0b9003 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc_asyncio.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1.types import resources, service @@ -1151,12 +1153,12 @@ def list_supported_database_flags( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_supported_database_flags" not in self._stubs: - self._stubs[ - "list_supported_database_flags" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1.AlloyDBAdmin/ListSupportedDatabaseFlags", - request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, - response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + self._stubs["list_supported_database_flags"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1.AlloyDBAdmin/ListSupportedDatabaseFlags", + request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, + response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + ) ) return self._stubs["list_supported_database_flags"] @@ -1188,12 +1190,12 @@ def generate_client_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_client_certificate" not in self._stubs: - self._stubs[ - "generate_client_certificate" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1.AlloyDBAdmin/GenerateClientCertificate", - request_serializer=service.GenerateClientCertificateRequest.serialize, - response_deserializer=service.GenerateClientCertificateResponse.deserialize, + self._stubs["generate_client_certificate"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1.AlloyDBAdmin/GenerateClientCertificate", + request_serializer=service.GenerateClientCertificateRequest.serialize, + response_deserializer=service.GenerateClientCertificateResponse.deserialize, + ) ) return self._stubs["generate_client_certificate"] diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest.py index 1c8654373c38..6e3683c3cfb9 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest.py @@ -16,21 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.alloydb_v1.types import resources, service @@ -2402,9 +2404,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseBatchCreateInstances._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseBatchCreateInstances._get_http_options() request, metadata = self._interceptor.pre_batch_create_instances( request, metadata @@ -3012,9 +3012,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryCluster._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryCluster._get_http_options() request, metadata = self._interceptor.pre_create_secondary_cluster( request, metadata @@ -3167,9 +3165,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryInstance._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryInstance._get_http_options() request, metadata = self._interceptor.pre_create_secondary_instance( request, metadata @@ -4487,9 +4483,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseGenerateClientCertificate._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseGenerateClientCertificate._get_http_options() request, metadata = self._interceptor.pre_generate_client_certificate( request, metadata @@ -4947,9 +4941,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseGetConnectionInfo._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseGetConnectionInfo._get_http_options() request, metadata = self._interceptor.pre_get_connection_info( request, metadata @@ -6296,9 +6288,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseListSupportedDatabaseFlags._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseListSupportedDatabaseFlags._get_http_options() request, metadata = self._interceptor.pre_list_supported_database_flags( request, metadata @@ -6364,11 +6354,10 @@ def __call__( resp = self._interceptor.post_list_supported_database_flags(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_supported_database_flags_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_supported_database_flags_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -7058,9 +7047,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseSwitchoverCluster._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseSwitchoverCluster._get_http_options() request, metadata = self._interceptor.pre_switchover_cluster( request, metadata @@ -7955,7 +7942,9 @@ def create_secondary_cluster( ) -> Callable[[service.CreateSecondaryClusterRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSecondaryCluster(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecondaryCluster( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_secondary_instance( @@ -7963,7 +7952,9 @@ def create_secondary_instance( ) -> Callable[[service.CreateSecondaryInstanceRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSecondaryInstance(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecondaryInstance( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_user(self) -> Callable[[service.CreateUserRequest], resources.User]: @@ -8034,7 +8025,9 @@ def generate_client_certificate( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateClientCertificate(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateClientCertificate( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_backup(self) -> Callable[[service.GetBackupRequest], resources.Backup]: @@ -8127,7 +8120,9 @@ def list_supported_database_flags( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListSupportedDatabaseFlags(self._session, self._host, self._interceptor) # type: ignore + return self._ListSupportedDatabaseFlags( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_users( diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest_base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest_base.py index 4b0d7c228bcc..1413aec44838 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest_base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest_base.py @@ -17,13 +17,15 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.alloydb_v1.types import resources, service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/async_client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/async_client.py index d1737af73d42..67743977a662 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/async_client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1 import gapic_version as package_version @@ -47,8 +47,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1.types import csql_service, resources, service @@ -131,7 +133,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AlloyDBCSQLAdminAsyncClient: The constructed client. """ - return AlloyDBCSQLAdminClient.from_service_account_info.__func__(AlloyDBCSQLAdminAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AlloyDBCSQLAdminClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AlloyDBCSQLAdminAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +152,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AlloyDBCSQLAdminAsyncClient: The constructed client. """ - return AlloyDBCSQLAdminClient.from_service_account_file.__func__(AlloyDBCSQLAdminAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AlloyDBCSQLAdminClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AlloyDBCSQLAdminAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/client.py index 811ac222cc4f..b2ee864de728 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1 import gapic_version as package_version @@ -64,8 +64,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1.types import csql_service, resources, service @@ -84,9 +86,7 @@ class AlloyDBCSQLAdminClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AlloyDBCSQLAdminTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AlloyDBCSQLAdminTransport]] _transport_registry["grpc"] = AlloyDBCSQLAdminGrpcTransport _transport_registry["grpc_asyncio"] = AlloyDBCSQLAdminGrpcAsyncIOTransport _transport_registry["rest"] = AlloyDBCSQLAdminRestTransport @@ -719,11 +719,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AlloyDBCSQLAdminClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AlloyDBCSQLAdminClient._read_environment_variables() + ) self._client_cert_source = AlloyDBCSQLAdminClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -758,8 +756,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AlloyDBCSQLAdminTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/base.py index 84b6a9b098cc..ea345918b998 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1 import gapic_version as package_version from google.cloud.alloydb_v1.types import csql_service @@ -224,13 +226,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc.py index 43322426f874..b38cd72fa72d 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1.types import csql_service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc_asyncio.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc_asyncio.py index 818b421353db..c485adf330f8 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc_asyncio.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1.types import csql_service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest.py index f5295f534038..6e85f65244af 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -486,9 +488,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseRestoreFromCloudSQL._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseRestoreFromCloudSQL._get_http_options() request, metadata = self._interceptor.pre_restore_from_cloud_sql( request, metadata @@ -786,9 +786,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_transcoded_request( @@ -925,9 +923,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1045,9 +1041,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1302,9 +1296,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest_base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest_base.py index 033a0378cbae..d9ac51d39d28 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest_base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/__init__.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/__init__.py index 88290a268e7f..eff92db5866a 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/__init__.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/__init__.py @@ -13,9 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .csql_resources import CloudSQLBackupRunSource -from .csql_service import RestoreFromCloudSQLRequest -from .data_model import SqlResult, SqlResultColumn, SqlResultRow, SqlResultValue +from .csql_resources import ( + CloudSQLBackupRunSource, +) +from .csql_service import ( + RestoreFromCloudSQLRequest, +) +from .data_model import ( + SqlResult, + SqlResultColumn, + SqlResultRow, + SqlResultValue, +) from .resources import ( AutomatedBackupPolicy, Backup, diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py index 35cd61fb8bed..779a451097a4 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py @@ -76,6 +76,7 @@ class InstanceView(proto.Enum): instance, this includes details of each node in the pool. """ + INSTANCE_VIEW_UNSPECIFIED = 0 INSTANCE_VIEW_BASIC = 1 INSTANCE_VIEW_FULL = 2 @@ -99,6 +100,7 @@ class ClusterView(proto.Enum): plus the earliest restorable time if continuous backups are enabled. May increase latency. """ + CLUSTER_VIEW_UNSPECIFIED = 0 CLUSTER_VIEW_BASIC = 1 CLUSTER_VIEW_CONTINUOUS_BACKUP = 2 @@ -122,6 +124,7 @@ class DatabaseVersion(proto.Enum): POSTGRES_17 (5): The database version is Postgres 17. """ + DATABASE_VERSION_UNSPECIFIED = 0 POSTGRES_13 = 1 POSTGRES_14 = 2 @@ -144,6 +147,7 @@ class SubscriptionType(proto.Enum): TRIAL (2): Trial subscription. """ + SUBSCRIPTION_TYPE_UNSPECIFIED = 0 STANDARD = 1 TRIAL = 2 @@ -197,6 +201,7 @@ class MigrationSourceType(proto.Enum): DMS source means the cluster was created via DMS migration job. """ + MIGRATION_SOURCE_TYPE_UNSPECIFIED = 0 DMS = 1 @@ -262,6 +267,7 @@ class Type(proto.Enum): is managed by the customer. KMS key versions will be populated. """ + TYPE_UNSPECIFIED = 0 GOOGLE_DEFAULT_ENCRYPTION = 1 CUSTOMER_MANAGED_ENCRYPTION = 2 @@ -316,6 +322,7 @@ class SslMode(proto.Enum): SSL connections are required. CA verification not enforced. """ + SSL_MODE_UNSPECIFIED = 0 SSL_MODE_ALLOW = 1 SSL_MODE_REQUIRE = 2 @@ -334,6 +341,7 @@ class CaSource(proto.Enum): Certificate Authority (CA) managed by the AlloyDB Cluster. """ + CA_SOURCE_UNSPECIFIED = 0 CA_SOURCE_MANAGED = 1 @@ -744,12 +752,12 @@ class DenyMaintenancePeriod(proto.Message): number=1, message=MaintenanceWindow, ) - deny_maintenance_periods: MutableSequence[ - DenyMaintenancePeriod - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=DenyMaintenancePeriod, + deny_maintenance_periods: MutableSequence[DenyMaintenancePeriod] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=DenyMaintenancePeriod, + ) ) @@ -967,6 +975,7 @@ class State(proto.Enum): PROMOTING (9): The cluster is being promoted. """ + STATE_UNSPECIFIED = 0 READY = 1 STOPPED = 2 @@ -991,6 +1000,7 @@ class ClusterType(proto.Enum): Secondary cluster that is replicating from another region. This only supports read. """ + CLUSTER_TYPE_UNSPECIFIED = 0 PRIMARY = 1 SECONDARY = 2 @@ -1462,6 +1472,7 @@ class State(proto.Enum): PROMOTING (9): The instance is being promoted. """ + STATE_UNSPECIFIED = 0 READY = 1 STOPPED = 2 @@ -1494,6 +1505,7 @@ class InstanceType(proto.Enum): only. SECONDARY instance is a cross-region read replica """ + INSTANCE_TYPE_UNSPECIFIED = 0 PRIMARY = 1 READ_POOL = 2 @@ -1515,6 +1527,7 @@ class AvailabilityType(proto.Enum): REGIONAL (2): Regional (or Highly) available instance. """ + AVAILABILITY_TYPE_UNSPECIFIED = 0 ZONAL = 1 REGIONAL = 2 @@ -1530,6 +1543,7 @@ class ActivationPolicy(proto.Enum): NEVER (2): The instance is not running. """ + ACTIVATION_POLICY_UNSPECIFIED = 0 ALWAYS = 1 NEVER = 2 @@ -1908,19 +1922,19 @@ class PscInstanceConfig(proto.Message): proto.STRING, number=7, ) - psc_interface_configs: MutableSequence[ - "Instance.PscInterfaceConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="Instance.PscInterfaceConfig", + psc_interface_configs: MutableSequence["Instance.PscInterfaceConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="Instance.PscInterfaceConfig", + ) ) - psc_auto_connections: MutableSequence[ - "Instance.PscAutoConnectionConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message="Instance.PscAutoConnectionConfig", + psc_auto_connections: MutableSequence["Instance.PscAutoConnectionConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message="Instance.PscAutoConnectionConfig", + ) ) class InstanceNetworkConfig(proto.Message): @@ -2329,6 +2343,7 @@ class State(proto.Enum): DELETING (4): The backup is being deleted. """ + STATE_UNSPECIFIED = 0 READY = 1 CREATING = 2 @@ -2353,6 +2368,7 @@ class Type(proto.Enum): backups scheduler due to a continuous backup policy. """ + TYPE_UNSPECIFIED = 0 ON_DEMAND = 1 AUTOMATED = 2 @@ -2584,6 +2600,7 @@ class ValueType(proto.Enum): Denotes that the flag does not accept any values. """ + VALUE_TYPE_UNSPECIFIED = 0 STRING = 1 INTEGER = 2 @@ -2602,6 +2619,7 @@ class Scope(proto.Enum): CONNECTION_POOL (2): The flag is a connection pool flag. """ + SCOPE_UNSPECIFIED = 0 DATABASE = 1 CONNECTION_POOL = 2 @@ -2734,6 +2752,7 @@ class UserType(proto.Enum): Database user that can authenticate via IAM-Based authentication. """ + USER_TYPE_UNSPECIFIED = 0 ALLOYDB_BUILT_IN = 1 ALLOYDB_IAM_USER = 2 diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/service.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/service.py index b92ac876fd82..146cb5f44d71 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/service.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/service.py @@ -813,6 +813,7 @@ class Status(proto.Enum): CANCELLED (7): Cancellation complete. """ + STATUS_UNSPECIFIED = 0 NOT_STARTED = 4 IN_PROGRESS = 5 @@ -843,6 +844,7 @@ class Stage(proto.Enum): CLEANUP (7): Cleanup. """ + STAGE_UNSPECIFIED = 0 ALLOYDB_PRECHECK = 1 PG_UPGRADE_CHECK = 2 @@ -956,12 +958,12 @@ class ClusterUpgradeDetails(proto.Message): number=4, enum=resources.DatabaseVersion, ) - stage_info: MutableSequence[ - "UpgradeClusterResponse.StageInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="UpgradeClusterResponse.StageInfo", + stage_info: MutableSequence["UpgradeClusterResponse.StageInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="UpgradeClusterResponse.StageInfo", + ) ) instance_upgrade_details: MutableSequence[ "UpgradeClusterResponse.InstanceUpgradeDetails" @@ -980,12 +982,12 @@ class ClusterUpgradeDetails(proto.Message): proto.STRING, number=2, ) - cluster_upgrade_details: MutableSequence[ - ClusterUpgradeDetails - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ClusterUpgradeDetails, + cluster_upgrade_details: MutableSequence[ClusterUpgradeDetails] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ClusterUpgradeDetails, + ) ) @@ -1489,12 +1491,12 @@ class CreateInstanceRequests(proto.Message): to be created. This list should not be empty. """ - create_instance_requests: MutableSequence[ - "CreateInstanceRequest" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CreateInstanceRequest", + create_instance_requests: MutableSequence["CreateInstanceRequest"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CreateInstanceRequest", + ) ) @@ -1584,13 +1586,13 @@ class BatchCreateInstancesMetadata(proto.Message): proto.STRING, number=1, ) - instance_statuses: MutableMapping[ - str, "BatchCreateInstanceStatus" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=2, - message="BatchCreateInstanceStatus", + instance_statuses: MutableMapping[str, "BatchCreateInstanceStatus"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=2, + message="BatchCreateInstanceStatus", + ) ) @@ -1664,6 +1666,7 @@ class State(proto.Enum): was rolled back and deleted due to some other failure during BatchCreateInstances operation. """ + STATE_UNSPECIFIED = 0 PENDING_CREATE = 1 READY = 2 @@ -1916,6 +1919,7 @@ class FaultType(proto.Enum): STOP_VM (1): Stop the VM """ + FAULT_TYPE_UNSPECIFIED = 0 STOP_VM = 1 @@ -2130,6 +2134,7 @@ class Status(proto.Enum): https://google.aip.dev/193 but will be returned as part of this message. """ + STATUS_UNSPECIFIED = 0 OK = 1 PARTIAL = 2 @@ -2484,12 +2489,12 @@ class ListSupportedDatabaseFlagsResponse(proto.Message): def raw_page(self): return self - supported_database_flags: MutableSequence[ - resources.SupportedDatabaseFlag - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.SupportedDatabaseFlag, + supported_database_flags: MutableSequence[resources.SupportedDatabaseFlag] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.SupportedDatabaseFlag, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/__init__.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/__init__.py index 88417f7dd994..241105bf128b 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/__init__.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.alloy_db_admin import AlloyDBAdminAsyncClient, AlloyDBAdminClient from .services.alloy_dbcsql_admin import ( AlloyDBCSQLAdminAsyncClient, diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/async_client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/async_client.py index 63fbfe9c3f83..42be693bf78b 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/async_client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1alpha import gapic_version as package_version @@ -46,13 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1alpha.services.alloy_db_admin import pagers from google.cloud.alloydb_v1alpha.types import ( @@ -155,7 +157,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AlloyDBAdminAsyncClient: The constructed client. """ - return AlloyDBAdminClient.from_service_account_info.__func__(AlloyDBAdminAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AlloyDBAdminClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AlloyDBAdminAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -171,7 +176,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AlloyDBAdminAsyncClient: The constructed client. """ - return AlloyDBAdminClient.from_service_account_file.__func__(AlloyDBAdminAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AlloyDBAdminClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AlloyDBAdminAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/client.py index 24797adb6571..468894db98a4 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1alpha import gapic_version as package_version @@ -63,13 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1alpha.services.alloy_db_admin import pagers from google.cloud.alloydb_v1alpha.types import ( @@ -865,11 +867,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AlloyDBAdminClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AlloyDBAdminClient._read_environment_variables() + ) self._client_cert_source = AlloyDBAdminClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -904,8 +904,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AlloyDBAdminTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/pagers.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/pagers.py index 2bbd5afcef7e..181f3225be49 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/pagers.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/base.py index f9dbe7cae217..6f00282f2e2a 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.alloydb_v1alpha import gapic_version as package_version from google.cloud.alloydb_v1alpha.types import resources, service @@ -852,13 +854,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc.py index 67964890408a..f64c0aa3c67c 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.alloydb_v1alpha.types import resources, service @@ -1123,12 +1125,12 @@ def list_supported_database_flags( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_supported_database_flags" not in self._stubs: - self._stubs[ - "list_supported_database_flags" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/ListSupportedDatabaseFlags", - request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, - response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + self._stubs["list_supported_database_flags"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/ListSupportedDatabaseFlags", + request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, + response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + ) ) return self._stubs["list_supported_database_flags"] @@ -1160,12 +1162,12 @@ def generate_client_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_client_certificate" not in self._stubs: - self._stubs[ - "generate_client_certificate" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/GenerateClientCertificate", - request_serializer=service.GenerateClientCertificateRequest.serialize, - response_deserializer=service.GenerateClientCertificateResponse.deserialize, + self._stubs["generate_client_certificate"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/GenerateClientCertificate", + request_serializer=service.GenerateClientCertificateRequest.serialize, + response_deserializer=service.GenerateClientCertificateResponse.deserialize, + ) ) return self._stubs["generate_client_certificate"] diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc_asyncio.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc_asyncio.py index dca18be60839..f01a3ce516ba 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc_asyncio.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1alpha.types import resources, service @@ -1151,12 +1153,12 @@ def list_supported_database_flags( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_supported_database_flags" not in self._stubs: - self._stubs[ - "list_supported_database_flags" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/ListSupportedDatabaseFlags", - request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, - response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + self._stubs["list_supported_database_flags"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/ListSupportedDatabaseFlags", + request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, + response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + ) ) return self._stubs["list_supported_database_flags"] @@ -1188,12 +1190,12 @@ def generate_client_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_client_certificate" not in self._stubs: - self._stubs[ - "generate_client_certificate" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/GenerateClientCertificate", - request_serializer=service.GenerateClientCertificateRequest.serialize, - response_deserializer=service.GenerateClientCertificateResponse.deserialize, + self._stubs["generate_client_certificate"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/GenerateClientCertificate", + request_serializer=service.GenerateClientCertificateRequest.serialize, + response_deserializer=service.GenerateClientCertificateResponse.deserialize, + ) ) return self._stubs["generate_client_certificate"] diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest.py index ffdac823b2eb..eca3c90c1956 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest.py @@ -16,21 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.alloydb_v1alpha.types import resources, service @@ -2454,9 +2456,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseBatchCreateInstances._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseBatchCreateInstances._get_http_options() request, metadata = self._interceptor.pre_batch_create_instances( request, metadata @@ -3214,9 +3214,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryCluster._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryCluster._get_http_options() request, metadata = self._interceptor.pre_create_secondary_cluster( request, metadata @@ -3369,9 +3367,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryInstance._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryInstance._get_http_options() request, metadata = self._interceptor.pre_create_secondary_instance( request, metadata @@ -4689,9 +4685,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseGenerateClientCertificate._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseGenerateClientCertificate._get_http_options() request, metadata = self._interceptor.pre_generate_client_certificate( request, metadata @@ -5149,9 +5143,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseGetConnectionInfo._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseGetConnectionInfo._get_http_options() request, metadata = self._interceptor.pre_get_connection_info( request, metadata @@ -6498,9 +6490,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseListSupportedDatabaseFlags._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseListSupportedDatabaseFlags._get_http_options() request, metadata = self._interceptor.pre_list_supported_database_flags( request, metadata @@ -6566,11 +6556,10 @@ def __call__( resp = self._interceptor.post_list_supported_database_flags(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_supported_database_flags_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_supported_database_flags_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -7260,9 +7249,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseSwitchoverCluster._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseSwitchoverCluster._get_http_options() request, metadata = self._interceptor.pre_switchover_cluster( request, metadata @@ -8165,7 +8152,9 @@ def create_secondary_cluster( ) -> Callable[[service.CreateSecondaryClusterRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSecondaryCluster(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecondaryCluster( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_secondary_instance( @@ -8173,7 +8162,9 @@ def create_secondary_instance( ) -> Callable[[service.CreateSecondaryInstanceRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSecondaryInstance(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecondaryInstance( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_user(self) -> Callable[[service.CreateUserRequest], resources.User]: @@ -8244,7 +8235,9 @@ def generate_client_certificate( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateClientCertificate(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateClientCertificate( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_backup(self) -> Callable[[service.GetBackupRequest], resources.Backup]: @@ -8337,7 +8330,9 @@ def list_supported_database_flags( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListSupportedDatabaseFlags(self._session, self._host, self._interceptor) # type: ignore + return self._ListSupportedDatabaseFlags( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_users( diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest_base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest_base.py index 1c3a72fcbe17..1fdd68116605 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest_base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest_base.py @@ -17,13 +17,15 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.alloydb_v1alpha.types import resources, service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/async_client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/async_client.py index 804f69a97fb0..16fd573599f1 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/async_client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1alpha import gapic_version as package_version @@ -47,8 +47,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1alpha.types import csql_service, resources, service @@ -131,7 +133,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AlloyDBCSQLAdminAsyncClient: The constructed client. """ - return AlloyDBCSQLAdminClient.from_service_account_info.__func__(AlloyDBCSQLAdminAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AlloyDBCSQLAdminClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AlloyDBCSQLAdminAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +152,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AlloyDBCSQLAdminAsyncClient: The constructed client. """ - return AlloyDBCSQLAdminClient.from_service_account_file.__func__(AlloyDBCSQLAdminAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AlloyDBCSQLAdminClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AlloyDBCSQLAdminAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/client.py index 12bfe50049ff..dbe86d771cb7 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1alpha import gapic_version as package_version @@ -64,8 +64,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1alpha.types import csql_service, resources, service @@ -84,9 +86,7 @@ class AlloyDBCSQLAdminClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AlloyDBCSQLAdminTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AlloyDBCSQLAdminTransport]] _transport_registry["grpc"] = AlloyDBCSQLAdminGrpcTransport _transport_registry["grpc_asyncio"] = AlloyDBCSQLAdminGrpcAsyncIOTransport _transport_registry["rest"] = AlloyDBCSQLAdminRestTransport @@ -719,11 +719,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AlloyDBCSQLAdminClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AlloyDBCSQLAdminClient._read_environment_variables() + ) self._client_cert_source = AlloyDBCSQLAdminClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -758,8 +756,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AlloyDBCSQLAdminTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/base.py index 662f881cbd70..62f62b593678 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1alpha import gapic_version as package_version from google.cloud.alloydb_v1alpha.types import csql_service @@ -224,13 +226,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc.py index 665de62a2c89..90f57676e2df 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1alpha.types import csql_service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc_asyncio.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc_asyncio.py index 7954e38cdbfd..566a453f1729 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc_asyncio.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1alpha.types import csql_service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest.py index 50a9f9b0607e..ecedad1d48a4 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -486,9 +488,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseRestoreFromCloudSQL._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseRestoreFromCloudSQL._get_http_options() request, metadata = self._interceptor.pre_restore_from_cloud_sql( request, metadata @@ -786,9 +786,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_transcoded_request( @@ -925,9 +923,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1045,9 +1041,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1302,9 +1296,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest_base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest_base.py index dda6be0203b4..8e4f9b0d8e84 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest_base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/__init__.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/__init__.py index 2b5e40149a56..41050b818d59 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/__init__.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/__init__.py @@ -13,9 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .csql_resources import CloudSQLBackupRunSource -from .csql_service import RestoreFromCloudSQLRequest -from .data_model import SqlResult, SqlResultColumn, SqlResultRow, SqlResultValue +from .csql_resources import ( + CloudSQLBackupRunSource, +) +from .csql_service import ( + RestoreFromCloudSQLRequest, +) +from .data_model import ( + SqlResult, + SqlResultColumn, + SqlResultRow, + SqlResultValue, +) from .gemini import ( GCAEntitlementType, GCAInstanceConfig, diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/gemini.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/gemini.py index a2d90b0e60a0..a95907b8f546 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/gemini.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/gemini.py @@ -41,6 +41,7 @@ class GCAEntitlementType(proto.Enum): The resource is entitled to the GCA Standard Tier. """ + GCA_ENTITLEMENT_TYPE_UNSPECIFIED = 0 GCA_STANDARD = 1 diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py index 8abe8a6c66c9..7c02c6636765 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py @@ -76,6 +76,7 @@ class InstanceView(proto.Enum): instance, this includes details of each node in the pool. """ + INSTANCE_VIEW_UNSPECIFIED = 0 INSTANCE_VIEW_BASIC = 1 INSTANCE_VIEW_FULL = 2 @@ -99,6 +100,7 @@ class ClusterView(proto.Enum): plus the earliest restorable time if continuous backups are enabled. May increase latency. """ + CLUSTER_VIEW_UNSPECIFIED = 0 CLUSTER_VIEW_BASIC = 1 CLUSTER_VIEW_CONTINUOUS_BACKUP = 2 @@ -124,6 +126,7 @@ class DatabaseVersion(proto.Enum): POSTGRES_18 (6): The database version is Postgres 18. """ + DATABASE_VERSION_UNSPECIFIED = 0 POSTGRES_13 = 1 POSTGRES_14 = 2 @@ -147,6 +150,7 @@ class SubscriptionType(proto.Enum): TRIAL (2): Trial subscription. """ + SUBSCRIPTION_TYPE_UNSPECIFIED = 0 STANDARD = 1 TRIAL = 2 @@ -200,6 +204,7 @@ class MigrationSourceType(proto.Enum): DMS source means the cluster was created via DMS migration job. """ + MIGRATION_SOURCE_TYPE_UNSPECIFIED = 0 DMS = 1 @@ -265,6 +270,7 @@ class Type(proto.Enum): is managed by the customer. KMS key versions will be populated. """ + TYPE_UNSPECIFIED = 0 GOOGLE_DEFAULT_ENCRYPTION = 1 CUSTOMER_MANAGED_ENCRYPTION = 2 @@ -319,6 +325,7 @@ class SslMode(proto.Enum): SSL connections are required. CA verification not enforced. """ + SSL_MODE_UNSPECIFIED = 0 SSL_MODE_ALLOW = 1 SSL_MODE_REQUIRE = 2 @@ -337,6 +344,7 @@ class CaSource(proto.Enum): Certificate Authority (CA) managed by the AlloyDB Cluster. """ + CA_SOURCE_UNSPECIFIED = 0 CA_SOURCE_MANAGED = 1 @@ -747,12 +755,12 @@ class DenyMaintenancePeriod(proto.Message): number=1, message=MaintenanceWindow, ) - deny_maintenance_periods: MutableSequence[ - DenyMaintenancePeriod - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=DenyMaintenancePeriod, + deny_maintenance_periods: MutableSequence[DenyMaintenancePeriod] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=DenyMaintenancePeriod, + ) ) @@ -982,6 +990,7 @@ class State(proto.Enum): PROMOTING (9): The cluster is being promoted. """ + STATE_UNSPECIFIED = 0 READY = 1 STOPPED = 2 @@ -1006,6 +1015,7 @@ class ClusterType(proto.Enum): Secondary cluster that is replicating from another region. This only supports read. """ + CLUSTER_TYPE_UNSPECIFIED = 0 PRIMARY = 1 SECONDARY = 2 @@ -1505,6 +1515,7 @@ class State(proto.Enum): PROMOTING (9): The instance is being promoted. """ + STATE_UNSPECIFIED = 0 READY = 1 STOPPED = 2 @@ -1537,6 +1548,7 @@ class InstanceType(proto.Enum): only. SECONDARY instance is a cross-region read replica """ + INSTANCE_TYPE_UNSPECIFIED = 0 PRIMARY = 1 READ_POOL = 2 @@ -1558,6 +1570,7 @@ class AvailabilityType(proto.Enum): REGIONAL (2): Regional (or Highly) available instance. """ + AVAILABILITY_TYPE_UNSPECIFIED = 0 ZONAL = 1 REGIONAL = 2 @@ -1573,6 +1586,7 @@ class ActivationPolicy(proto.Enum): NEVER (2): The instance is not running. """ + ACTIVATION_POLICY_UNSPECIFIED = 0 ALWAYS = 1 NEVER = 2 @@ -1841,6 +1855,7 @@ class Mode(proto.Enum): Performs a forced update when applicable. This will be fast but may incur a downtime. """ + MODE_UNSPECIFIED = 0 DEFAULT = 1 FORCE_APPLY = 2 @@ -2001,19 +2016,19 @@ class PscInstanceConfig(proto.Message): proto.STRING, number=7, ) - psc_interface_configs: MutableSequence[ - "Instance.PscInterfaceConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="Instance.PscInterfaceConfig", + psc_interface_configs: MutableSequence["Instance.PscInterfaceConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="Instance.PscInterfaceConfig", + ) ) - psc_auto_connections: MutableSequence[ - "Instance.PscAutoConnectionConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message="Instance.PscAutoConnectionConfig", + psc_auto_connections: MutableSequence["Instance.PscAutoConnectionConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message="Instance.PscAutoConnectionConfig", + ) ) class InstanceNetworkConfig(proto.Message): @@ -2459,6 +2474,7 @@ class State(proto.Enum): DELETING (4): The backup is being deleted. """ + STATE_UNSPECIFIED = 0 READY = 1 CREATING = 2 @@ -2483,6 +2499,7 @@ class Type(proto.Enum): backups scheduler due to a continuous backup policy. """ + TYPE_UNSPECIFIED = 0 ON_DEMAND = 1 AUTOMATED = 2 @@ -2718,6 +2735,7 @@ class ValueType(proto.Enum): Denotes that the flag does not accept any values. """ + VALUE_TYPE_UNSPECIFIED = 0 STRING = 1 INTEGER = 2 @@ -2736,6 +2754,7 @@ class Scope(proto.Enum): CONNECTION_POOL (2): The flag is a connection pool flag. """ + SCOPE_UNSPECIFIED = 0 DATABASE = 1 CONNECTION_POOL = 2 @@ -2868,6 +2887,7 @@ class UserType(proto.Enum): Database user that can authenticate via IAM-Based authentication. """ + USER_TYPE_UNSPECIFIED = 0 ALLOYDB_BUILT_IN = 1 ALLOYDB_IAM_USER = 2 diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/service.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/service.py index 557d1d9488dd..c526f10b031b 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/service.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/service.py @@ -815,6 +815,7 @@ class Status(proto.Enum): CANCELLED (7): Cancellation complete. """ + STATUS_UNSPECIFIED = 0 NOT_STARTED = 4 IN_PROGRESS = 5 @@ -845,6 +846,7 @@ class Stage(proto.Enum): CLEANUP (7): Cleanup. """ + STAGE_UNSPECIFIED = 0 ALLOYDB_PRECHECK = 1 PG_UPGRADE_CHECK = 2 @@ -958,12 +960,12 @@ class ClusterUpgradeDetails(proto.Message): number=4, enum=resources.DatabaseVersion, ) - stage_info: MutableSequence[ - "UpgradeClusterResponse.StageInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="UpgradeClusterResponse.StageInfo", + stage_info: MutableSequence["UpgradeClusterResponse.StageInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="UpgradeClusterResponse.StageInfo", + ) ) instance_upgrade_details: MutableSequence[ "UpgradeClusterResponse.InstanceUpgradeDetails" @@ -982,12 +984,12 @@ class ClusterUpgradeDetails(proto.Message): proto.STRING, number=2, ) - cluster_upgrade_details: MutableSequence[ - ClusterUpgradeDetails - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ClusterUpgradeDetails, + cluster_upgrade_details: MutableSequence[ClusterUpgradeDetails] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ClusterUpgradeDetails, + ) ) @@ -1491,12 +1493,12 @@ class CreateInstanceRequests(proto.Message): to be created. This list should not be empty. """ - create_instance_requests: MutableSequence[ - "CreateInstanceRequest" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CreateInstanceRequest", + create_instance_requests: MutableSequence["CreateInstanceRequest"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CreateInstanceRequest", + ) ) @@ -1586,13 +1588,13 @@ class BatchCreateInstancesMetadata(proto.Message): proto.STRING, number=1, ) - instance_statuses: MutableMapping[ - str, "BatchCreateInstanceStatus" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=2, - message="BatchCreateInstanceStatus", + instance_statuses: MutableMapping[str, "BatchCreateInstanceStatus"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=2, + message="BatchCreateInstanceStatus", + ) ) @@ -1666,6 +1668,7 @@ class State(proto.Enum): was rolled back and deleted due to some other failure during BatchCreateInstances operation. """ + STATE_UNSPECIFIED = 0 PENDING_CREATE = 1 READY = 2 @@ -1918,6 +1921,7 @@ class FaultType(proto.Enum): STOP_VM (1): Stop the VM """ + FAULT_TYPE_UNSPECIFIED = 0 STOP_VM = 1 @@ -2132,6 +2136,7 @@ class Status(proto.Enum): https://google.aip.dev/193 but will be returned as part of this message. """ + STATUS_UNSPECIFIED = 0 OK = 1 PARTIAL = 2 @@ -2486,12 +2491,12 @@ class ListSupportedDatabaseFlagsResponse(proto.Message): def raw_page(self): return self - supported_database_flags: MutableSequence[ - resources.SupportedDatabaseFlag - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.SupportedDatabaseFlag, + supported_database_flags: MutableSequence[resources.SupportedDatabaseFlag] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.SupportedDatabaseFlag, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -2786,6 +2791,7 @@ class State(proto.Enum): The promote operation is completed and the database is available for write. """ + STATE_UNSPECIFIED = 0 PROMOTE_CLUSTER_AVAILABLE_FOR_READ = 1 PROMOTE_CLUSTER_AVAILABLE_FOR_WRITE = 2 diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/__init__.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/__init__.py index 95cf3f76da5f..e17512954ffa 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/__init__.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.alloy_db_admin import AlloyDBAdminAsyncClient, AlloyDBAdminClient from .services.alloy_dbcsql_admin import ( AlloyDBCSQLAdminAsyncClient, diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/async_client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/async_client.py index ebfc0f3f97bc..792b5ddbcd67 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/async_client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1beta import gapic_version as package_version @@ -46,13 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1beta.services.alloy_db_admin import pagers from google.cloud.alloydb_v1beta.types import ( @@ -155,7 +157,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AlloyDBAdminAsyncClient: The constructed client. """ - return AlloyDBAdminClient.from_service_account_info.__func__(AlloyDBAdminAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AlloyDBAdminClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AlloyDBAdminAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -171,7 +176,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AlloyDBAdminAsyncClient: The constructed client. """ - return AlloyDBAdminClient.from_service_account_file.__func__(AlloyDBAdminAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AlloyDBAdminClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AlloyDBAdminAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/client.py index cd785417defb..477d6f002f3e 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1beta import gapic_version as package_version @@ -63,13 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1beta.services.alloy_db_admin import pagers from google.cloud.alloydb_v1beta.types import ( @@ -865,11 +867,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AlloyDBAdminClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AlloyDBAdminClient._read_environment_variables() + ) self._client_cert_source = AlloyDBAdminClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -904,8 +904,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AlloyDBAdminTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/pagers.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/pagers.py index e2a7b75fb5ac..afb3a4c27b8c 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/pagers.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/base.py index e560401abd8a..cf4e4bc918fd 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.alloydb_v1beta import gapic_version as package_version from google.cloud.alloydb_v1beta.types import resources, service @@ -861,13 +863,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc.py index 85f4699daec4..58ac88b797c1 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.alloydb_v1beta.types import resources, service @@ -1123,12 +1125,12 @@ def list_supported_database_flags( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_supported_database_flags" not in self._stubs: - self._stubs[ - "list_supported_database_flags" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1beta.AlloyDBAdmin/ListSupportedDatabaseFlags", - request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, - response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + self._stubs["list_supported_database_flags"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1beta.AlloyDBAdmin/ListSupportedDatabaseFlags", + request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, + response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + ) ) return self._stubs["list_supported_database_flags"] @@ -1160,12 +1162,12 @@ def generate_client_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_client_certificate" not in self._stubs: - self._stubs[ - "generate_client_certificate" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1beta.AlloyDBAdmin/GenerateClientCertificate", - request_serializer=service.GenerateClientCertificateRequest.serialize, - response_deserializer=service.GenerateClientCertificateResponse.deserialize, + self._stubs["generate_client_certificate"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1beta.AlloyDBAdmin/GenerateClientCertificate", + request_serializer=service.GenerateClientCertificateRequest.serialize, + response_deserializer=service.GenerateClientCertificateResponse.deserialize, + ) ) return self._stubs["generate_client_certificate"] diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc_asyncio.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc_asyncio.py index 3cdc7ff467a4..a98a6290f2ca 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc_asyncio.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1beta.types import resources, service @@ -1151,12 +1153,12 @@ def list_supported_database_flags( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_supported_database_flags" not in self._stubs: - self._stubs[ - "list_supported_database_flags" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1beta.AlloyDBAdmin/ListSupportedDatabaseFlags", - request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, - response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + self._stubs["list_supported_database_flags"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1beta.AlloyDBAdmin/ListSupportedDatabaseFlags", + request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, + response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + ) ) return self._stubs["list_supported_database_flags"] @@ -1188,12 +1190,12 @@ def generate_client_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_client_certificate" not in self._stubs: - self._stubs[ - "generate_client_certificate" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1beta.AlloyDBAdmin/GenerateClientCertificate", - request_serializer=service.GenerateClientCertificateRequest.serialize, - response_deserializer=service.GenerateClientCertificateResponse.deserialize, + self._stubs["generate_client_certificate"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1beta.AlloyDBAdmin/GenerateClientCertificate", + request_serializer=service.GenerateClientCertificateRequest.serialize, + response_deserializer=service.GenerateClientCertificateResponse.deserialize, + ) ) return self._stubs["generate_client_certificate"] diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest.py index af43a7755cf5..bead9dbdf12a 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest.py @@ -16,21 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.alloydb_v1beta.types import resources, service @@ -2453,9 +2455,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseBatchCreateInstances._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseBatchCreateInstances._get_http_options() request, metadata = self._interceptor.pre_batch_create_instances( request, metadata @@ -3213,9 +3213,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryCluster._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryCluster._get_http_options() request, metadata = self._interceptor.pre_create_secondary_cluster( request, metadata @@ -3368,9 +3366,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryInstance._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryInstance._get_http_options() request, metadata = self._interceptor.pre_create_secondary_instance( request, metadata @@ -4688,9 +4684,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseGenerateClientCertificate._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseGenerateClientCertificate._get_http_options() request, metadata = self._interceptor.pre_generate_client_certificate( request, metadata @@ -5148,9 +5142,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseGetConnectionInfo._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseGetConnectionInfo._get_http_options() request, metadata = self._interceptor.pre_get_connection_info( request, metadata @@ -6497,9 +6489,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseListSupportedDatabaseFlags._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseListSupportedDatabaseFlags._get_http_options() request, metadata = self._interceptor.pre_list_supported_database_flags( request, metadata @@ -6565,11 +6555,10 @@ def __call__( resp = self._interceptor.post_list_supported_database_flags(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_supported_database_flags_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_supported_database_flags_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -7259,9 +7248,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseSwitchoverCluster._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseSwitchoverCluster._get_http_options() request, metadata = self._interceptor.pre_switchover_cluster( request, metadata @@ -8164,7 +8151,9 @@ def create_secondary_cluster( ) -> Callable[[service.CreateSecondaryClusterRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSecondaryCluster(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecondaryCluster( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_secondary_instance( @@ -8172,7 +8161,9 @@ def create_secondary_instance( ) -> Callable[[service.CreateSecondaryInstanceRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSecondaryInstance(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecondaryInstance( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_user(self) -> Callable[[service.CreateUserRequest], resources.User]: @@ -8243,7 +8234,9 @@ def generate_client_certificate( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateClientCertificate(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateClientCertificate( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_backup(self) -> Callable[[service.GetBackupRequest], resources.Backup]: @@ -8336,7 +8329,9 @@ def list_supported_database_flags( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListSupportedDatabaseFlags(self._session, self._host, self._interceptor) # type: ignore + return self._ListSupportedDatabaseFlags( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_users( diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest_base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest_base.py index 574c36376aca..bafbea80ba20 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest_base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest_base.py @@ -17,13 +17,15 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.alloydb_v1beta.types import resources, service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/async_client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/async_client.py index 35dbfdd9dcb7..8c5896fe9171 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/async_client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1beta import gapic_version as package_version @@ -47,8 +47,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1beta.types import csql_service, resources, service @@ -131,7 +133,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AlloyDBCSQLAdminAsyncClient: The constructed client. """ - return AlloyDBCSQLAdminClient.from_service_account_info.__func__(AlloyDBCSQLAdminAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AlloyDBCSQLAdminClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AlloyDBCSQLAdminAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +152,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AlloyDBCSQLAdminAsyncClient: The constructed client. """ - return AlloyDBCSQLAdminClient.from_service_account_file.__func__(AlloyDBCSQLAdminAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AlloyDBCSQLAdminClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AlloyDBCSQLAdminAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/client.py index e0387fa5475e..bbe4a9e2094b 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1beta import gapic_version as package_version @@ -64,8 +64,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1beta.types import csql_service, resources, service @@ -84,9 +86,7 @@ class AlloyDBCSQLAdminClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AlloyDBCSQLAdminTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AlloyDBCSQLAdminTransport]] _transport_registry["grpc"] = AlloyDBCSQLAdminGrpcTransport _transport_registry["grpc_asyncio"] = AlloyDBCSQLAdminGrpcAsyncIOTransport _transport_registry["rest"] = AlloyDBCSQLAdminRestTransport @@ -719,11 +719,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AlloyDBCSQLAdminClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AlloyDBCSQLAdminClient._read_environment_variables() + ) self._client_cert_source = AlloyDBCSQLAdminClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -758,8 +756,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AlloyDBCSQLAdminTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/base.py index 18c87ceef091..d734eb1eaf37 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1beta import gapic_version as package_version from google.cloud.alloydb_v1beta.types import csql_service @@ -224,13 +226,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc.py index 699ce009e5d7..ed5d0c25af5b 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1beta.types import csql_service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc_asyncio.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc_asyncio.py index 5ab22889b08f..c1080166df9c 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc_asyncio.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1beta.types import csql_service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest.py index 9c488b3299d4..75def1049b10 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -485,9 +487,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseRestoreFromCloudSQL._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseRestoreFromCloudSQL._get_http_options() request, metadata = self._interceptor.pre_restore_from_cloud_sql( request, metadata @@ -785,9 +785,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_transcoded_request( @@ -923,9 +921,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1038,9 +1034,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1295,9 +1289,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest_base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest_base.py index 7f8b5122cdd8..9ffebd030b32 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest_base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/__init__.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/__init__.py index 2b5e40149a56..41050b818d59 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/__init__.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/__init__.py @@ -13,9 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .csql_resources import CloudSQLBackupRunSource -from .csql_service import RestoreFromCloudSQLRequest -from .data_model import SqlResult, SqlResultColumn, SqlResultRow, SqlResultValue +from .csql_resources import ( + CloudSQLBackupRunSource, +) +from .csql_service import ( + RestoreFromCloudSQLRequest, +) +from .data_model import ( + SqlResult, + SqlResultColumn, + SqlResultRow, + SqlResultValue, +) from .gemini import ( GCAEntitlementType, GCAInstanceConfig, diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/gemini.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/gemini.py index c0fd9c9754e6..87b6f873a894 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/gemini.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/gemini.py @@ -41,6 +41,7 @@ class GCAEntitlementType(proto.Enum): The resource is entitled to the GCA Standard Tier. """ + GCA_ENTITLEMENT_TYPE_UNSPECIFIED = 0 GCA_STANDARD = 1 diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py index b1bf3655eb4b..3899d17bf3c4 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py @@ -76,6 +76,7 @@ class InstanceView(proto.Enum): instance, this includes details of each node in the pool. """ + INSTANCE_VIEW_UNSPECIFIED = 0 INSTANCE_VIEW_BASIC = 1 INSTANCE_VIEW_FULL = 2 @@ -99,6 +100,7 @@ class ClusterView(proto.Enum): plus the earliest restorable time if continuous backups are enabled. May increase latency. """ + CLUSTER_VIEW_UNSPECIFIED = 0 CLUSTER_VIEW_BASIC = 1 CLUSTER_VIEW_CONTINUOUS_BACKUP = 2 @@ -124,6 +126,7 @@ class DatabaseVersion(proto.Enum): POSTGRES_18 (6): The database version is Postgres 18. """ + DATABASE_VERSION_UNSPECIFIED = 0 POSTGRES_13 = 1 POSTGRES_14 = 2 @@ -147,6 +150,7 @@ class SubscriptionType(proto.Enum): TRIAL (2): Trial subscription. """ + SUBSCRIPTION_TYPE_UNSPECIFIED = 0 STANDARD = 1 TRIAL = 2 @@ -200,6 +204,7 @@ class MigrationSourceType(proto.Enum): DMS source means the cluster was created via DMS migration job. """ + MIGRATION_SOURCE_TYPE_UNSPECIFIED = 0 DMS = 1 @@ -265,6 +270,7 @@ class Type(proto.Enum): is managed by the customer. KMS key versions will be populated. """ + TYPE_UNSPECIFIED = 0 GOOGLE_DEFAULT_ENCRYPTION = 1 CUSTOMER_MANAGED_ENCRYPTION = 2 @@ -319,6 +325,7 @@ class SslMode(proto.Enum): SSL connections are required. CA verification not enforced. """ + SSL_MODE_UNSPECIFIED = 0 SSL_MODE_ALLOW = 1 SSL_MODE_REQUIRE = 2 @@ -337,6 +344,7 @@ class CaSource(proto.Enum): Certificate Authority (CA) managed by the AlloyDB Cluster. """ + CA_SOURCE_UNSPECIFIED = 0 CA_SOURCE_MANAGED = 1 @@ -747,12 +755,12 @@ class DenyMaintenancePeriod(proto.Message): number=1, message=MaintenanceWindow, ) - deny_maintenance_periods: MutableSequence[ - DenyMaintenancePeriod - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=DenyMaintenancePeriod, + deny_maintenance_periods: MutableSequence[DenyMaintenancePeriod] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=DenyMaintenancePeriod, + ) ) @@ -980,6 +988,7 @@ class State(proto.Enum): PROMOTING (9): The cluster is being promoted. """ + STATE_UNSPECIFIED = 0 READY = 1 STOPPED = 2 @@ -1004,6 +1013,7 @@ class ClusterType(proto.Enum): Secondary cluster that is replicating from another region. This only supports read. """ + CLUSTER_TYPE_UNSPECIFIED = 0 PRIMARY = 1 SECONDARY = 2 @@ -1497,6 +1507,7 @@ class State(proto.Enum): PROMOTING (9): The instance is being promoted. """ + STATE_UNSPECIFIED = 0 READY = 1 STOPPED = 2 @@ -1529,6 +1540,7 @@ class InstanceType(proto.Enum): only. SECONDARY instance is a cross-region read replica """ + INSTANCE_TYPE_UNSPECIFIED = 0 PRIMARY = 1 READ_POOL = 2 @@ -1550,6 +1562,7 @@ class AvailabilityType(proto.Enum): REGIONAL (2): Regional (or Highly) available instance. """ + AVAILABILITY_TYPE_UNSPECIFIED = 0 ZONAL = 1 REGIONAL = 2 @@ -1565,6 +1578,7 @@ class ActivationPolicy(proto.Enum): NEVER (2): The instance is not running. """ + ACTIVATION_POLICY_UNSPECIFIED = 0 ALWAYS = 1 NEVER = 2 @@ -1833,6 +1847,7 @@ class Mode(proto.Enum): Performs a forced update when applicable. This will be fast but may incur a downtime. """ + MODE_UNSPECIFIED = 0 DEFAULT = 1 FORCE_APPLY = 2 @@ -1993,19 +2008,19 @@ class PscInstanceConfig(proto.Message): proto.STRING, number=7, ) - psc_interface_configs: MutableSequence[ - "Instance.PscInterfaceConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="Instance.PscInterfaceConfig", + psc_interface_configs: MutableSequence["Instance.PscInterfaceConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="Instance.PscInterfaceConfig", + ) ) - psc_auto_connections: MutableSequence[ - "Instance.PscAutoConnectionConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message="Instance.PscAutoConnectionConfig", + psc_auto_connections: MutableSequence["Instance.PscAutoConnectionConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message="Instance.PscAutoConnectionConfig", + ) ) class InstanceNetworkConfig(proto.Message): @@ -2445,6 +2460,7 @@ class State(proto.Enum): DELETING (4): The backup is being deleted. """ + STATE_UNSPECIFIED = 0 READY = 1 CREATING = 2 @@ -2469,6 +2485,7 @@ class Type(proto.Enum): backups scheduler due to a continuous backup policy. """ + TYPE_UNSPECIFIED = 0 ON_DEMAND = 1 AUTOMATED = 2 @@ -2700,6 +2717,7 @@ class ValueType(proto.Enum): Denotes that the flag does not accept any values. """ + VALUE_TYPE_UNSPECIFIED = 0 STRING = 1 INTEGER = 2 @@ -2718,6 +2736,7 @@ class Scope(proto.Enum): CONNECTION_POOL (2): The flag is a connection pool flag. """ + SCOPE_UNSPECIFIED = 0 DATABASE = 1 CONNECTION_POOL = 2 @@ -2850,6 +2869,7 @@ class UserType(proto.Enum): Database user that can authenticate via IAM-Based authentication. """ + USER_TYPE_UNSPECIFIED = 0 ALLOYDB_BUILT_IN = 1 ALLOYDB_IAM_USER = 2 diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/service.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/service.py index 9cad8c644420..9f433882a57c 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/service.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/service.py @@ -815,6 +815,7 @@ class Status(proto.Enum): CANCELLED (7): Cancellation complete. """ + STATUS_UNSPECIFIED = 0 NOT_STARTED = 4 IN_PROGRESS = 5 @@ -845,6 +846,7 @@ class Stage(proto.Enum): CLEANUP (7): Cleanup. """ + STAGE_UNSPECIFIED = 0 ALLOYDB_PRECHECK = 1 PG_UPGRADE_CHECK = 2 @@ -958,12 +960,12 @@ class ClusterUpgradeDetails(proto.Message): number=4, enum=resources.DatabaseVersion, ) - stage_info: MutableSequence[ - "UpgradeClusterResponse.StageInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="UpgradeClusterResponse.StageInfo", + stage_info: MutableSequence["UpgradeClusterResponse.StageInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="UpgradeClusterResponse.StageInfo", + ) ) instance_upgrade_details: MutableSequence[ "UpgradeClusterResponse.InstanceUpgradeDetails" @@ -982,12 +984,12 @@ class ClusterUpgradeDetails(proto.Message): proto.STRING, number=2, ) - cluster_upgrade_details: MutableSequence[ - ClusterUpgradeDetails - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ClusterUpgradeDetails, + cluster_upgrade_details: MutableSequence[ClusterUpgradeDetails] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ClusterUpgradeDetails, + ) ) @@ -1491,12 +1493,12 @@ class CreateInstanceRequests(proto.Message): to be created. This list should not be empty. """ - create_instance_requests: MutableSequence[ - "CreateInstanceRequest" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CreateInstanceRequest", + create_instance_requests: MutableSequence["CreateInstanceRequest"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CreateInstanceRequest", + ) ) @@ -1586,13 +1588,13 @@ class BatchCreateInstancesMetadata(proto.Message): proto.STRING, number=1, ) - instance_statuses: MutableMapping[ - str, "BatchCreateInstanceStatus" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=2, - message="BatchCreateInstanceStatus", + instance_statuses: MutableMapping[str, "BatchCreateInstanceStatus"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=2, + message="BatchCreateInstanceStatus", + ) ) @@ -1666,6 +1668,7 @@ class State(proto.Enum): was rolled back and deleted due to some other failure during BatchCreateInstances operation. """ + STATE_UNSPECIFIED = 0 PENDING_CREATE = 1 READY = 2 @@ -1918,6 +1921,7 @@ class FaultType(proto.Enum): STOP_VM (1): Stop the VM """ + FAULT_TYPE_UNSPECIFIED = 0 STOP_VM = 1 @@ -2132,6 +2136,7 @@ class Status(proto.Enum): https://google.aip.dev/193 but will be returned as part of this message. """ + STATUS_UNSPECIFIED = 0 OK = 1 PARTIAL = 2 @@ -2486,12 +2491,12 @@ class ListSupportedDatabaseFlagsResponse(proto.Message): def raw_page(self): return self - supported_database_flags: MutableSequence[ - resources.SupportedDatabaseFlag - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.SupportedDatabaseFlag, + supported_database_flags: MutableSequence[resources.SupportedDatabaseFlag] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.SupportedDatabaseFlag, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -2786,6 +2791,7 @@ class State(proto.Enum): The promote operation is completed and the database is available for write. """ + STATE_UNSPECIFIED = 0 PROMOTE_CLUSTER_AVAILABLE_FOR_READ = 1 PROMOTE_CLUSTER_AVAILABLE_FOR_WRITE = 2 diff --git a/packages/google-cloud-alloydb/mypy.ini b/packages/google-cloud-alloydb/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-alloydb/mypy.ini +++ b/packages/google-cloud-alloydb/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-alloydb/noxfile.py b/packages/google-cloud-alloydb/noxfile.py index d7e47c1d5e3d..709327d04010 100644 --- a/packages/google-cloud-alloydb/noxfile.py +++ b/packages/google-cloud-alloydb/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py index 254e4e86d81c..e44985cba813 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,17 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,26 +62,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore -import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore -import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.cloud.alloydb_v1.services.alloy_db_admin import ( AlloyDBAdminAsyncClient, @@ -947,10 +949,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -995,10 +996,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1034,10 +1034,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1280,9 +1279,7 @@ def test_alloy_db_admin_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4735,9 +4732,9 @@ def test_switchover_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switchover_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switchover_cluster] = ( + mock_rpc + ) request = {} client.switchover_cluster(request) @@ -7337,9 +7334,9 @@ def test_batch_create_instances_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_instances] = ( + mock_rpc + ) request = {} client.batch_create_instances(request) @@ -8264,9 +8261,9 @@ def test_failover_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_instance] = ( + mock_rpc + ) request = {} client.failover_instance(request) @@ -8944,9 +8941,9 @@ def test_restart_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) @@ -12462,9 +12459,9 @@ def test_get_connection_info_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_info] = ( + mock_rpc + ) request = {} client.get_connection_info(request) @@ -16937,9 +16934,9 @@ def test_switchover_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switchover_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switchover_cluster] = ( + mock_rpc + ) request = {} client.switchover_cluster(request) @@ -18367,9 +18364,9 @@ def test_batch_create_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_instances] = ( + mock_rpc + ) request = {} client.batch_create_instances(request) @@ -18895,9 +18892,9 @@ def test_failover_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_instance] = ( + mock_rpc + ) request = {} client.failover_instance(request) @@ -19265,9 +19262,9 @@ def test_restart_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) @@ -21133,9 +21130,9 @@ def test_get_connection_info_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_info] = ( + mock_rpc + ) request = {} client.get_connection_info(request) diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_dbcsql_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_dbcsql_admin.py index a392843b626f..68d69375e44f 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_dbcsql_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_dbcsql_admin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +60,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.date_pb2 as date_pb2 # type: ignore -import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore -import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.cloud.alloydb_v1.services.alloy_dbcsql_admin import ( AlloyDBCSQLAdminAsyncClient, @@ -993,10 +995,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1042,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1080,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1335,9 +1334,7 @@ def test_alloy_dbcsql_admin_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1450,9 +1447,9 @@ def test_restore_from_cloud_sql_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_from_cloud_sql - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_from_cloud_sql] = ( + mock_rpc + ) request = {} client.restore_from_cloud_sql(request) @@ -1742,9 +1739,9 @@ def test_restore_from_cloud_sql_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_from_cloud_sql - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_from_cloud_sql] = ( + mock_rpc + ) request = {} client.restore_from_cloud_sql(request) diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py index 4448dd56f6b4..b2847a10a03d 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,17 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,26 +62,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore -import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore -import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.cloud.alloydb_v1alpha.services.alloy_db_admin import ( AlloyDBAdminAsyncClient, @@ -953,10 +955,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1001,10 +1002,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1040,10 +1040,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1286,9 +1285,7 @@ def test_alloy_db_admin_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4749,9 +4746,9 @@ def test_switchover_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switchover_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switchover_cluster] = ( + mock_rpc + ) request = {} client.switchover_cluster(request) @@ -7355,9 +7352,9 @@ def test_batch_create_instances_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_instances] = ( + mock_rpc + ) request = {} client.batch_create_instances(request) @@ -8282,9 +8279,9 @@ def test_failover_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_instance] = ( + mock_rpc + ) request = {} client.failover_instance(request) @@ -8962,9 +8959,9 @@ def test_restart_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) @@ -12494,9 +12491,9 @@ def test_get_connection_info_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_info] = ( + mock_rpc + ) request = {} client.get_connection_info(request) @@ -17342,9 +17339,9 @@ def test_switchover_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switchover_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switchover_cluster] = ( + mock_rpc + ) request = {} client.switchover_cluster(request) @@ -18772,9 +18769,9 @@ def test_batch_create_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_instances] = ( + mock_rpc + ) request = {} client.batch_create_instances(request) @@ -19300,9 +19297,9 @@ def test_failover_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_instance] = ( + mock_rpc + ) request = {} client.failover_instance(request) @@ -19670,9 +19667,9 @@ def test_restart_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) @@ -21547,9 +21544,9 @@ def test_get_connection_info_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_info] = ( + mock_rpc + ) request = {} client.get_connection_info(request) diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_dbcsql_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_dbcsql_admin.py index 057478b0ddf1..f8a60370c0b2 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_dbcsql_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_dbcsql_admin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +60,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.date_pb2 as date_pb2 # type: ignore -import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore -import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.cloud.alloydb_v1alpha.services.alloy_dbcsql_admin import ( AlloyDBCSQLAdminAsyncClient, @@ -994,10 +996,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1043,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1081,10 +1081,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1336,9 +1335,7 @@ def test_alloy_dbcsql_admin_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1451,9 +1448,9 @@ def test_restore_from_cloud_sql_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_from_cloud_sql - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_from_cloud_sql] = ( + mock_rpc + ) request = {} client.restore_from_cloud_sql(request) @@ -1743,9 +1740,9 @@ def test_restore_from_cloud_sql_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_from_cloud_sql - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_from_cloud_sql] = ( + mock_rpc + ) request = {} client.restore_from_cloud_sql(request) diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py index 8aa288a43882..6ff441dc74d1 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,17 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,26 +62,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore -import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore -import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.cloud.alloydb_v1beta.services.alloy_db_admin import ( AlloyDBAdminAsyncClient, @@ -953,10 +955,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1001,10 +1002,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1040,10 +1040,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1286,9 +1285,7 @@ def test_alloy_db_admin_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4745,9 +4742,9 @@ def test_switchover_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switchover_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switchover_cluster] = ( + mock_rpc + ) request = {} client.switchover_cluster(request) @@ -7347,9 +7344,9 @@ def test_batch_create_instances_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_instances] = ( + mock_rpc + ) request = {} client.batch_create_instances(request) @@ -8274,9 +8271,9 @@ def test_failover_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_instance] = ( + mock_rpc + ) request = {} client.failover_instance(request) @@ -8954,9 +8951,9 @@ def test_restart_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) @@ -12482,9 +12479,9 @@ def test_get_connection_info_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_info] = ( + mock_rpc + ) request = {} client.get_connection_info(request) @@ -17330,9 +17327,9 @@ def test_switchover_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switchover_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switchover_cluster] = ( + mock_rpc + ) request = {} client.switchover_cluster(request) @@ -18760,9 +18757,9 @@ def test_batch_create_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_instances] = ( + mock_rpc + ) request = {} client.batch_create_instances(request) @@ -19288,9 +19285,9 @@ def test_failover_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_instance] = ( + mock_rpc + ) request = {} client.failover_instance(request) @@ -19658,9 +19655,9 @@ def test_restart_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) @@ -21535,9 +21532,9 @@ def test_get_connection_info_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_info] = ( + mock_rpc + ) request = {} client.get_connection_info(request) diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_dbcsql_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_dbcsql_admin.py index 4857f2faebe9..b4e1d75b5b1d 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_dbcsql_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_dbcsql_admin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +60,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.date_pb2 as date_pb2 # type: ignore -import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore -import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.cloud.alloydb_v1beta.services.alloy_dbcsql_admin import ( AlloyDBCSQLAdminAsyncClient, @@ -994,10 +996,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1043,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1081,10 +1081,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1336,9 +1335,7 @@ def test_alloy_dbcsql_admin_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1451,9 +1448,9 @@ def test_restore_from_cloud_sql_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_from_cloud_sql - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_from_cloud_sql] = ( + mock_rpc + ) request = {} client.restore_from_cloud_sql(request) @@ -1743,9 +1740,9 @@ def test_restore_from_cloud_sql_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_from_cloud_sql - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_from_cloud_sql] = ( + mock_rpc + ) request = {} client.restore_from_cloud_sql(request) diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/__init__.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/__init__.py index e81f78f549a1..acfe1c26ab5c 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/__init__.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.api_gateway_service import ( ApiGatewayServiceAsyncClient, ApiGatewayServiceClient, diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/async_client.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/async_client.py index ab30abed69ce..2a9ac9d933aa 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/async_client.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigateway_v1 import gapic_version as package_version @@ -135,7 +135,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiGatewayServiceAsyncClient: The constructed client. """ - return ApiGatewayServiceClient.from_service_account_info.__func__(ApiGatewayServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ApiGatewayServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ApiGatewayServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -151,7 +154,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApiGatewayServiceAsyncClient: The constructed client. """ - return ApiGatewayServiceClient.from_service_account_file.__func__(ApiGatewayServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ApiGatewayServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ApiGatewayServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/client.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/client.py index a2addb2c5cb3..b3f61b0a34ef 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/client.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigateway_v1 import gapic_version as package_version @@ -84,9 +84,7 @@ class ApiGatewayServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ApiGatewayServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ApiGatewayServiceTransport]] _transport_registry["grpc"] = ApiGatewayServiceGrpcTransport _transport_registry["grpc_asyncio"] = ApiGatewayServiceGrpcAsyncIOTransport _transport_registry["rest"] = ApiGatewayServiceRestTransport @@ -725,11 +723,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiGatewayServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiGatewayServiceClient._read_environment_variables() + ) self._client_cert_source = ApiGatewayServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -764,8 +760,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiGatewayServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/pagers.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/pagers.py index e662872b3d54..1507450167c7 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/pagers.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/base.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/base.py index 33207eca2a63..353f5e054aac 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/base.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigateway_v1 import gapic_version as package_version from google.cloud.apigateway_v1.types import apigateway diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc.py index 3d1d90889ef9..a5bb254672a7 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apigateway_v1.types import apigateway diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py index cac8a22ca764..cc1e02bac4e9 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apigateway_v1.types import apigateway diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/rest.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/rest.py index a476e2893054..209869e97e9a 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/rest.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1258,9 +1258,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseCreateApiConfig._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseCreateApiConfig._get_http_options() request, metadata = self._interceptor.pre_create_api_config( request, metadata @@ -1413,9 +1411,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseCreateGateway._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseCreateGateway._get_http_options() request, metadata = self._interceptor.pre_create_gateway(request, metadata) transcoded_request = _BaseApiGatewayServiceRestTransport._BaseCreateGateway._get_transcoded_request( @@ -1711,9 +1707,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseDeleteApiConfig._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseDeleteApiConfig._get_http_options() request, metadata = self._interceptor.pre_delete_api_config( request, metadata @@ -1860,9 +1854,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseDeleteGateway._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseDeleteGateway._get_http_options() request, metadata = self._interceptor.pre_delete_gateway(request, metadata) transcoded_request = _BaseApiGatewayServiceRestTransport._BaseDeleteGateway._get_transcoded_request( @@ -2157,9 +2149,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseGetApiConfig._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseGetApiConfig._get_http_options() request, metadata = self._interceptor.pre_get_api_config(request, metadata) transcoded_request = _BaseApiGatewayServiceRestTransport._BaseGetApiConfig._get_transcoded_request( @@ -2456,9 +2446,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseListApiConfigs._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseListApiConfigs._get_http_options() request, metadata = self._interceptor.pre_list_api_configs( request, metadata @@ -2754,9 +2742,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseListGateways._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseListGateways._get_http_options() request, metadata = self._interceptor.pre_list_gateways(request, metadata) transcoded_request = _BaseApiGatewayServiceRestTransport._BaseListGateways._get_transcoded_request( @@ -3056,9 +3042,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseUpdateApiConfig._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseUpdateApiConfig._get_http_options() request, metadata = self._interceptor.pre_update_api_config( request, metadata @@ -3211,9 +3195,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseUpdateGateway._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseUpdateGateway._get_http_options() request, metadata = self._interceptor.pre_update_gateway(request, metadata) transcoded_request = _BaseApiGatewayServiceRestTransport._BaseUpdateGateway._get_transcoded_request( diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/types/apigateway.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/types/apigateway.py index c28761f0283d..469dd2fe6bfc 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/types/apigateway.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/types/apigateway.py @@ -97,6 +97,7 @@ class State(proto.Enum): UPDATING (5): API is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -217,6 +218,7 @@ class State(proto.Enum): downstream systems. API Configs in this state cannot be used by Gateways. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -394,6 +396,7 @@ class State(proto.Enum): UPDATING (5): Gateway is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -847,6 +850,7 @@ class ConfigView(proto.Enum): FULL (2): Include configuration source files. """ + CONFIG_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 diff --git a/packages/google-cloud-api-gateway/mypy.ini b/packages/google-cloud-api-gateway/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-api-gateway/mypy.ini +++ b/packages/google-cloud-api-gateway/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-api-gateway/noxfile.py b/packages/google-cloud-api-gateway/noxfile.py index 377d5a2e2d64..9b4245ca9746 100644 --- a/packages/google-cloud-api-gateway/noxfile.py +++ b/packages/google-cloud-api-gateway/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-api-gateway/tests/unit/gapic/apigateway_v1/test_api_gateway_service.py b/packages/google-cloud-api-gateway/tests/unit/gapic/apigateway_v1/test_api_gateway_service.py index afc1f03869f1..09bf0ea0a843 100644 --- a/packages/google-cloud-api-gateway/tests/unit/gapic/apigateway_v1/test_api_gateway_service.py +++ b/packages/google-cloud-api-gateway/tests/unit/gapic/apigateway_v1/test_api_gateway_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.apigateway_v1.services.api_gateway_service import ( ApiGatewayServiceAsyncClient, @@ -991,10 +991,9 @@ def test_api_gateway_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1038,9 @@ def test_api_gateway_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1078,10 +1076,9 @@ def test_api_gateway_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1333,9 +1330,7 @@ def test_api_gateway_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5178,9 +5173,9 @@ def test_list_api_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_configs] = ( + mock_rpc + ) request = {} client.list_api_configs(request) @@ -6041,9 +6036,9 @@ def test_create_api_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_config] = ( + mock_rpc + ) request = {} client.create_api_config(request) @@ -6400,9 +6395,9 @@ def test_update_api_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_config] = ( + mock_rpc + ) request = {} client.update_api_config(request) @@ -6753,9 +6748,9 @@ def test_delete_api_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_config] = ( + mock_rpc + ) request = {} client.delete_api_config(request) @@ -9006,9 +9001,9 @@ def test_list_api_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_configs] = ( + mock_rpc + ) request = {} client.list_api_configs(request) @@ -9448,9 +9443,9 @@ def test_create_api_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_config] = ( + mock_rpc + ) request = {} client.create_api_config(request) @@ -9656,9 +9651,9 @@ def test_update_api_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_config] = ( + mock_rpc + ) request = {} client.update_api_config(request) @@ -9839,9 +9834,9 @@ def test_delete_api_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_config] = ( + mock_rpc + ) request = {} client.delete_api_config(request) diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/__init__.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/__init__.py index 6f44b492ed7d..25510b1ffc99 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/__init__.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.api_keys import ApiKeysAsyncClient, ApiKeysClient from .types.apikeys import ( CreateKeyRequest, diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/async_client.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/async_client.py index b15a282c9333..5d61666845a1 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/async_client.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.api_keys_v2 import gapic_version as package_version @@ -46,10 +46,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.api_keys_v2.services.api_keys import pagers from google.cloud.api_keys_v2.types import apikeys, resources @@ -112,7 +112,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiKeysAsyncClient: The constructed client. """ - return ApiKeysClient.from_service_account_info.__func__(ApiKeysAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ApiKeysClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ApiKeysAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -128,7 +131,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApiKeysAsyncClient: The constructed client. """ - return ApiKeysClient.from_service_account_file.__func__(ApiKeysAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ApiKeysClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ApiKeysAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/client.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/client.py index 8962fb13722e..2a7713d2680d 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/client.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.api_keys_v2 import gapic_version as package_version @@ -63,10 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.api_keys_v2.services.api_keys import pagers from google.cloud.api_keys_v2.types import apikeys, resources @@ -625,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiKeysClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiKeysClient._read_environment_variables() + ) self._client_cert_source = ApiKeysClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiKeysTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/pagers.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/pagers.py index 96ed583cb381..c9e500261b5a 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/pagers.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/base.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/base.py index 8b8d9a46a08b..4e6f9956c636 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/base.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.api_keys_v2 import gapic_version as package_version from google.cloud.api_keys_v2.types import apikeys, resources diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc.py index 7a3c328b5b9c..b1b35bd63d45 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.api_keys_v2.types import apikeys, resources diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc_asyncio.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc_asyncio.py index 4a708509067e..c9301035706b 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc_asyncio.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.api_keys_v2.types import apikeys, resources diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/rest.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/rest.py index af5db9c2fda8..f444b75f9312 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/rest.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-api-keys/mypy.ini b/packages/google-cloud-api-keys/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-api-keys/mypy.ini +++ b/packages/google-cloud-api-keys/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-api-keys/noxfile.py b/packages/google-cloud-api-keys/noxfile.py index abc9118a54fe..3cd570b50825 100644 --- a/packages/google-cloud-api-keys/noxfile.py +++ b/packages/google-cloud-api-keys/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-api-keys/tests/unit/gapic/api_keys_v2/test_api_keys.py b/packages/google-cloud-api-keys/tests/unit/gapic/api_keys_v2/test_api_keys.py index e88baeb0f990..67c89912e06f 100644 --- a/packages/google-cloud-api-keys/tests/unit/gapic/api_keys_v2/test_api_keys.py +++ b/packages/google-cloud-api-keys/tests/unit/gapic/api_keys_v2/test_api_keys.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.api_keys_v2.services.api_keys import ( ApiKeysAsyncClient, @@ -911,10 +911,9 @@ def test_api_keys_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +958,9 @@ def test_api_keys_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +996,9 @@ def test_api_keys_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1230,9 +1227,7 @@ def test_api_keys_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/__init__.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/__init__.py index 3a16090e36a2..215bbef488d0 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/__init__.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.connection_service import ( ConnectionServiceAsyncClient, ConnectionServiceClient, diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/async_client.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/async_client.py index 20d5e0deda42..0439e0ab6fe4 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/async_client.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigeeconnect_v1 import gapic_version as package_version @@ -115,7 +115,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConnectionServiceAsyncClient: The constructed client. """ - return ConnectionServiceClient.from_service_account_info.__func__(ConnectionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConnectionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConnectionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +134,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConnectionServiceAsyncClient: The constructed client. """ - return ConnectionServiceClient.from_service_account_file.__func__(ConnectionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConnectionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ConnectionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/client.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/client.py index cf88899a49a3..96d087252698 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/client.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigeeconnect_v1 import gapic_version as package_version @@ -77,9 +77,7 @@ class ConnectionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConnectionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConnectionServiceTransport]] _transport_registry["grpc"] = ConnectionServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConnectionServiceGrpcAsyncIOTransport @@ -619,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConnectionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConnectionServiceClient._read_environment_variables() + ) self._client_cert_source = ConnectionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -658,8 +654,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConnectionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/pagers.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/pagers.py index 43bda5f6f142..affb49f82a67 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/pagers.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/base.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/base.py index 65951042774e..42e01ef5ed1d 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/base.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigeeconnect_v1 import gapic_version as package_version from google.cloud.apigeeconnect_v1.types import connection diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc.py index 3e4e1c8ce834..87c7323bd970 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.apigeeconnect_v1.types import connection diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc_asyncio.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc_asyncio.py index e4ec8ffb333d..aa3440968d31 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apigeeconnect_v1.types import connection diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/async_client.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/async_client.py index 1c348ed96098..758b11f16cdb 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/async_client.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigeeconnect_v1 import gapic_version as package_version @@ -109,7 +109,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TetherAsyncClient: The constructed client. """ - return TetherClient.from_service_account_info.__func__(TetherAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + TetherClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(TetherAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -125,7 +128,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TetherAsyncClient: The constructed client. """ - return TetherClient.from_service_account_file.__func__(TetherAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + TetherClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(TetherAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/client.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/client.py index 072866b396be..5357fb9e2418 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/client.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigeeconnect_v1 import gapic_version as package_version @@ -601,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TetherClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TetherClient._read_environment_variables() + ) self._client_cert_source = TetherClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TetherTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/base.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/base.py index 7eec0c72bce9..1fb20efdb197 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/base.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigeeconnect_v1 import gapic_version as package_version from google.cloud.apigeeconnect_v1.types import tether diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc.py index d7fd02efa1d6..8a489a19df2e 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.apigeeconnect_v1.types import tether diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc_asyncio.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc_asyncio.py index 49defc8fea59..5b102ef520e7 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc_asyncio.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apigeeconnect_v1.types import tether diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/types/tether.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/types/tether.py index 9fd9fa983127..3d1e40ce28a6 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/types/tether.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/types/tether.py @@ -49,6 +49,7 @@ class Action(proto.Enum): Indicates that agent should open a new stream. """ + ACTION_UNSPECIFIED = 0 OPEN_NEW_STREAM = 1 @@ -66,6 +67,7 @@ class TetherEndpoint(proto.Enum): APIGEE_MINT_RATING (3): Apigee Mint Rating endpoint. """ + TETHER_ENDPOINT_UNSPECIFIED = 0 APIGEE_MART = 1 APIGEE_RUNTIME = 2 @@ -81,6 +83,7 @@ class Scheme(proto.Enum): HTTPS (1): HTTPS protocol. """ + SCHEME_UNSPECIFIED = 0 HTTPS = 1 diff --git a/packages/google-cloud-apigee-connect/mypy.ini b/packages/google-cloud-apigee-connect/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-apigee-connect/mypy.ini +++ b/packages/google-cloud-apigee-connect/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-apigee-connect/noxfile.py b/packages/google-cloud-apigee-connect/noxfile.py index 683b961dd114..559cf4e5abf1 100644 --- a/packages/google-cloud-apigee-connect/noxfile.py +++ b/packages/google-cloud-apigee-connect/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_connection_service.py b/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_connection_service.py index 6f939f051966..a3fe88228321 100644 --- a/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_connection_service.py +++ b/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_connection_service.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,11 +40,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -949,10 +955,9 @@ def test_connection_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1002,9 @@ def test_connection_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1036,10 +1040,9 @@ def test_connection_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1284,9 +1287,7 @@ def test_connection_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1395,9 +1396,9 @@ def test_list_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) diff --git a/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_tether.py b/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_tether.py index fd0135694eba..89a30f39f0be 100644 --- a/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_tether.py +++ b/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_tether.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,17 +40,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.apigeeconnect_v1.services.tether import ( TetherAsyncClient, @@ -878,10 +884,9 @@ def test_tether_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -926,10 +931,9 @@ def test_tether_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +969,9 @@ def test_tether_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1195,9 +1198,7 @@ def test_tether_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1311,9 +1312,9 @@ async def test_egress_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.egress - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.egress] = ( + mock_rpc + ) request = [{}] await client.egress(request) diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/__init__.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/__init__.py index f37e9f9984a0..8ee0c62fa77e 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/__init__.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.provisioning import ProvisioningAsyncClient, ProvisioningClient from .services.registry import RegistryAsyncClient, RegistryClient from .types.provisioning_service import ( diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/async_client.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/async_client.py index cb63ac039728..f2815a419afa 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/async_client.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigee_registry_v1 import gapic_version as package_version @@ -46,12 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apigee_registry_v1.types import provisioning_service @@ -119,7 +121,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ProvisioningAsyncClient: The constructed client. """ - return ProvisioningClient.from_service_account_info.__func__(ProvisioningAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ProvisioningClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ProvisioningAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +140,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ProvisioningAsyncClient: The constructed client. """ - return ProvisioningClient.from_service_account_file.__func__(ProvisioningAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ProvisioningClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ProvisioningAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/client.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/client.py index a1c852958636..4d20995d7df0 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/client.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigee_registry_v1 import gapic_version as package_version @@ -63,12 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apigee_registry_v1.types import provisioning_service @@ -628,11 +630,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProvisioningClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProvisioningClient._read_environment_variables() + ) self._client_cert_source = ProvisioningClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +667,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProvisioningTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/base.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/base.py index ac9ad9826be6..21908bec15b7 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/base.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigee_registry_v1 import gapic_version as package_version from google.cloud.apigee_registry_v1.types import provisioning_service @@ -267,13 +269,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc.py index fc9bf9c2109c..e4ca9064ca24 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apigee_registry_v1.types import provisioning_service diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc_asyncio.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc_asyncio.py index 9ebf2904b1ac..d34e586db240 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc_asyncio.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apigee_registry_v1.types import provisioning_service diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest.py index abe10eacfc4f..8bb0b7779add 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1725,9 +1727,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseProvisioningRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseProvisioningRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest_base.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest_base.py index bcd461cd5c1d..540c970c05c6 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest_base.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/async_client.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/async_client.py index af1dc17c017c..80c62972f5c7 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/async_client.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigee_registry_v1 import gapic_version as package_version @@ -45,13 +45,15 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_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.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apigee_registry_v1.services.registry import pagers from google.cloud.apigee_registry_v1.types import registry_models, registry_service @@ -124,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RegistryAsyncClient: The constructed client. """ - return RegistryClient.from_service_account_info.__func__(RegistryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + RegistryClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(RegistryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +145,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RegistryAsyncClient: The constructed client. """ - return RegistryClient.from_service_account_file.__func__(RegistryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + RegistryClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(RegistryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/client.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/client.py index e187a7b37294..70d0fe4c5c94 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/client.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigee_registry_v1 import gapic_version as package_version @@ -62,13 +62,15 @@ _LOGGER = std_logging.getLogger(__name__) import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_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.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apigee_registry_v1.services.registry import pagers from google.cloud.apigee_registry_v1.types import registry_models, registry_service @@ -725,11 +727,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegistryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegistryClient._read_environment_variables() + ) self._client_cert_source = RegistryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -764,8 +764,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegistryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/pagers.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/pagers.py index b49005e19001..35fa5da74055 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/pagers.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -693,7 +693,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -769,7 +769,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -849,7 +849,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -927,7 +927,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1009,7 +1009,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1085,7 +1085,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/base.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/base.py index 29b2a4d2266b..2d2f111b2d1c 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/base.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/base.py @@ -18,18 +18,20 @@ import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.apigee_registry_v1 import gapic_version as package_version from google.cloud.apigee_registry_v1.types import registry_models, registry_service @@ -1129,13 +1131,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc.py index 4d4d1b7db610..49030f6dd07a 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.apigee_registry_v1.types import registry_models, registry_service @@ -1039,12 +1041,12 @@ def tag_api_deployment_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "tag_api_deployment_revision" not in self._stubs: - self._stubs[ - "tag_api_deployment_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.apigeeregistry.v1.Registry/TagApiDeploymentRevision", - request_serializer=registry_service.TagApiDeploymentRevisionRequest.serialize, - response_deserializer=registry_models.ApiDeployment.deserialize, + self._stubs["tag_api_deployment_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apigeeregistry.v1.Registry/TagApiDeploymentRevision", + request_serializer=registry_service.TagApiDeploymentRevisionRequest.serialize, + response_deserializer=registry_models.ApiDeployment.deserialize, + ) ) return self._stubs["tag_api_deployment_revision"] @@ -1072,12 +1074,12 @@ def list_api_deployment_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_api_deployment_revisions" not in self._stubs: - self._stubs[ - "list_api_deployment_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.apigeeregistry.v1.Registry/ListApiDeploymentRevisions", - request_serializer=registry_service.ListApiDeploymentRevisionsRequest.serialize, - response_deserializer=registry_service.ListApiDeploymentRevisionsResponse.deserialize, + self._stubs["list_api_deployment_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apigeeregistry.v1.Registry/ListApiDeploymentRevisions", + request_serializer=registry_service.ListApiDeploymentRevisionsRequest.serialize, + response_deserializer=registry_service.ListApiDeploymentRevisionsResponse.deserialize, + ) ) return self._stubs["list_api_deployment_revisions"] @@ -1133,12 +1135,12 @@ def delete_api_deployment_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_api_deployment_revision" not in self._stubs: - self._stubs[ - "delete_api_deployment_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.apigeeregistry.v1.Registry/DeleteApiDeploymentRevision", - request_serializer=registry_service.DeleteApiDeploymentRevisionRequest.serialize, - response_deserializer=registry_models.ApiDeployment.deserialize, + self._stubs["delete_api_deployment_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apigeeregistry.v1.Registry/DeleteApiDeploymentRevision", + request_serializer=registry_service.DeleteApiDeploymentRevisionRequest.serialize, + response_deserializer=registry_models.ApiDeployment.deserialize, + ) ) return self._stubs["delete_api_deployment_revision"] diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc_asyncio.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc_asyncio.py index 638e64c60194..434ee227aee4 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc_asyncio.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc_asyncio.py @@ -17,25 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apigee_registry_v1.types import registry_models, registry_service @@ -1070,12 +1072,12 @@ def tag_api_deployment_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "tag_api_deployment_revision" not in self._stubs: - self._stubs[ - "tag_api_deployment_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.apigeeregistry.v1.Registry/TagApiDeploymentRevision", - request_serializer=registry_service.TagApiDeploymentRevisionRequest.serialize, - response_deserializer=registry_models.ApiDeployment.deserialize, + self._stubs["tag_api_deployment_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apigeeregistry.v1.Registry/TagApiDeploymentRevision", + request_serializer=registry_service.TagApiDeploymentRevisionRequest.serialize, + response_deserializer=registry_models.ApiDeployment.deserialize, + ) ) return self._stubs["tag_api_deployment_revision"] @@ -1103,12 +1105,12 @@ def list_api_deployment_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_api_deployment_revisions" not in self._stubs: - self._stubs[ - "list_api_deployment_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.apigeeregistry.v1.Registry/ListApiDeploymentRevisions", - request_serializer=registry_service.ListApiDeploymentRevisionsRequest.serialize, - response_deserializer=registry_service.ListApiDeploymentRevisionsResponse.deserialize, + self._stubs["list_api_deployment_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apigeeregistry.v1.Registry/ListApiDeploymentRevisions", + request_serializer=registry_service.ListApiDeploymentRevisionsRequest.serialize, + response_deserializer=registry_service.ListApiDeploymentRevisionsResponse.deserialize, + ) ) return self._stubs["list_api_deployment_revisions"] @@ -1165,12 +1167,12 @@ def delete_api_deployment_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_api_deployment_revision" not in self._stubs: - self._stubs[ - "delete_api_deployment_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.apigeeregistry.v1.Registry/DeleteApiDeploymentRevision", - request_serializer=registry_service.DeleteApiDeploymentRevisionRequest.serialize, - response_deserializer=registry_models.ApiDeployment.deserialize, + self._stubs["delete_api_deployment_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apigeeregistry.v1.Registry/DeleteApiDeploymentRevision", + request_serializer=registry_service.DeleteApiDeploymentRevisionRequest.serialize, + response_deserializer=registry_models.ApiDeployment.deserialize, + ) ) return self._stubs["delete_api_deployment_revision"] diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest.py index 3eab469c3ac2..5bb18ffc0993 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest.py @@ -16,22 +16,24 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.apigee_registry_v1.types import registry_models, registry_service @@ -3277,9 +3279,7 @@ def __call__( """ - http_options = ( - _BaseRegistryRestTransport._BaseDeleteApiDeploymentRevision._get_http_options() - ) + http_options = _BaseRegistryRestTransport._BaseDeleteApiDeploymentRevision._get_http_options() request, metadata = self._interceptor.pre_delete_api_deployment_revision( request, metadata @@ -3343,11 +3343,10 @@ def __call__( resp = self._interceptor.post_delete_api_deployment_revision(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_api_deployment_revision_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_api_deployment_revision_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3551,9 +3550,7 @@ def __call__( """ - http_options = ( - _BaseRegistryRestTransport._BaseDeleteApiSpecRevision._get_http_options() - ) + http_options = _BaseRegistryRestTransport._BaseDeleteApiSpecRevision._get_http_options() request, metadata = self._interceptor.pre_delete_api_spec_revision( request, metadata @@ -5085,9 +5082,7 @@ def __call__( """ - http_options = ( - _BaseRegistryRestTransport._BaseListApiDeploymentRevisions._get_http_options() - ) + http_options = _BaseRegistryRestTransport._BaseListApiDeploymentRevisions._get_http_options() request, metadata = self._interceptor.pre_list_api_deployment_revisions( request, metadata @@ -5151,11 +5146,10 @@ def __call__( resp = self._interceptor.post_list_api_deployment_revisions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_api_deployment_revisions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_api_deployment_revisions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6316,9 +6310,7 @@ def __call__( """ - http_options = ( - _BaseRegistryRestTransport._BaseRollbackApiDeployment._get_http_options() - ) + http_options = _BaseRegistryRestTransport._BaseRollbackApiDeployment._get_http_options() request, metadata = self._interceptor.pre_rollback_api_deployment( request, metadata @@ -6651,9 +6643,7 @@ def __call__( """ - http_options = ( - _BaseRegistryRestTransport._BaseTagApiDeploymentRevision._get_http_options() - ) + http_options = _BaseRegistryRestTransport._BaseTagApiDeploymentRevision._get_http_options() request, metadata = self._interceptor.pre_tag_api_deployment_revision( request, metadata @@ -7626,7 +7616,9 @@ def delete_api_deployment_revision( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteApiDeploymentRevision(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteApiDeploymentRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_api_spec( @@ -7729,7 +7721,9 @@ def list_api_deployment_revisions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListApiDeploymentRevisions(self._session, self._host, self._interceptor) # type: ignore + return self._ListApiDeploymentRevisions( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_api_deployments( @@ -7829,7 +7823,9 @@ def tag_api_deployment_revision( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._TagApiDeploymentRevision(self._session, self._host, self._interceptor) # type: ignore + return self._TagApiDeploymentRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def tag_api_spec_revision( diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest_base.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest_base.py index 531ff9303d42..20a351dac2dd 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest_base.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest_base.py @@ -18,13 +18,15 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.apigee_registry_v1.types import registry_models, registry_service diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/__init__.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/__init__.py index fad5524246d9..c895ae5fadad 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/__init__.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/__init__.py @@ -20,7 +20,13 @@ Instance, OperationMetadata, ) -from .registry_models import Api, ApiDeployment, ApiSpec, ApiVersion, Artifact +from .registry_models import ( + Api, + ApiDeployment, + ApiSpec, + ApiVersion, + Artifact, +) from .registry_service import ( CreateApiDeploymentRequest, CreateApiRequest, diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/provisioning_service.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/provisioning_service.py index 0c1604a3fb48..c69d7a3d4264 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/provisioning_service.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/provisioning_service.py @@ -196,6 +196,7 @@ class State(proto.Enum): The Instance encountered an error during a state change. """ + STATE_UNSPECIFIED = 0 INACTIVE = 1 CREATING = 2 diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/registry_service.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/registry_service.py index 5312aeeb8301..891ca2196c1a 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/registry_service.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/registry_service.py @@ -807,12 +807,12 @@ class ListApiDeploymentsResponse(proto.Message): def raw_page(self): return self - api_deployments: MutableSequence[ - registry_models.ApiDeployment - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=registry_models.ApiDeployment, + api_deployments: MutableSequence[registry_models.ApiDeployment] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=registry_models.ApiDeployment, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -999,12 +999,12 @@ class ListApiDeploymentRevisionsResponse(proto.Message): def raw_page(self): return self - api_deployments: MutableSequence[ - registry_models.ApiDeployment - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=registry_models.ApiDeployment, + api_deployments: MutableSequence[registry_models.ApiDeployment] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=registry_models.ApiDeployment, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-apigee-registry/mypy.ini b/packages/google-cloud-apigee-registry/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-apigee-registry/mypy.ini +++ b/packages/google-cloud-apigee-registry/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-apigee-registry/noxfile.py b/packages/google-cloud-apigee-registry/noxfile.py index 54d19c51eca7..92f068cae969 100644 --- a/packages/google-cloud-apigee-registry/noxfile.py +++ b/packages/google-cloud-apigee-registry/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_provisioning.py b/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_provisioning.py index 1855fcf5f0ee..bc094b4878d6 100644 --- a/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_provisioning.py +++ b/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_provisioning.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +57,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apigee_registry_v1.services.provisioning import ( ProvisioningAsyncClient, @@ -941,10 +943,9 @@ def test_provisioning_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +990,9 @@ def test_provisioning_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1028,9 @@ def test_provisioning_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1274,9 +1273,7 @@ def test_provisioning_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_registry.py b/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_registry.py index 7269ae8f0604..aa3516329585 100644 --- a/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_registry.py +++ b/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_registry.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,22 +44,29 @@ HAS_GOOGLE_AUTH_AIO = False import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apigee_registry_v1.services.registry import ( RegistryAsyncClient, @@ -916,10 +923,9 @@ def test_registry_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +970,9 @@ def test_registry_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1008,9 @@ def test_registry_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1235,9 +1239,7 @@ def test_registry_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3219,9 +3221,9 @@ def test_list_api_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_versions] = ( + mock_rpc + ) request = {} client.list_api_versions(request) @@ -4106,9 +4108,9 @@ def test_create_api_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_version] = ( + mock_rpc + ) request = {} client.create_api_version(request) @@ -4476,9 +4478,9 @@ def test_update_api_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_version] = ( + mock_rpc + ) request = {} client.update_api_version(request) @@ -4831,9 +4833,9 @@ def test_delete_api_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_version] = ( + mock_rpc + ) request = {} client.delete_api_version(request) @@ -6043,9 +6045,9 @@ def test_get_api_spec_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_spec_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_spec_contents] = ( + mock_rpc + ) request = {} client.get_api_spec_contents(request) @@ -7455,9 +7457,9 @@ def test_tag_api_spec_revision_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.tag_api_spec_revision - ] = mock_rpc + client._transport._wrapped_methods[client._transport.tag_api_spec_revision] = ( + mock_rpc + ) request = {} client.tag_api_spec_revision(request) @@ -8204,9 +8206,9 @@ def test_rollback_api_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.rollback_api_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.rollback_api_spec] = ( + mock_rpc + ) request = {} client.rollback_api_spec(request) @@ -8855,9 +8857,9 @@ def test_list_api_deployments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_deployments] = ( + mock_rpc + ) request = {} client.list_api_deployments(request) @@ -9415,9 +9417,9 @@ def test_get_api_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_deployment] = ( + mock_rpc + ) request = {} client.get_api_deployment(request) @@ -9792,9 +9794,9 @@ def test_create_api_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_deployment] = ( + mock_rpc + ) request = {} client.create_api_deployment(request) @@ -10183,9 +10185,9 @@ def test_update_api_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_deployment] = ( + mock_rpc + ) request = {} client.update_api_deployment(request) @@ -10549,9 +10551,9 @@ def test_delete_api_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_deployment] = ( + mock_rpc + ) request = {} client.delete_api_deployment(request) @@ -13165,9 +13167,9 @@ def test_get_artifact_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_artifact_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_artifact_contents] = ( + mock_rpc + ) request = {} client.get_artifact_contents(request) @@ -13868,9 +13870,9 @@ def test_replace_artifact_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.replace_artifact - ] = mock_rpc + client._transport._wrapped_methods[client._transport.replace_artifact] = ( + mock_rpc + ) request = {} client.replace_artifact(request) @@ -15449,9 +15451,9 @@ def test_list_api_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_versions] = ( + mock_rpc + ) request = {} client.list_api_versions(request) @@ -15891,9 +15893,9 @@ def test_create_api_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_version] = ( + mock_rpc + ) request = {} client.create_api_version(request) @@ -16102,9 +16104,9 @@ def test_update_api_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_version] = ( + mock_rpc + ) request = {} client.update_api_version(request) @@ -16301,9 +16303,9 @@ def test_delete_api_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_version] = ( + mock_rpc + ) request = {} client.delete_api_version(request) @@ -16925,9 +16927,9 @@ def test_get_api_spec_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_spec_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_spec_contents] = ( + mock_rpc + ) request = {} client.get_api_spec_contents(request) @@ -17687,9 +17689,9 @@ def test_tag_api_spec_revision_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.tag_api_spec_revision - ] = mock_rpc + client._transport._wrapped_methods[client._transport.tag_api_spec_revision] = ( + mock_rpc + ) request = {} client.tag_api_spec_revision(request) @@ -18029,9 +18031,9 @@ def test_rollback_api_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.rollback_api_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.rollback_api_spec] = ( + mock_rpc + ) request = {} client.rollback_api_spec(request) @@ -18351,9 +18353,9 @@ def test_list_api_deployments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_deployments] = ( + mock_rpc + ) request = {} client.list_api_deployments(request) @@ -18613,9 +18615,9 @@ def test_get_api_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_deployment] = ( + mock_rpc + ) request = {} client.get_api_deployment(request) @@ -18798,9 +18800,9 @@ def test_create_api_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_deployment] = ( + mock_rpc + ) request = {} client.create_api_deployment(request) @@ -19010,9 +19012,9 @@ def test_update_api_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_deployment] = ( + mock_rpc + ) request = {} client.update_api_deployment(request) @@ -19210,9 +19212,9 @@ def test_delete_api_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_deployment] = ( + mock_rpc + ) request = {} client.delete_api_deployment(request) @@ -20501,9 +20503,9 @@ def test_get_artifact_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_artifact_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_artifact_contents] = ( + mock_rpc + ) request = {} client.get_artifact_contents(request) @@ -20885,9 +20887,9 @@ def test_replace_artifact_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.replace_artifact - ] = mock_rpc + client._transport._wrapped_methods[client._transport.replace_artifact] = ( + mock_rpc + ) request = {} client.replace_artifact(request) diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/__init__.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/__init__.py index 0f7f978213f0..b7454ea3d969 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/__init__.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.api_hub import ApiHubAsyncClient, ApiHubClient from .services.api_hub_collect import ApiHubCollectAsyncClient, ApiHubCollectClient from .services.api_hub_curate import ApiHubCurateAsyncClient, ApiHubCurateClient diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/async_client.py index 073a0dca6cff..ef1760ed282b 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub import pagers from google.cloud.apihub_v1.types import apihub_service, common_fields @@ -124,7 +124,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiHubAsyncClient: The constructed client. """ - return ApiHubClient.from_service_account_info.__func__(ApiHubAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ApiHubClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ApiHubAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +143,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApiHubAsyncClient: The constructed client. """ - return ApiHubClient.from_service_account_file.__func__(ApiHubAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ApiHubClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ApiHubAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/client.py index 1d0a3d34b650..1d9e3fa72ffb 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub import pagers from google.cloud.apihub_v1.types import apihub_service, common_fields @@ -817,11 +817,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiHubClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiHubClient._read_environment_variables() + ) self._client_cert_source = ApiHubClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -856,8 +854,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiHubTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/pagers.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/pagers.py index 9b6140febab2..5d6ecc46025f 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/pagers.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1159,7 +1159,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1235,7 +1235,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/base.py index 047007656eeb..e551dd5ecb33 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import apihub_service, common_fields @@ -912,13 +912,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc.py index 5e99041aeb68..af7536543a18 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.apihub_v1.types import apihub_service, common_fields diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc_asyncio.py index 82113523f17b..7e4654a60bdd 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import apihub_service, common_fields diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest.py index f484f08a4109..a2763e950bd1 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.apihub_v1.types import apihub_service, common_fields diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest_base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest_base.py index 07a0f02a4133..4612fd03f9b3 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest_base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.apihub_v1.types import apihub_service, common_fields diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/async_client.py index d25a1e5e7f9a..a0c2c9951b74 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -138,7 +138,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiHubCollectAsyncClient: The constructed client. """ - return ApiHubCollectClient.from_service_account_info.__func__(ApiHubCollectAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ApiHubCollectClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ApiHubCollectAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +157,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApiHubCollectAsyncClient: The constructed client. """ - return ApiHubCollectClient.from_service_account_file.__func__(ApiHubCollectAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ApiHubCollectClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ApiHubCollectAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/client.py index 18fa06e94d2c..49ee40f1471f 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -797,11 +797,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiHubCollectClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiHubCollectClient._read_environment_variables() + ) self._client_cert_source = ApiHubCollectClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -836,8 +834,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiHubCollectTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/base.py index 0cb3a6bc851a..7cae984c266b 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import collect_service @@ -222,13 +222,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc.py index b9fb96133b93..26f51ba38869 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import collect_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc_asyncio.py index 5fc7f7333d73..f52c619571ad 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import collect_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/rest.py index 97667c688cab..2b89134bcb2b 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/async_client.py index f2e21ceb3e2d..2c59c7c62d79 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_curate import pagers from google.cloud.apihub_v1.types import curate_service @@ -120,7 +120,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiHubCurateAsyncClient: The constructed client. """ - return ApiHubCurateClient.from_service_account_info.__func__(ApiHubCurateAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ApiHubCurateClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ApiHubCurateAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +139,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApiHubCurateAsyncClient: The constructed client. """ - return ApiHubCurateClient.from_service_account_file.__func__(ApiHubCurateAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ApiHubCurateClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ApiHubCurateAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/client.py index 4d925d0e7a1e..b9fd7ade1ebb 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_curate import pagers from google.cloud.apihub_v1.types import curate_service @@ -649,11 +649,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiHubCurateClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiHubCurateClient._read_environment_variables() + ) self._client_cert_source = ApiHubCurateClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -688,8 +686,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiHubCurateTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/pagers.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/pagers.py index f290d270c004..fc97a986a28b 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/pagers.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/base.py index 2e42b2e9f65a..5e1f8427118a 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import curate_service @@ -277,13 +277,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc.py index f272133d3407..281de696e65f 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.apihub_v1.types import curate_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc_asyncio.py index d68765d3607a..840f26e28229 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import curate_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest.py index a3660d7d7eb0..ab474c981ff3 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.apihub_v1.types import curate_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest_base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest_base.py index 7db779589344..3c73828a39e2 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest_base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.apihub_v1.types import curate_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/async_client.py index d673281b411a..448dc070cfcb 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_dependencies import pagers from google.cloud.apihub_v1.types import apihub_service, common_fields @@ -122,7 +122,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiHubDependenciesAsyncClient: The constructed client. """ - return ApiHubDependenciesClient.from_service_account_info.__func__(ApiHubDependenciesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ApiHubDependenciesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ApiHubDependenciesAsyncClient, 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: ApiHubDependenciesAsyncClient: The constructed client. """ - return ApiHubDependenciesClient.from_service_account_file.__func__(ApiHubDependenciesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ApiHubDependenciesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ApiHubDependenciesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -176,7 +182,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ApiHubDependenciesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ApiHubDependenciesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ApiHubDependenciesTransport: diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/client.py index bcdfda99a1dd..507e83f935b1 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_dependencies import pagers from google.cloud.apihub_v1.types import apihub_service, common_fields @@ -83,9 +83,7 @@ class ApiHubDependenciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ApiHubDependenciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ApiHubDependenciesTransport]] _transport_registry["grpc"] = ApiHubDependenciesGrpcTransport _transport_registry["grpc_asyncio"] = ApiHubDependenciesGrpcAsyncIOTransport _transport_registry["rest"] = ApiHubDependenciesRestTransport @@ -655,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiHubDependenciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiHubDependenciesClient._read_environment_variables() + ) self._client_cert_source = ApiHubDependenciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiHubDependenciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/pagers.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/pagers.py index 63d33f7ec4be..0b6cafe65f8c 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/pagers.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/__init__.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/__init__.py index e94033b587e8..23d6083f6b35 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/__init__.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ApiHubDependenciesRestInterceptor, ApiHubDependenciesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ApiHubDependenciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ApiHubDependenciesTransport]] _transport_registry["grpc"] = ApiHubDependenciesGrpcTransport _transport_registry["grpc_asyncio"] = ApiHubDependenciesGrpcAsyncIOTransport _transport_registry["rest"] = ApiHubDependenciesRestTransport diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/base.py index b992c26fa81a..4628f0b1284c 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import apihub_service, common_fields @@ -295,13 +295,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc.py index 21a9a9d72273..df8d4d549002 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.apihub_v1.types import apihub_service, common_fields diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc_asyncio.py index d8bbfa55913c..5f626f0ba80c 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import apihub_service, common_fields diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest.py index ddab0b5be88c..1fb08d0bbc1e 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.apihub_v1.types import apihub_service, common_fields @@ -625,9 +625,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseCreateDependency._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseCreateDependency._get_http_options() request, metadata = self._interceptor.pre_create_dependency( request, metadata @@ -775,9 +773,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseDeleteDependency._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseDeleteDependency._get_http_options() request, metadata = self._interceptor.pre_delete_dependency( request, metadata @@ -896,9 +892,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseGetDependency._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseGetDependency._get_http_options() request, metadata = self._interceptor.pre_get_dependency(request, metadata) transcoded_request = _BaseApiHubDependenciesRestTransport._BaseGetDependency._get_transcoded_request( @@ -1046,9 +1040,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseListDependencies._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseListDependencies._get_http_options() request, metadata = self._interceptor.pre_list_dependencies( request, metadata @@ -1205,9 +1197,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseUpdateDependency._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseUpdateDependency._get_http_options() request, metadata = self._interceptor.pre_update_dependency( request, metadata @@ -1403,9 +1393,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseApiHubDependenciesRestTransport._BaseGetLocation._get_transcoded_request( @@ -1544,9 +1532,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseApiHubDependenciesRestTransport._BaseListLocations._get_transcoded_request( @@ -1683,9 +1669,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1803,9 +1787,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1921,9 +1903,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseApiHubDependenciesRestTransport._BaseGetOperation._get_transcoded_request( @@ -2062,9 +2042,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseApiHubDependenciesRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest_base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest_base.py index f38234490e8f..f315d88a2bf1 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest_base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.apihub_v1.types import apihub_service, common_fields diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/async_client.py index b7d1bcc41cd1..b4a7036dbe5a 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_discovery import pagers from google.cloud.apihub_v1.types import common_fields, discovery_service @@ -133,7 +133,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiHubDiscoveryAsyncClient: The constructed client. """ - return ApiHubDiscoveryClient.from_service_account_info.__func__(ApiHubDiscoveryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ApiHubDiscoveryClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ApiHubDiscoveryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +152,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApiHubDiscoveryAsyncClient: The constructed client. """ - return ApiHubDiscoveryClient.from_service_account_file.__func__(ApiHubDiscoveryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ApiHubDiscoveryClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ApiHubDiscoveryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/client.py index c534aae8fd10..bd89c36804d7 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_discovery import pagers from google.cloud.apihub_v1.types import common_fields, discovery_service @@ -82,9 +82,7 @@ class ApiHubDiscoveryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ApiHubDiscoveryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ApiHubDiscoveryTransport]] _transport_registry["grpc"] = ApiHubDiscoveryGrpcTransport _transport_registry["grpc_asyncio"] = ApiHubDiscoveryGrpcAsyncIOTransport _transport_registry["rest"] = ApiHubDiscoveryRestTransport @@ -676,11 +674,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiHubDiscoveryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiHubDiscoveryClient._read_environment_variables() + ) self._client_cert_source = ApiHubDiscoveryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -715,8 +711,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiHubDiscoveryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/pagers.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/pagers.py index 2c798ca38cfa..8e95cff5829e 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/pagers.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -147,7 +147,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -307,7 +307,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/base.py index 0203b82d1f68..e439f43ad29e 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import common_fields, discovery_service @@ -271,13 +271,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc.py index 3e2fe0fd46ed..609c550b1961 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import common_fields, discovery_service @@ -348,12 +348,12 @@ def list_discovered_api_observations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_discovered_api_observations" not in self._stubs: - self._stubs[ - "list_discovered_api_observations" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiObservations", - request_serializer=discovery_service.ListDiscoveredApiObservationsRequest.serialize, - response_deserializer=discovery_service.ListDiscoveredApiObservationsResponse.deserialize, + self._stubs["list_discovered_api_observations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiObservations", + request_serializer=discovery_service.ListDiscoveredApiObservationsRequest.serialize, + response_deserializer=discovery_service.ListDiscoveredApiObservationsResponse.deserialize, + ) ) return self._stubs["list_discovered_api_observations"] @@ -380,12 +380,12 @@ def get_discovered_api_observation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_discovered_api_observation" not in self._stubs: - self._stubs[ - "get_discovered_api_observation" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiObservation", - request_serializer=discovery_service.GetDiscoveredApiObservationRequest.serialize, - response_deserializer=common_fields.DiscoveredApiObservation.deserialize, + self._stubs["get_discovered_api_observation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiObservation", + request_serializer=discovery_service.GetDiscoveredApiObservationRequest.serialize, + response_deserializer=common_fields.DiscoveredApiObservation.deserialize, + ) ) return self._stubs["get_discovered_api_observation"] @@ -412,12 +412,12 @@ def list_discovered_api_operations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_discovered_api_operations" not in self._stubs: - self._stubs[ - "list_discovered_api_operations" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiOperations", - request_serializer=discovery_service.ListDiscoveredApiOperationsRequest.serialize, - response_deserializer=discovery_service.ListDiscoveredApiOperationsResponse.deserialize, + self._stubs["list_discovered_api_operations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiOperations", + request_serializer=discovery_service.ListDiscoveredApiOperationsRequest.serialize, + response_deserializer=discovery_service.ListDiscoveredApiOperationsResponse.deserialize, + ) ) return self._stubs["list_discovered_api_operations"] @@ -444,12 +444,12 @@ def get_discovered_api_operation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_discovered_api_operation" not in self._stubs: - self._stubs[ - "get_discovered_api_operation" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiOperation", - request_serializer=discovery_service.GetDiscoveredApiOperationRequest.serialize, - response_deserializer=common_fields.DiscoveredApiOperation.deserialize, + self._stubs["get_discovered_api_operation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiOperation", + request_serializer=discovery_service.GetDiscoveredApiOperationRequest.serialize, + response_deserializer=common_fields.DiscoveredApiOperation.deserialize, + ) ) return self._stubs["get_discovered_api_operation"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc_asyncio.py index 1ded1ec9bee1..7691a5ef724b 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import common_fields, discovery_service @@ -356,12 +356,12 @@ def list_discovered_api_observations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_discovered_api_observations" not in self._stubs: - self._stubs[ - "list_discovered_api_observations" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiObservations", - request_serializer=discovery_service.ListDiscoveredApiObservationsRequest.serialize, - response_deserializer=discovery_service.ListDiscoveredApiObservationsResponse.deserialize, + self._stubs["list_discovered_api_observations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiObservations", + request_serializer=discovery_service.ListDiscoveredApiObservationsRequest.serialize, + response_deserializer=discovery_service.ListDiscoveredApiObservationsResponse.deserialize, + ) ) return self._stubs["list_discovered_api_observations"] @@ -388,12 +388,12 @@ def get_discovered_api_observation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_discovered_api_observation" not in self._stubs: - self._stubs[ - "get_discovered_api_observation" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiObservation", - request_serializer=discovery_service.GetDiscoveredApiObservationRequest.serialize, - response_deserializer=common_fields.DiscoveredApiObservation.deserialize, + self._stubs["get_discovered_api_observation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiObservation", + request_serializer=discovery_service.GetDiscoveredApiObservationRequest.serialize, + response_deserializer=common_fields.DiscoveredApiObservation.deserialize, + ) ) return self._stubs["get_discovered_api_observation"] @@ -420,12 +420,12 @@ def list_discovered_api_operations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_discovered_api_operations" not in self._stubs: - self._stubs[ - "list_discovered_api_operations" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiOperations", - request_serializer=discovery_service.ListDiscoveredApiOperationsRequest.serialize, - response_deserializer=discovery_service.ListDiscoveredApiOperationsResponse.deserialize, + self._stubs["list_discovered_api_operations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiOperations", + request_serializer=discovery_service.ListDiscoveredApiOperationsRequest.serialize, + response_deserializer=discovery_service.ListDiscoveredApiOperationsResponse.deserialize, + ) ) return self._stubs["list_discovered_api_operations"] @@ -452,12 +452,12 @@ def get_discovered_api_operation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_discovered_api_operation" not in self._stubs: - self._stubs[ - "get_discovered_api_operation" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiOperation", - request_serializer=discovery_service.GetDiscoveredApiOperationRequest.serialize, - response_deserializer=common_fields.DiscoveredApiOperation.deserialize, + self._stubs["get_discovered_api_operation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiOperation", + request_serializer=discovery_service.GetDiscoveredApiOperationRequest.serialize, + response_deserializer=common_fields.DiscoveredApiOperation.deserialize, + ) ) return self._stubs["get_discovered_api_operation"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/rest.py index e2c7b9cc3353..25d41c20c583 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -612,9 +612,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDiscoveryRestTransport._BaseGetDiscoveredApiObservation._get_http_options() - ) + http_options = _BaseApiHubDiscoveryRestTransport._BaseGetDiscoveredApiObservation._get_http_options() request, metadata = self._interceptor.pre_get_discovered_api_observation( request, metadata @@ -680,11 +678,10 @@ def __call__( resp = self._interceptor.post_get_discovered_api_observation(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_discovered_api_observation_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_discovered_api_observation_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -771,9 +768,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDiscoveryRestTransport._BaseGetDiscoveredApiOperation._get_http_options() - ) + http_options = _BaseApiHubDiscoveryRestTransport._BaseGetDiscoveredApiOperation._get_http_options() request, metadata = self._interceptor.pre_get_discovered_api_operation( request, metadata @@ -926,9 +921,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDiscoveryRestTransport._BaseListDiscoveredApiObservations._get_http_options() - ) + http_options = _BaseApiHubDiscoveryRestTransport._BaseListDiscoveredApiObservations._get_http_options() request, metadata = self._interceptor.pre_list_discovered_api_observations( request, metadata @@ -992,11 +985,10 @@ def __call__( resp = self._interceptor.post_list_discovered_api_observations(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_discovered_api_observations_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_discovered_api_observations_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1084,9 +1076,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDiscoveryRestTransport._BaseListDiscoveredApiOperations._get_http_options() - ) + http_options = _BaseApiHubDiscoveryRestTransport._BaseListDiscoveredApiOperations._get_http_options() request, metadata = self._interceptor.pre_list_discovered_api_operations( request, metadata @@ -1152,11 +1142,10 @@ def __call__( resp = self._interceptor.post_list_discovered_api_operations(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_discovered_api_operations_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_discovered_api_operations_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1194,7 +1183,9 @@ def get_discovered_api_observation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetDiscoveredApiObservation(self._session, self._host, self._interceptor) # type: ignore + return self._GetDiscoveredApiObservation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_discovered_api_operation( @@ -1205,7 +1196,9 @@ def get_discovered_api_operation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetDiscoveredApiOperation(self._session, self._host, self._interceptor) # type: ignore + return self._GetDiscoveredApiOperation( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_discovered_api_observations( @@ -1216,7 +1209,9 @@ def list_discovered_api_observations( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListDiscoveredApiObservations(self._session, self._host, self._interceptor) # type: ignore + return self._ListDiscoveredApiObservations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_discovered_api_operations( @@ -1227,7 +1222,9 @@ def list_discovered_api_operations( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListDiscoveredApiOperations(self._session, self._host, self._interceptor) # type: ignore + return self._ListDiscoveredApiOperations( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1564,9 +1561,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseApiHubDiscoveryRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseApiHubDiscoveryRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1683,9 +1678,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseApiHubDiscoveryRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseApiHubDiscoveryRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1940,9 +1933,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseApiHubDiscoveryRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseApiHubDiscoveryRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseApiHubDiscoveryRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/async_client.py index 361769b84bf7..e4ebaacf96ba 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_plugin import pagers from google.cloud.apihub_v1.types import common_fields, plugin_service @@ -127,7 +127,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiHubPluginAsyncClient: The constructed client. """ - return ApiHubPluginClient.from_service_account_info.__func__(ApiHubPluginAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ApiHubPluginClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ApiHubPluginAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +146,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApiHubPluginAsyncClient: The constructed client. """ - return ApiHubPluginClient.from_service_account_file.__func__(ApiHubPluginAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ApiHubPluginClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ApiHubPluginAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/client.py index df4fbf96ace8..76a137f83560 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_plugin import pagers from google.cloud.apihub_v1.types import common_fields, plugin_service @@ -692,11 +692,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiHubPluginClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiHubPluginClient._read_environment_variables() + ) self._client_cert_source = ApiHubPluginClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -731,8 +729,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiHubPluginTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/pagers.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/pagers.py index 92aa37d721d2..cfef1bbb3431 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/pagers.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/base.py index 9a8fed1ae05b..b3420469a9ce 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import plugin_service @@ -419,13 +419,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc.py index 7c4c3ec5e082..98e58024f918 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import plugin_service @@ -553,12 +553,12 @@ def execute_plugin_instance_action( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "execute_plugin_instance_action" not in self._stubs: - self._stubs[ - "execute_plugin_instance_action" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubPlugin/ExecutePluginInstanceAction", - request_serializer=plugin_service.ExecutePluginInstanceActionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["execute_plugin_instance_action"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubPlugin/ExecutePluginInstanceAction", + request_serializer=plugin_service.ExecutePluginInstanceActionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["execute_plugin_instance_action"] @@ -641,12 +641,12 @@ def enable_plugin_instance_action( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_plugin_instance_action" not in self._stubs: - self._stubs[ - "enable_plugin_instance_action" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubPlugin/EnablePluginInstanceAction", - request_serializer=plugin_service.EnablePluginInstanceActionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_plugin_instance_action"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubPlugin/EnablePluginInstanceAction", + request_serializer=plugin_service.EnablePluginInstanceActionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_plugin_instance_action"] @@ -671,12 +671,12 @@ def disable_plugin_instance_action( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_plugin_instance_action" not in self._stubs: - self._stubs[ - "disable_plugin_instance_action" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubPlugin/DisablePluginInstanceAction", - request_serializer=plugin_service.DisablePluginInstanceActionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_plugin_instance_action"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubPlugin/DisablePluginInstanceAction", + request_serializer=plugin_service.DisablePluginInstanceActionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_plugin_instance_action"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc_asyncio.py index e6c8de4ad5a9..edc29f977dbd 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import plugin_service @@ -572,12 +572,12 @@ def execute_plugin_instance_action( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "execute_plugin_instance_action" not in self._stubs: - self._stubs[ - "execute_plugin_instance_action" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubPlugin/ExecutePluginInstanceAction", - request_serializer=plugin_service.ExecutePluginInstanceActionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["execute_plugin_instance_action"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubPlugin/ExecutePluginInstanceAction", + request_serializer=plugin_service.ExecutePluginInstanceActionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["execute_plugin_instance_action"] @@ -662,12 +662,12 @@ def enable_plugin_instance_action( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_plugin_instance_action" not in self._stubs: - self._stubs[ - "enable_plugin_instance_action" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubPlugin/EnablePluginInstanceAction", - request_serializer=plugin_service.EnablePluginInstanceActionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_plugin_instance_action"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubPlugin/EnablePluginInstanceAction", + request_serializer=plugin_service.EnablePluginInstanceActionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_plugin_instance_action"] @@ -693,12 +693,12 @@ def disable_plugin_instance_action( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_plugin_instance_action" not in self._stubs: - self._stubs[ - "disable_plugin_instance_action" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubPlugin/DisablePluginInstanceAction", - request_serializer=plugin_service.DisablePluginInstanceActionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_plugin_instance_action"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubPlugin/DisablePluginInstanceAction", + request_serializer=plugin_service.DisablePluginInstanceActionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_plugin_instance_action"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/rest.py index 3f8c22551b65..748d05b117b1 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1378,9 +1378,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseCreatePluginInstance._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseCreatePluginInstance._get_http_options() request, metadata = self._interceptor.pre_create_plugin_instance( request, metadata @@ -1680,9 +1678,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseDeletePluginInstance._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseDeletePluginInstance._get_http_options() request, metadata = self._interceptor.pre_delete_plugin_instance( request, metadata @@ -1984,9 +1980,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseDisablePluginInstanceAction._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseDisablePluginInstanceAction._get_http_options() request, metadata = self._interceptor.pre_disable_plugin_instance_action( request, metadata @@ -2055,11 +2049,10 @@ def __call__( resp = self._interceptor.post_disable_plugin_instance_action(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_disable_plugin_instance_action_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_disable_plugin_instance_action_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2302,9 +2295,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseEnablePluginInstanceAction._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseEnablePluginInstanceAction._get_http_options() request, metadata = self._interceptor.pre_enable_plugin_instance_action( request, metadata @@ -2373,11 +2364,10 @@ def __call__( resp = self._interceptor.post_enable_plugin_instance_action(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_enable_plugin_instance_action_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_enable_plugin_instance_action_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2464,9 +2454,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseExecutePluginInstanceAction._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseExecutePluginInstanceAction._get_http_options() request, metadata = self._interceptor.pre_execute_plugin_instance_action( request, metadata @@ -2535,11 +2523,10 @@ def __call__( resp = self._interceptor.post_execute_plugin_instance_action(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_execute_plugin_instance_action_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_execute_plugin_instance_action_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2775,9 +2762,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseGetPluginInstance._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseGetPluginInstance._get_http_options() request, metadata = self._interceptor.pre_get_plugin_instance( request, metadata @@ -2926,9 +2911,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseListPluginInstances._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseListPluginInstances._get_http_options() request, metadata = self._interceptor.pre_list_plugin_instances( request, metadata @@ -3237,9 +3220,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseUpdatePluginInstance._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseUpdatePluginInstance._get_http_options() request, metadata = self._interceptor.pre_update_plugin_instance( request, metadata @@ -3386,7 +3367,9 @@ def disable_plugin_instance_action( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DisablePluginInstanceAction(self._session, self._host, self._interceptor) # type: ignore + return self._DisablePluginInstanceAction( + self._session, self._host, self._interceptor + ) # type: ignore @property def enable_plugin( @@ -3404,7 +3387,9 @@ def enable_plugin_instance_action( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._EnablePluginInstanceAction(self._session, self._host, self._interceptor) # type: ignore + return self._EnablePluginInstanceAction( + self._session, self._host, self._interceptor + ) # type: ignore @property def execute_plugin_instance_action( @@ -3414,7 +3399,9 @@ def execute_plugin_instance_action( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ExecutePluginInstanceAction(self._session, self._host, self._interceptor) # type: ignore + return self._ExecutePluginInstanceAction( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_plugin( diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/async_client.py index ec048f3c1afd..89f823bccc63 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.host_project_registration_service import pagers from google.cloud.apihub_v1.types import host_project_registration_service @@ -134,7 +134,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: HostProjectRegistrationServiceAsyncClient: The constructed client. """ - return HostProjectRegistrationServiceClient.from_service_account_info.__func__(HostProjectRegistrationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + HostProjectRegistrationServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + HostProjectRegistrationServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -150,7 +155,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: HostProjectRegistrationServiceAsyncClient: The constructed client. """ - return HostProjectRegistrationServiceClient.from_service_account_file.__func__(HostProjectRegistrationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + HostProjectRegistrationServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + HostProjectRegistrationServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -188,7 +198,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return HostProjectRegistrationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return HostProjectRegistrationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> HostProjectRegistrationServiceTransport: diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/client.py index c89c400af1ef..9f1252421df0 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.host_project_registration_service import pagers from google.cloud.apihub_v1.types import host_project_registration_service @@ -85,13 +85,11 @@ class HostProjectRegistrationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[HostProjectRegistrationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[HostProjectRegistrationServiceTransport]] _transport_registry["grpc"] = HostProjectRegistrationServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = HostProjectRegistrationServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + HostProjectRegistrationServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = HostProjectRegistrationServiceRestTransport def get_transport_class( @@ -643,11 +641,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = HostProjectRegistrationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + HostProjectRegistrationServiceClient._read_environment_variables() + ) self._client_cert_source = ( HostProjectRegistrationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -688,8 +684,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(HostProjectRegistrationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/pagers.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/pagers.py index 42a7a42b645f..3ba61c400c6b 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/pagers.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/pagers.py @@ -69,7 +69,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -160,7 +160,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/__init__.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/__init__.py index 312bae57ee53..20d38af82b8a 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/__init__.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[HostProjectRegistrationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[HostProjectRegistrationServiceTransport]] _transport_registry["grpc"] = HostProjectRegistrationServiceGrpcTransport _transport_registry["grpc_asyncio"] = HostProjectRegistrationServiceGrpcAsyncIOTransport _transport_registry["rest"] = HostProjectRegistrationServiceRestTransport diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/base.py index d9412ed3f912..19f8ea517b06 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import host_project_registration_service @@ -274,13 +274,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc.py index 698024d104ec..8306204a9534 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import host_project_registration_service @@ -354,12 +354,12 @@ def create_host_project_registration( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_host_project_registration" not in self._stubs: - self._stubs[ - "create_host_project_registration" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.HostProjectRegistrationService/CreateHostProjectRegistration", - request_serializer=host_project_registration_service.CreateHostProjectRegistrationRequest.serialize, - response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + self._stubs["create_host_project_registration"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.HostProjectRegistrationService/CreateHostProjectRegistration", + request_serializer=host_project_registration_service.CreateHostProjectRegistrationRequest.serialize, + response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + ) ) return self._stubs["create_host_project_registration"] @@ -385,12 +385,12 @@ def get_host_project_registration( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_host_project_registration" not in self._stubs: - self._stubs[ - "get_host_project_registration" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.HostProjectRegistrationService/GetHostProjectRegistration", - request_serializer=host_project_registration_service.GetHostProjectRegistrationRequest.serialize, - response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + self._stubs["get_host_project_registration"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.HostProjectRegistrationService/GetHostProjectRegistration", + request_serializer=host_project_registration_service.GetHostProjectRegistrationRequest.serialize, + response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + ) ) return self._stubs["get_host_project_registration"] @@ -417,12 +417,12 @@ def list_host_project_registrations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_host_project_registrations" not in self._stubs: - self._stubs[ - "list_host_project_registrations" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.HostProjectRegistrationService/ListHostProjectRegistrations", - request_serializer=host_project_registration_service.ListHostProjectRegistrationsRequest.serialize, - response_deserializer=host_project_registration_service.ListHostProjectRegistrationsResponse.deserialize, + self._stubs["list_host_project_registrations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.HostProjectRegistrationService/ListHostProjectRegistrations", + request_serializer=host_project_registration_service.ListHostProjectRegistrationsRequest.serialize, + response_deserializer=host_project_registration_service.ListHostProjectRegistrationsResponse.deserialize, + ) ) return self._stubs["list_host_project_registrations"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc_asyncio.py index 1fad630d9194..938a8bffd5d3 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import host_project_registration_service @@ -362,12 +362,12 @@ def create_host_project_registration( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_host_project_registration" not in self._stubs: - self._stubs[ - "create_host_project_registration" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.HostProjectRegistrationService/CreateHostProjectRegistration", - request_serializer=host_project_registration_service.CreateHostProjectRegistrationRequest.serialize, - response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + self._stubs["create_host_project_registration"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.HostProjectRegistrationService/CreateHostProjectRegistration", + request_serializer=host_project_registration_service.CreateHostProjectRegistrationRequest.serialize, + response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + ) ) return self._stubs["create_host_project_registration"] @@ -393,12 +393,12 @@ def get_host_project_registration( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_host_project_registration" not in self._stubs: - self._stubs[ - "get_host_project_registration" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.HostProjectRegistrationService/GetHostProjectRegistration", - request_serializer=host_project_registration_service.GetHostProjectRegistrationRequest.serialize, - response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + self._stubs["get_host_project_registration"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.HostProjectRegistrationService/GetHostProjectRegistration", + request_serializer=host_project_registration_service.GetHostProjectRegistrationRequest.serialize, + response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + ) ) return self._stubs["get_host_project_registration"] @@ -427,12 +427,12 @@ def list_host_project_registrations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_host_project_registrations" not in self._stubs: - self._stubs[ - "list_host_project_registrations" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.HostProjectRegistrationService/ListHostProjectRegistrations", - request_serializer=host_project_registration_service.ListHostProjectRegistrationsRequest.serialize, - response_deserializer=host_project_registration_service.ListHostProjectRegistrationsResponse.deserialize, + self._stubs["list_host_project_registrations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.HostProjectRegistrationService/ListHostProjectRegistrations", + request_serializer=host_project_registration_service.ListHostProjectRegistrationsRequest.serialize, + response_deserializer=host_project_registration_service.ListHostProjectRegistrationsResponse.deserialize, + ) ) return self._stubs["list_host_project_registrations"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/rest.py index dbd002e8dafb..0acc20c219af 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -571,9 +571,7 @@ def __call__( """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseCreateHostProjectRegistration._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseCreateHostProjectRegistration._get_http_options() request, metadata = self._interceptor.pre_create_host_project_registration( request, metadata @@ -642,11 +640,10 @@ def __call__( resp = self._interceptor.post_create_host_project_registration(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_host_project_registration_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_host_project_registration_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -743,9 +740,7 @@ def __call__( """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseGetHostProjectRegistration._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseGetHostProjectRegistration._get_http_options() request, metadata = self._interceptor.pre_get_host_project_registration( request, metadata @@ -809,11 +804,10 @@ def __call__( resp = self._interceptor.post_get_host_project_registration(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_host_project_registration_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_host_project_registration_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -903,9 +897,7 @@ def __call__( """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseListHostProjectRegistrations._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseListHostProjectRegistrations._get_http_options() request, metadata = self._interceptor.pre_list_host_project_registrations( request, metadata @@ -973,11 +965,10 @@ def __call__( resp = self._interceptor.post_list_host_project_registrations(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_host_project_registrations_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_host_project_registrations_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1013,7 +1004,9 @@ def create_host_project_registration( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateHostProjectRegistration(self._session, self._host, self._interceptor) # type: ignore + return self._CreateHostProjectRegistration( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_host_project_registration( @@ -1024,7 +1017,9 @@ def get_host_project_registration( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetHostProjectRegistration(self._session, self._host, self._interceptor) # type: ignore + return self._GetHostProjectRegistration( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_host_project_registrations( @@ -1035,7 +1030,9 @@ def list_host_project_registrations( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListHostProjectRegistrations(self._session, self._host, self._interceptor) # type: ignore + return self._ListHostProjectRegistrations( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1095,9 +1092,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseHostProjectRegistrationServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1238,9 +1233,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseHostProjectRegistrationServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1377,9 +1370,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1497,9 +1488,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1615,9 +1604,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseHostProjectRegistrationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1758,9 +1745,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseHostProjectRegistrationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/async_client.py index 9a40043dd72e..277960d3d114 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.apihub_v1.types import common_fields, linting_service @@ -118,7 +118,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: LintingServiceAsyncClient: The constructed client. """ - return LintingServiceClient.from_service_account_info.__func__(LintingServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + LintingServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(LintingServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +137,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: LintingServiceAsyncClient: The constructed client. """ - return LintingServiceClient.from_service_account_file.__func__(LintingServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + LintingServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(LintingServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/client.py index 823f9318fb09..49d4056f2e27 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.apihub_v1.types import common_fields, linting_service @@ -81,9 +81,7 @@ class LintingServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[LintingServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[LintingServiceTransport]] _transport_registry["grpc"] = LintingServiceGrpcTransport _transport_registry["grpc_asyncio"] = LintingServiceGrpcAsyncIOTransport _transport_registry["rest"] = LintingServiceRestTransport @@ -649,11 +647,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LintingServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LintingServiceClient._read_environment_variables() + ) self._client_cert_source = LintingServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -688,8 +684,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LintingServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/base.py index 807c25108148..da4bbabd313c 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import linting_service @@ -281,13 +281,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc.py index f4ae8f2eaf98..d8f562d8730e 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.apihub_v1.types import linting_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc_asyncio.py index 922b943057c4..38b341faffdb 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import linting_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest.py index 6e231663cfa9..6f6be942e354 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.apihub_v1.types import linting_service @@ -710,9 +710,7 @@ def __call__( The style guide contents. """ - http_options = ( - _BaseLintingServiceRestTransport._BaseGetStyleGuideContents._get_http_options() - ) + http_options = _BaseLintingServiceRestTransport._BaseGetStyleGuideContents._get_http_options() request, metadata = self._interceptor.pre_get_style_guide_contents( request, metadata @@ -984,9 +982,7 @@ def __call__( """ - http_options = ( - _BaseLintingServiceRestTransport._BaseUpdateStyleGuide._get_http_options() - ) + http_options = _BaseLintingServiceRestTransport._BaseUpdateStyleGuide._get_http_options() request, metadata = self._interceptor.pre_update_style_guide( request, metadata @@ -1451,9 +1447,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseLintingServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseLintingServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1570,9 +1564,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseLintingServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseLintingServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest_base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest_base.py index 4109d0db52b1..941b2352c6b5 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest_base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.apihub_v1.types import linting_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/async_client.py index 56e3b353ea94..ef6cd1c07b1f 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -46,10 +46,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apihub_v1.types import common_fields, provisioning_service @@ -119,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ProvisioningAsyncClient: The constructed client. """ - return ProvisioningClient.from_service_account_info.__func__(ProvisioningAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ProvisioningClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ProvisioningAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ProvisioningAsyncClient: The constructed client. """ - return ProvisioningClient.from_service_account_file.__func__(ProvisioningAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ProvisioningClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ProvisioningAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/client.py index d7c878859683..7d815c935815 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -63,10 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apihub_v1.types import common_fields, provisioning_service @@ -626,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProvisioningClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProvisioningClient._read_environment_variables() + ) self._client_cert_source = ProvisioningClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProvisioningTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/base.py index 203486cfd9e8..f139acaf443b 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import common_fields, provisioning_service @@ -285,13 +285,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc.py index 09a8ab8ae090..758baea7239d 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import common_fields, provisioning_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc_asyncio.py index 6b93be7b2058..550f40f0f7f2 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import common_fields, provisioning_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/rest.py index 3a7b1e23b116..96715b819814 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -660,9 +660,7 @@ def __call__( """ - http_options = ( - _BaseProvisioningRestTransport._BaseCreateApiHubInstance._get_http_options() - ) + http_options = _BaseProvisioningRestTransport._BaseCreateApiHubInstance._get_http_options() request, metadata = self._interceptor.pre_create_api_hub_instance( request, metadata @@ -814,9 +812,7 @@ def __call__( """ - http_options = ( - _BaseProvisioningRestTransport._BaseDeleteApiHubInstance._get_http_options() - ) + http_options = _BaseProvisioningRestTransport._BaseDeleteApiHubInstance._get_http_options() request, metadata = self._interceptor.pre_delete_api_hub_instance( request, metadata @@ -964,9 +960,7 @@ def __call__( """ - http_options = ( - _BaseProvisioningRestTransport._BaseGetApiHubInstance._get_http_options() - ) + http_options = _BaseProvisioningRestTransport._BaseGetApiHubInstance._get_http_options() request, metadata = self._interceptor.pre_get_api_hub_instance( request, metadata @@ -1115,9 +1109,7 @@ def __call__( """ - http_options = ( - _BaseProvisioningRestTransport._BaseLookupApiHubInstance._get_http_options() - ) + http_options = _BaseProvisioningRestTransport._BaseLookupApiHubInstance._get_http_options() request, metadata = self._interceptor.pre_lookup_api_hub_instance( request, metadata diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/async_client.py index 445fbc58310b..2dcb75adc4ab 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.runtime_project_attachment_service import pagers from google.cloud.apihub_v1.types import runtime_project_attachment_service @@ -134,7 +134,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RuntimeProjectAttachmentServiceAsyncClient: The constructed client. """ - return RuntimeProjectAttachmentServiceClient.from_service_account_info.__func__(RuntimeProjectAttachmentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + RuntimeProjectAttachmentServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + RuntimeProjectAttachmentServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -150,7 +155,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RuntimeProjectAttachmentServiceAsyncClient: The constructed client. """ - return RuntimeProjectAttachmentServiceClient.from_service_account_file.__func__(RuntimeProjectAttachmentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + RuntimeProjectAttachmentServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + RuntimeProjectAttachmentServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -188,7 +198,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return RuntimeProjectAttachmentServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return RuntimeProjectAttachmentServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> RuntimeProjectAttachmentServiceTransport: diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/client.py index 505c0401e0a0..f74a6bf09167 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.runtime_project_attachment_service import pagers from google.cloud.apihub_v1.types import runtime_project_attachment_service @@ -85,13 +85,11 @@ class RuntimeProjectAttachmentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RuntimeProjectAttachmentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RuntimeProjectAttachmentServiceTransport]] _transport_registry["grpc"] = RuntimeProjectAttachmentServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = RuntimeProjectAttachmentServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + RuntimeProjectAttachmentServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = RuntimeProjectAttachmentServiceRestTransport def get_transport_class( @@ -643,11 +641,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RuntimeProjectAttachmentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RuntimeProjectAttachmentServiceClient._read_environment_variables() + ) self._client_cert_source = ( RuntimeProjectAttachmentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -688,8 +684,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RuntimeProjectAttachmentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/pagers.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/pagers.py index 7ec9855408df..d4d73083dc5b 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/pagers.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -161,7 +161,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/__init__.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/__init__.py index fef6954cdf31..7cfa1723ff51 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/__init__.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/__init__.py @@ -25,13 +25,11 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RuntimeProjectAttachmentServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RuntimeProjectAttachmentServiceTransport]] _transport_registry["grpc"] = RuntimeProjectAttachmentServiceGrpcTransport -_transport_registry[ - "grpc_asyncio" -] = RuntimeProjectAttachmentServiceGrpcAsyncIOTransport +_transport_registry["grpc_asyncio"] = ( + RuntimeProjectAttachmentServiceGrpcAsyncIOTransport +) _transport_registry["rest"] = RuntimeProjectAttachmentServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/base.py index f95363f5e01e..487855c3d176 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import runtime_project_attachment_service @@ -317,13 +317,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc.py index 289ba75d447d..d79d41a07955 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.apihub_v1.types import runtime_project_attachment_service @@ -350,12 +350,12 @@ def create_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_runtime_project_attachment" not in self._stubs: - self._stubs[ - "create_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/CreateRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.CreateRuntimeProjectAttachmentRequest.serialize, - response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + self._stubs["create_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/CreateRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.CreateRuntimeProjectAttachmentRequest.serialize, + response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + ) ) return self._stubs["create_runtime_project_attachment"] @@ -381,12 +381,12 @@ def get_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_runtime_project_attachment" not in self._stubs: - self._stubs[ - "get_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/GetRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.GetRuntimeProjectAttachmentRequest.serialize, - response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + self._stubs["get_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/GetRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.GetRuntimeProjectAttachmentRequest.serialize, + response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + ) ) return self._stubs["get_runtime_project_attachment"] @@ -413,12 +413,12 @@ def list_runtime_project_attachments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_runtime_project_attachments" not in self._stubs: - self._stubs[ - "list_runtime_project_attachments" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/ListRuntimeProjectAttachments", - request_serializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsRequest.serialize, - response_deserializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsResponse.deserialize, + self._stubs["list_runtime_project_attachments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/ListRuntimeProjectAttachments", + request_serializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsRequest.serialize, + response_deserializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsResponse.deserialize, + ) ) return self._stubs["list_runtime_project_attachments"] @@ -447,12 +447,12 @@ def delete_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_runtime_project_attachment" not in self._stubs: - self._stubs[ - "delete_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/DeleteRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.DeleteRuntimeProjectAttachmentRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/DeleteRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.DeleteRuntimeProjectAttachmentRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_runtime_project_attachment"] @@ -480,12 +480,12 @@ def lookup_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_runtime_project_attachment" not in self._stubs: - self._stubs[ - "lookup_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/LookupRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentRequest.serialize, - response_deserializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentResponse.deserialize, + self._stubs["lookup_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/LookupRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentRequest.serialize, + response_deserializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentResponse.deserialize, + ) ) return self._stubs["lookup_runtime_project_attachment"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc_asyncio.py index 116176c7a2f2..76ad4053a3e1 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import runtime_project_attachment_service @@ -358,12 +358,12 @@ def create_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_runtime_project_attachment" not in self._stubs: - self._stubs[ - "create_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/CreateRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.CreateRuntimeProjectAttachmentRequest.serialize, - response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + self._stubs["create_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/CreateRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.CreateRuntimeProjectAttachmentRequest.serialize, + response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + ) ) return self._stubs["create_runtime_project_attachment"] @@ -389,12 +389,12 @@ def get_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_runtime_project_attachment" not in self._stubs: - self._stubs[ - "get_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/GetRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.GetRuntimeProjectAttachmentRequest.serialize, - response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + self._stubs["get_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/GetRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.GetRuntimeProjectAttachmentRequest.serialize, + response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + ) ) return self._stubs["get_runtime_project_attachment"] @@ -423,12 +423,12 @@ def list_runtime_project_attachments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_runtime_project_attachments" not in self._stubs: - self._stubs[ - "list_runtime_project_attachments" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/ListRuntimeProjectAttachments", - request_serializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsRequest.serialize, - response_deserializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsResponse.deserialize, + self._stubs["list_runtime_project_attachments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/ListRuntimeProjectAttachments", + request_serializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsRequest.serialize, + response_deserializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsResponse.deserialize, + ) ) return self._stubs["list_runtime_project_attachments"] @@ -457,12 +457,12 @@ def delete_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_runtime_project_attachment" not in self._stubs: - self._stubs[ - "delete_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/DeleteRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.DeleteRuntimeProjectAttachmentRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/DeleteRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.DeleteRuntimeProjectAttachmentRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_runtime_project_attachment"] @@ -492,12 +492,12 @@ def lookup_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_runtime_project_attachment" not in self._stubs: - self._stubs[ - "lookup_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/LookupRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentRequest.serialize, - response_deserializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentResponse.deserialize, + self._stubs["lookup_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/LookupRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentRequest.serialize, + response_deserializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentResponse.deserialize, + ) ) return self._stubs["lookup_runtime_project_attachment"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest.py index fb137179a1b9..7d649e428d19 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.apihub_v1.types import runtime_project_attachment_service @@ -649,9 +649,7 @@ def __call__( """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseCreateRuntimeProjectAttachment._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseCreateRuntimeProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_create_runtime_project_attachment( request, metadata @@ -722,11 +720,10 @@ def __call__( resp = self._interceptor.post_create_runtime_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_runtime_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_runtime_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -809,9 +806,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseDeleteRuntimeProjectAttachment._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseDeleteRuntimeProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_delete_runtime_project_attachment( request, metadata @@ -934,9 +929,7 @@ def __call__( """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetRuntimeProjectAttachment._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetRuntimeProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_get_runtime_project_attachment( request, metadata @@ -1002,11 +995,10 @@ def __call__( resp = self._interceptor.post_get_runtime_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_runtime_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_runtime_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1096,9 +1088,7 @@ def __call__( """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListRuntimeProjectAttachments._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListRuntimeProjectAttachments._get_http_options() request, metadata = self._interceptor.pre_list_runtime_project_attachments( request, metadata @@ -1155,9 +1145,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - runtime_project_attachment_service.ListRuntimeProjectAttachmentsResponse() - ) + resp = runtime_project_attachment_service.ListRuntimeProjectAttachmentsResponse() pb_resp = runtime_project_attachment_service.ListRuntimeProjectAttachmentsResponse.pb( resp ) @@ -1166,11 +1154,10 @@ def __call__( resp = self._interceptor.post_list_runtime_project_attachments(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_runtime_project_attachments_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_runtime_project_attachments_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1260,9 +1247,7 @@ def __call__( """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseLookupRuntimeProjectAttachment._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseLookupRuntimeProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_lookup_runtime_project_attachment( request, metadata @@ -1319,9 +1304,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - runtime_project_attachment_service.LookupRuntimeProjectAttachmentResponse() - ) + resp = runtime_project_attachment_service.LookupRuntimeProjectAttachmentResponse() pb_resp = runtime_project_attachment_service.LookupRuntimeProjectAttachmentResponse.pb( resp ) @@ -1330,11 +1313,10 @@ def __call__( resp = self._interceptor.post_lookup_runtime_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_lookup_runtime_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_lookup_runtime_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1370,7 +1352,9 @@ def create_runtime_project_attachment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateRuntimeProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._CreateRuntimeProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_runtime_project_attachment( @@ -1381,7 +1365,9 @@ def delete_runtime_project_attachment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteRuntimeProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteRuntimeProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_runtime_project_attachment( @@ -1392,7 +1378,9 @@ def get_runtime_project_attachment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetRuntimeProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._GetRuntimeProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_runtime_project_attachments( @@ -1403,7 +1391,9 @@ def list_runtime_project_attachments( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListRuntimeProjectAttachments(self._session, self._host, self._interceptor) # type: ignore + return self._ListRuntimeProjectAttachments( + self._session, self._host, self._interceptor + ) # type: ignore @property def lookup_runtime_project_attachment( @@ -1414,7 +1404,9 @@ def lookup_runtime_project_attachment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._LookupRuntimeProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._LookupRuntimeProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1474,9 +1466,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1617,9 +1607,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1756,9 +1744,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1876,9 +1862,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1994,9 +1978,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2135,9 +2117,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest_base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest_base.py index 47825ca548bc..fe2a4a49ac7e 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest_base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.apihub_v1.types import runtime_project_attachment_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/collect_service.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/collect_service.py index b8e8ea2b1158..453f58a91d73 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/collect_service.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/collect_service.py @@ -53,6 +53,7 @@ class CollectionType(proto.Enum): The collection type is delete. This should be used when an API is deleted at the source. """ + COLLECTION_TYPE_UNSPECIFIED = 0 COLLECTION_TYPE_UPSERT = 1 COLLECTION_TYPE_DELETE = 2 diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/common_fields.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/common_fields.py index 8124a1d97ec4..f48f2a80af9e 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/common_fields.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/common_fields.py @@ -80,6 +80,7 @@ class LintState(proto.Enum): LINT_STATE_ERROR (2): Linting encountered errors. """ + LINT_STATE_UNSPECIFIED = 0 LINT_STATE_SUCCESS = 1 LINT_STATE_ERROR = 2 @@ -96,6 +97,7 @@ class Linter(proto.Enum): OTHER (2): Linter type other. """ + LINTER_UNSPECIFIED = 0 SPECTRAL = 1 OTHER = 2 @@ -116,6 +118,7 @@ class Severity(proto.Enum): SEVERITY_HINT (4): Severity hint. """ + SEVERITY_UNSPECIFIED = 0 SEVERITY_ERROR = 1 SEVERITY_WARNING = 2 @@ -141,6 +144,7 @@ class AuthType(proto.Enum): Oauth 2.0 client credentials grant authentication. """ + AUTH_TYPE_UNSPECIFIED = 0 NO_AUTH = 1 GOOGLE_SERVICE_ACCOUNT = 2 @@ -162,6 +166,7 @@ class PluginCategory(proto.Enum): API_PRODUCER plugins represent plugins built for API Producers like Cloud Run, Application Integration etc. """ + PLUGIN_CATEGORY_UNSPECIFIED = 0 API_GATEWAY = 1 API_PRODUCER = 2 @@ -621,6 +626,7 @@ class ParsingMode(proto.Enum): strict, meaning that parsing errors in the spec contents will fail the API call. """ + PARSING_MODE_UNSPECIFIED = 0 RELAXED = 1 STRICT = 2 @@ -1021,6 +1027,7 @@ class Type(proto.Enum): SCHEMA (1): Definition type schema. """ + TYPE_UNSPECIFIED = 0 SCHEMA = 1 @@ -1127,6 +1134,7 @@ class DefinitionType(proto.Enum): USER_DEFINED (2): The attribute is defined by the user. """ + DEFINITION_TYPE_UNSPECIFIED = 0 SYSTEM_DEFINED = 1 USER_DEFINED = 2 @@ -1157,6 +1165,7 @@ class Scope(proto.Enum): PLUGIN (9): Attribute can be linked to a Plugin. """ + SCOPE_UNSPECIFIED = 0 API = 1 VERSION = 2 @@ -1183,6 +1192,7 @@ class DataType(proto.Enum): URI (4): Attribute's value is of type uri. """ + DATA_TYPE_UNSPECIFIED = 0 ENUM = 1 JSON = 2 @@ -1372,6 +1382,7 @@ class Format(proto.Enum): OPEN_API_SPEC_3_1 (3): OpenAPI Spec v3.1. """ + FORMAT_UNSPECIFIED = 0 OPEN_API_SPEC_2_0 = 1 OPEN_API_SPEC_3_0 = 2 @@ -1477,6 +1488,7 @@ class Method(proto.Enum): TRACE (8): Trace Operation type. """ + METHOD_UNSPECIFIED = 0 GET = 1 PUT = 2 @@ -1744,6 +1756,7 @@ class State(proto.Enum): it is validated by the admin or manually created in the API hub. """ + STATE_UNSPECIFIED = 0 PROPOSED = 1 VALIDATED = 2 @@ -1758,6 +1771,7 @@ class DiscoveryMode(proto.Enum): Manual mode of discovery when the dependency is defined by the user. """ + DISCOVERY_MODE_UNSPECIFIED = 0 MANUAL = 1 @@ -1880,6 +1894,7 @@ class Error(proto.Enum): SUPPLIER_RECREATED (2): Supplier entity has been recreated. """ + ERROR_UNSPECIFIED = 0 SUPPLIER_NOT_FOUND = 1 SUPPLIER_RECREATED = 2 @@ -2177,6 +2192,7 @@ class State(proto.Enum): The ApiHub instance encountered an error during a state change. """ + STATE_UNSPECIFIED = 0 INACTIVE = 1 CREATING = 2 @@ -2223,6 +2239,7 @@ class EncryptionType(proto.Enum): Encryption using customer managed encryption key. """ + ENCRYPTION_TYPE_UNSPECIFIED = 0 GMEK = 1 CMEK = 2 @@ -2456,6 +2473,7 @@ class ValueType(proto.Enum): MULTI_INT (8): Value type is multi int. """ + VALUE_TYPE_UNSPECIFIED = 0 STRING = 1 INT = 2 @@ -2786,6 +2804,7 @@ class HttpElementLocation(proto.Enum): COOKIE (5): Element is in the HTTP request cookie. """ + HTTP_ELEMENT_LOCATION_UNSPECIFIED = 0 QUERY = 1 HEADER = 2 @@ -2876,6 +2895,7 @@ class SourceType(proto.Enum): PLUGIN (1): Source type plugin. """ + SOURCE_TYPE_UNSPECIFIED = 0 PLUGIN = 1 @@ -2993,6 +3013,7 @@ class Style(proto.Enum): GRAPHQL (3): Style is GraphQL API """ + STYLE_UNSPECIFIED = 0 REST = 1 GRPC = 2 @@ -3010,6 +3031,7 @@ class SourceType(proto.Enum): GCP_ILB (2): GCP internal load balancer. """ + SOURCE_TYPE_UNSPECIFIED = 0 GCP_XLB = 1 GCP_ILB = 2 @@ -3136,6 +3158,7 @@ class Classification(proto.Enum): Operation does not have a matched catalog operation. """ + CLASSIFICATION_UNSPECIFIED = 0 KNOWN = 1 UNKNOWN = 2 @@ -3242,6 +3265,7 @@ class DataType(proto.Enum): UUID (5): UUID data type """ + DATA_TYPE_UNSPECIFIED = 0 BOOL = 1 INTEGER = 2 diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/curate_service.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/curate_service.py index 7929152fd42b..2afcfd6019f3 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/curate_service.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/curate_service.py @@ -292,6 +292,7 @@ class LastExecutionState(proto.Enum): FAILED (2): The last curation execution failed. """ + LAST_EXECUTION_STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -309,6 +310,7 @@ class ErrorCode(proto.Enum): The curation is not authorized to trigger the endpoint uri. """ + ERROR_CODE_UNSPECIFIED = 0 INTERNAL_ERROR = 1 UNAUTHORIZED = 2 @@ -354,12 +356,12 @@ class PluginInstanceActionID(proto.Message): number=4, message="Endpoint", ) - plugin_instance_actions: MutableSequence[ - PluginInstanceActionID - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=PluginInstanceActionID, + plugin_instance_actions: MutableSequence[PluginInstanceActionID] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=PluginInstanceActionID, + ) ) last_execution_state: LastExecutionState = proto.Field( proto.ENUM, diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/discovery_service.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/discovery_service.py index 342d748e9a28..304677407e55 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/discovery_service.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/discovery_service.py @@ -158,12 +158,12 @@ class ListDiscoveredApiOperationsResponse(proto.Message): def raw_page(self): return self - discovered_api_operations: MutableSequence[ - common_fields.DiscoveredApiOperation - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=common_fields.DiscoveredApiOperation, + discovered_api_operations: MutableSequence[common_fields.DiscoveredApiOperation] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=common_fields.DiscoveredApiOperation, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/host_project_registration_service.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/host_project_registration_service.py index 1cc66ef2ff6d..57620688d0d6 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/host_project_registration_service.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/host_project_registration_service.py @@ -171,12 +171,12 @@ class ListHostProjectRegistrationsResponse(proto.Message): def raw_page(self): return self - host_project_registrations: MutableSequence[ - "HostProjectRegistration" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="HostProjectRegistration", + host_project_registrations: MutableSequence["HostProjectRegistration"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="HostProjectRegistration", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/plugin_service.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/plugin_service.py index 981196afd28a..d781ba399a69 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/plugin_service.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/plugin_service.py @@ -70,6 +70,7 @@ class ActionType(proto.Enum): SYNC_RUNTIME_DATA (2): Action type for sync runtime data. """ + ACTION_TYPE_UNSPECIFIED = 0 SYNC_METADATA = 1 SYNC_RUNTIME_DATA = 2 @@ -98,6 +99,7 @@ class GatewayType(proto.Enum): The gateway type for any other types of gateways. """ + GATEWAY_TYPE_UNSPECIFIED = 0 APIGEE_X_AND_HYBRID = 1 APIGEE_EDGE_PUBLIC_CLOUD = 2 @@ -121,6 +123,7 @@ class CurationType(proto.Enum): Custom curation for API metadata will be used. """ + CURATION_TYPE_UNSPECIFIED = 0 DEFAULT_CURATION_FOR_API_METADATA = 1 CUSTOM_CURATION_FOR_API_METADATA = 2 @@ -219,6 +222,7 @@ class State(proto.Enum): DISABLED (2): The plugin is disabled. """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -238,6 +242,7 @@ class OwnershipType(proto.Enum): [CreatePlugin][google.cloud.apihub.v1.ApiHubPlugin.CreatePlugin] method. """ + OWNERSHIP_TYPE_UNSPECIFIED = 0 SYSTEM_OWNED = 1 USER_OWNED = 2 @@ -299,12 +304,12 @@ class AuthConfigTemplate(proto.Message): the corresponding service account. """ - supported_auth_types: MutableSequence[ - common_fields.AuthType - ] = proto.RepeatedField( - proto.ENUM, - number=1, - enum=common_fields.AuthType, + supported_auth_types: MutableSequence[common_fields.AuthType] = ( + proto.RepeatedField( + proto.ENUM, + number=1, + enum=common_fields.AuthType, + ) ) service_account: common_fields.GoogleServiceAccountConfig = proto.Field( proto.MESSAGE, @@ -439,6 +444,7 @@ class TriggerMode(proto.Enum): service need not handle this action id as part of the execute call. """ + TRIGGER_MODE_UNSPECIFIED = 0 API_HUB_ON_DEMAND_TRIGGER = 1 API_HUB_SCHEDULE_TRIGGER = 2 @@ -590,6 +596,7 @@ class State(proto.Enum): enable/disable on actions can only be triggered if plugin instance is in Active state. """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -750,6 +757,7 @@ class State(proto.Enum): running on the plugin instance and plugin instance action. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -771,13 +779,13 @@ class State(proto.Enum): number=3, message=common_fields.AuthConfig, ) - additional_config: MutableMapping[ - str, common_fields.ConfigVariable - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=4, - message=common_fields.ConfigVariable, + additional_config: MutableMapping[str, common_fields.ConfigVariable] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=4, + message=common_fields.ConfigVariable, + ) ) state: State = proto.Field( proto.ENUM, @@ -877,6 +885,7 @@ class CurrentExecutionState(proto.Enum): The plugin instance is not running an execution. """ + CURRENT_EXECUTION_STATE_UNSPECIFIED = 0 RUNNING = 1 NOT_RUNNING = 2 @@ -911,6 +920,7 @@ class Result(proto.Enum): FAILED (2): The plugin instance execution failed. """ + RESULT_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/runtime_project_attachment_service.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/runtime_project_attachment_service.py index c6febf6cdf87..b2d439e63692 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/runtime_project_attachment_service.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/runtime_project_attachment_service.py @@ -176,12 +176,12 @@ class ListRuntimeProjectAttachmentsResponse(proto.Message): def raw_page(self): return self - runtime_project_attachments: MutableSequence[ - "RuntimeProjectAttachment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="RuntimeProjectAttachment", + runtime_project_attachments: MutableSequence["RuntimeProjectAttachment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="RuntimeProjectAttachment", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-apihub/mypy.ini b/packages/google-cloud-apihub/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-apihub/mypy.ini +++ b/packages/google-cloud-apihub/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-apihub/noxfile.py b/packages/google-cloud-apihub/noxfile.py index 992343b1528a..d312b38fb888 100644 --- a/packages/google-cloud-apihub/noxfile.py +++ b/packages/google-cloud-apihub/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub.py index 1d612f079556..78222151548e 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub import ( ApiHubAsyncClient, @@ -899,10 +904,9 @@ def test_api_hub_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -947,10 +951,9 @@ def test_api_hub_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +989,9 @@ def test_api_hub_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1218,9 +1220,7 @@ def test_api_hub_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5795,9 +5795,9 @@ def test_get_spec_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_spec_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_spec_contents] = ( + mock_rpc + ) request = {} client.get_spec_contents(request) @@ -7309,9 +7309,9 @@ def test_create_api_operation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_operation] = ( + mock_rpc + ) request = {} client.create_api_operation(request) @@ -7673,9 +7673,9 @@ def test_get_api_operation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_operation] = ( + mock_rpc + ) request = {} client.get_api_operation(request) @@ -8020,9 +8020,9 @@ def test_list_api_operations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_operations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_operations] = ( + mock_rpc + ) request = {} client.list_api_operations(request) @@ -8562,9 +8562,9 @@ def test_update_api_operation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_operation] = ( + mock_rpc + ) request = {} client.update_api_operation(request) @@ -8913,9 +8913,9 @@ def test_delete_api_operation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_operation] = ( + mock_rpc + ) request = {} client.delete_api_operation(request) @@ -9591,9 +9591,9 @@ def test_create_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deployment] = ( + mock_rpc + ) request = {} client.create_deployment(request) @@ -10315,9 +10315,9 @@ def test_list_deployments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -10848,9 +10848,9 @@ def test_update_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_deployment] = ( + mock_rpc + ) request = {} client.update_deployment(request) @@ -11208,9 +11208,9 @@ def test_delete_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deployment] = ( + mock_rpc + ) request = {} client.delete_deployment(request) @@ -11553,9 +11553,9 @@ def test_create_attribute_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_attribute] = ( + mock_rpc + ) request = {} client.create_attribute(request) @@ -12285,9 +12285,9 @@ def test_update_attribute_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_attribute] = ( + mock_rpc + ) request = {} client.update_attribute(request) @@ -12634,9 +12634,9 @@ def test_delete_attribute_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_attribute] = ( + mock_rpc + ) request = {} client.delete_attribute(request) @@ -13477,9 +13477,9 @@ def test_search_resources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_resources] = ( + mock_rpc + ) request = {} client.search_resources(request) @@ -14022,9 +14022,9 @@ def test_create_external_api_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_external_api] = ( + mock_rpc + ) request = {} client.create_external_api(request) @@ -14394,9 +14394,9 @@ def test_get_external_api_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_external_api] = ( + mock_rpc + ) request = {} client.get_external_api(request) @@ -14737,9 +14737,9 @@ def test_update_external_api_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_external_api] = ( + mock_rpc + ) request = {} client.update_external_api(request) @@ -15094,9 +15094,9 @@ def test_delete_external_api_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_external_api] = ( + mock_rpc + ) request = {} client.delete_external_api(request) @@ -15429,9 +15429,9 @@ def test_list_external_apis_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_external_apis - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_external_apis] = ( + mock_rpc + ) request = {} client.list_external_apis(request) @@ -18248,9 +18248,9 @@ def test_get_spec_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_spec_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_spec_contents] = ( + mock_rpc + ) request = {} client.get_spec_contents(request) @@ -19055,9 +19055,9 @@ def test_create_api_operation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_operation] = ( + mock_rpc + ) request = {} client.create_api_operation(request) @@ -19252,9 +19252,9 @@ def test_get_api_operation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_operation] = ( + mock_rpc + ) request = {} client.get_api_operation(request) @@ -19436,9 +19436,9 @@ def test_list_api_operations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_operations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_operations] = ( + mock_rpc + ) request = {} client.list_api_operations(request) @@ -19702,9 +19702,9 @@ def test_update_api_operation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_operation] = ( + mock_rpc + ) request = {} client.update_api_operation(request) @@ -19896,9 +19896,9 @@ def test_delete_api_operation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_operation] = ( + mock_rpc + ) request = {} client.delete_api_operation(request) @@ -20253,9 +20253,9 @@ def test_create_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deployment] = ( + mock_rpc + ) request = {} client.create_deployment(request) @@ -20628,9 +20628,9 @@ def test_list_deployments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -20888,9 +20888,9 @@ def test_update_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_deployment] = ( + mock_rpc + ) request = {} client.update_deployment(request) @@ -21080,9 +21080,9 @@ def test_delete_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deployment] = ( + mock_rpc + ) request = {} client.delete_deployment(request) @@ -21257,9 +21257,9 @@ def test_create_attribute_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_attribute] = ( + mock_rpc + ) request = {} client.create_attribute(request) @@ -21630,9 +21630,9 @@ def test_update_attribute_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_attribute] = ( + mock_rpc + ) request = {} client.update_attribute(request) @@ -21822,9 +21822,9 @@ def test_delete_attribute_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_attribute] = ( + mock_rpc + ) request = {} client.delete_attribute(request) @@ -22255,9 +22255,9 @@ def test_search_resources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_resources] = ( + mock_rpc + ) request = {} client.search_resources(request) @@ -22515,9 +22515,9 @@ def test_create_external_api_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_external_api] = ( + mock_rpc + ) request = {} client.create_external_api(request) @@ -22710,9 +22710,9 @@ def test_get_external_api_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_external_api] = ( + mock_rpc + ) request = {} client.get_external_api(request) @@ -22894,9 +22894,9 @@ def test_update_external_api_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_external_api] = ( + mock_rpc + ) request = {} client.update_external_api(request) @@ -23088,9 +23088,9 @@ def test_delete_external_api_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_external_api] = ( + mock_rpc + ) request = {} client.delete_external_api(request) @@ -23267,9 +23267,9 @@ def test_list_external_apis_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_external_apis - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_external_apis] = ( + mock_rpc + ) request = {} client.list_external_apis(request) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_collect.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_collect.py index d82f5ab4f702..addf14f1a765 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_collect.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_collect.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_collect import ( ApiHubCollectAsyncClient, @@ -952,10 +952,9 @@ def test_api_hub_collect_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1000,10 +999,9 @@ def test_api_hub_collect_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1037,9 @@ def test_api_hub_collect_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1289,9 +1286,7 @@ def test_api_hub_collect_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1399,9 +1394,9 @@ def test_collect_api_data_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_api_data - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_api_data] = ( + mock_rpc + ) request = {} client.collect_api_data(request) @@ -1735,9 +1730,9 @@ def test_collect_api_data_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_api_data - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_api_data] = ( + mock_rpc + ) request = {} client.collect_api_data(request) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_curate.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_curate.py index cfd2f184838b..14628ab2b935 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_curate.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_curate.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_curate import ( ApiHubCurateAsyncClient, @@ -930,10 +935,9 @@ def test_api_hub_curate_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -978,10 +982,9 @@ def test_api_hub_curate_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1020,9 @@ def test_api_hub_curate_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1263,9 +1265,7 @@ def test_api_hub_curate_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_dependencies.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_dependencies.py index bdc14ffc6a3d..2150f2f0ac16 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_dependencies.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_dependencies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_dependencies import ( ApiHubDependenciesAsyncClient, @@ -986,10 +991,9 @@ def test_api_hub_dependencies_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1034,10 +1038,9 @@ def test_api_hub_dependencies_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1073,10 +1076,9 @@ def test_api_hub_dependencies_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1328,9 +1330,7 @@ def test_api_hub_dependencies_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1449,9 +1449,9 @@ def test_create_dependency_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_dependency - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_dependency] = ( + mock_rpc + ) request = {} client.create_dependency(request) @@ -2151,9 +2151,9 @@ def test_update_dependency_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_dependency - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_dependency] = ( + mock_rpc + ) request = {} client.update_dependency(request) @@ -2503,9 +2503,9 @@ def test_delete_dependency_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_dependency - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_dependency] = ( + mock_rpc + ) request = {} client.delete_dependency(request) @@ -2837,9 +2837,9 @@ def test_list_dependencies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_dependencies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_dependencies] = ( + mock_rpc + ) request = {} client.list_dependencies(request) @@ -3310,9 +3310,9 @@ def test_create_dependency_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_dependency - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_dependency] = ( + mock_rpc + ) request = {} client.create_dependency(request) @@ -3685,9 +3685,9 @@ def test_update_dependency_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_dependency - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_dependency] = ( + mock_rpc + ) request = {} client.update_dependency(request) @@ -3877,9 +3877,9 @@ def test_delete_dependency_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_dependency - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_dependency] = ( + mock_rpc + ) request = {} client.delete_dependency(request) @@ -4054,9 +4054,9 @@ def test_list_dependencies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_dependencies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_dependencies] = ( + mock_rpc + ) request = {} client.list_dependencies(request) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_discovery.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_discovery.py index 1469f9dd919e..a0b5217c528b 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_discovery.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_discovery.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_discovery import ( ApiHubDiscoveryAsyncClient, @@ -972,10 +977,9 @@ def test_api_hub_discovery_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1020,10 +1024,9 @@ def test_api_hub_discovery_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1062,9 @@ def test_api_hub_discovery_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1309,9 +1311,7 @@ def test_api_hub_discovery_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_plugin.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_plugin.py index 0f59e45e2c67..0f1292a57ed2 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_plugin.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_plugin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.apihub_v1.services.api_hub_plugin import ( ApiHubPluginAsyncClient, @@ -940,10 +940,9 @@ def test_api_hub_plugin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +987,9 @@ def test_api_hub_plugin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1025,9 @@ def test_api_hub_plugin_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1273,9 +1270,7 @@ def test_api_hub_plugin_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3644,9 +3639,9 @@ def test_create_plugin_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_plugin_instance] = ( + mock_rpc + ) request = {} client.create_plugin_instance(request) @@ -4386,9 +4381,9 @@ def test_get_plugin_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_plugin_instance] = ( + mock_rpc + ) request = {} client.get_plugin_instance(request) @@ -4741,9 +4736,9 @@ def test_list_plugin_instances_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_plugin_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_plugin_instances] = ( + mock_rpc + ) request = {} client.list_plugin_instances(request) @@ -6008,9 +6003,9 @@ def test_update_plugin_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_plugin_instance] = ( + mock_rpc + ) request = {} client.update_plugin_instance(request) @@ -6366,9 +6361,9 @@ def test_delete_plugin_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_plugin_instance] = ( + mock_rpc + ) request = {} client.delete_plugin_instance(request) @@ -7806,9 +7801,9 @@ def test_create_plugin_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_plugin_instance] = ( + mock_rpc + ) request = {} client.create_plugin_instance(request) @@ -8205,9 +8200,9 @@ def test_get_plugin_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_plugin_instance] = ( + mock_rpc + ) request = {} client.get_plugin_instance(request) @@ -8390,9 +8385,9 @@ def test_list_plugin_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_plugin_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_plugin_instances] = ( + mock_rpc + ) request = {} client.list_plugin_instances(request) @@ -9059,9 +9054,9 @@ def test_update_plugin_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_plugin_instance] = ( + mock_rpc + ) request = {} client.update_plugin_instance(request) @@ -9246,9 +9241,9 @@ def test_delete_plugin_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_plugin_instance] = ( + mock_rpc + ) request = {} client.delete_plugin_instance(request) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_host_project_registration_service.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_host_project_registration_service.py index 6ac1486a49d3..1e9ed4153961 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_host_project_registration_service.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_host_project_registration_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.host_project_registration_service import ( HostProjectRegistrationServiceAsyncClient, @@ -1055,10 +1060,9 @@ def test_host_project_registration_service_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1103,10 +1107,9 @@ def test_host_project_registration_service_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1142,10 +1145,9 @@ def test_host_project_registration_service_client_get_mtls_endpoint_and_cert_sou "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1410,9 +1412,7 @@ def test_host_project_registration_service_client_create_channel_credentials_fil google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2822,9 +2822,9 @@ def test_create_host_project_registration_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "hostProjectRegistrationId" - ] = "host_project_registration_id_value" + jsonified_request["hostProjectRegistrationId"] = ( + "host_project_registration_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_linting_service.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_linting_service.py index 101258743ef5..904f1c68d9c4 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_linting_service.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_linting_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.apihub_v1.services.linting_service import ( LintingServiceAsyncClient, @@ -947,10 +952,9 @@ def test_linting_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -995,10 +999,9 @@ def test_linting_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1034,10 +1037,9 @@ def test_linting_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1284,9 +1286,7 @@ def test_linting_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1724,9 +1724,9 @@ def test_update_style_guide_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_style_guide - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_style_guide] = ( + mock_rpc + ) request = {} client.update_style_guide(request) @@ -2766,9 +2766,9 @@ def test_update_style_guide_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_style_guide - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_style_guide] = ( + mock_rpc + ) request = {} client.update_style_guide(request) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_provisioning.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_provisioning.py index 6592502b7783..e715738129bd 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_provisioning.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_provisioning.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.provisioning import ( ProvisioningAsyncClient, @@ -938,10 +938,9 @@ def test_provisioning_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +985,9 @@ def test_provisioning_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1023,9 @@ def test_provisioning_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1271,9 +1268,7 @@ def test_provisioning_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2108,9 +2103,9 @@ def test_get_api_hub_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_hub_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_hub_instance] = ( + mock_rpc + ) request = {} client.get_api_hub_instance(request) @@ -3106,9 +3101,9 @@ def test_get_api_hub_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_hub_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_hub_instance] = ( + mock_rpc + ) request = {} client.get_api_hub_instance(request) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_runtime_project_attachment_service.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_runtime_project_attachment_service.py index 08dfb67a51cf..be3b48285a8d 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_runtime_project_attachment_service.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_runtime_project_attachment_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.runtime_project_attachment_service import ( RuntimeProjectAttachmentServiceAsyncClient, @@ -1062,10 +1067,9 @@ def test_runtime_project_attachment_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1110,10 +1114,9 @@ def test_runtime_project_attachment_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1149,10 +1152,9 @@ def test_runtime_project_attachment_service_client_get_mtls_endpoint_and_cert_so "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1417,9 +1419,7 @@ def test_runtime_project_attachment_service_client_create_channel_credentials_fi google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3539,9 +3539,9 @@ def test_create_runtime_project_attachment_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "runtimeProjectAttachmentId" - ] = "runtime_project_attachment_id_value" + jsonified_request["runtimeProjectAttachmentId"] = ( + "runtime_project_attachment_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() diff --git a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/__init__.py b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/__init__.py index b6d6dd6925f5..bac4af4161e4 100644 --- a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/__init__.py +++ b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_api_registry import ( CloudApiRegistryAsyncClient, CloudApiRegistryClient, diff --git a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/async_client.py b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/async_client.py index 10ddf17ff0ea..1016b4cdcbe3 100644 --- a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/async_client.py +++ b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apiregistry_v1beta import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore from google.cloud.apiregistry_v1beta.services.cloud_api_registry import pagers from google.cloud.apiregistry_v1beta.types import common, resources, service @@ -120,7 +120,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudApiRegistryAsyncClient: The constructed client. """ - return CloudApiRegistryClient.from_service_account_info.__func__(CloudApiRegistryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudApiRegistryClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CloudApiRegistryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +139,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudApiRegistryAsyncClient: The constructed client. """ - return CloudApiRegistryClient.from_service_account_file.__func__(CloudApiRegistryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudApiRegistryClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CloudApiRegistryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/client.py b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/client.py index 3965038dda46..04b11833fb6a 100644 --- a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/client.py +++ b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apiregistry_v1beta import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore from google.cloud.apiregistry_v1beta.services.cloud_api_registry import pagers from google.cloud.apiregistry_v1beta.types import common, resources, service @@ -81,9 +81,7 @@ class CloudApiRegistryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudApiRegistryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudApiRegistryTransport]] _transport_registry["grpc"] = CloudApiRegistryGrpcTransport _transport_registry["grpc_asyncio"] = CloudApiRegistryGrpcAsyncIOTransport _transport_registry["rest"] = CloudApiRegistryRestTransport @@ -655,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudApiRegistryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudApiRegistryClient._read_environment_variables() + ) self._client_cert_source = CloudApiRegistryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudApiRegistryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/pagers.py b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/pagers.py index 1f14b67e4555..3ac17f745fd7 100644 --- a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/pagers.py +++ b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/base.py b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/base.py index a56f50fd0209..95c5f584ddfc 100644 --- a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/base.py +++ b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apiregistry_v1beta import gapic_version as package_version from google.cloud.apiregistry_v1beta.types import resources, service diff --git a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/grpc.py b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/grpc.py index 764ef9bf87ca..9dbe224634f9 100644 --- a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/grpc.py +++ b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apiregistry_v1beta.types import resources, service diff --git a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/grpc_asyncio.py b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/grpc_asyncio.py index 5cf3b0d01a08..47fbd4b38298 100644 --- a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/grpc_asyncio.py +++ b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apiregistry_v1beta.types import resources, service diff --git a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/rest.py b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/rest.py index 4b0aa4d418b2..bcbd78517896 100644 --- a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/rest.py +++ b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/services/cloud_api_registry/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -779,9 +779,7 @@ def __call__( """ - http_options = ( - _BaseCloudApiRegistryRestTransport._BaseListMcpServers._get_http_options() - ) + http_options = _BaseCloudApiRegistryRestTransport._BaseListMcpServers._get_http_options() request, metadata = self._interceptor.pre_list_mcp_servers( request, metadata @@ -1245,9 +1243,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseCloudApiRegistryRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseCloudApiRegistryRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseCloudApiRegistryRestTransport._BaseListLocations._get_transcoded_request( diff --git a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/types/__init__.py b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/types/__init__.py index 3e33ec179e65..50b90d9af7b0 100644 --- a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/types/__init__.py +++ b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/types/__init__.py @@ -13,8 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .common import State -from .resources import McpServer, McpTool +from .common import ( + State, +) +from .resources import ( + McpServer, + McpTool, +) from .service import ( GetMcpServerRequest, GetMcpToolRequest, diff --git a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/types/common.py b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/types/common.py index 449448196ab4..0a7d0f507965 100644 --- a/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/types/common.py +++ b/packages/google-cloud-apiregistry/google/cloud/apiregistry_v1beta/types/common.py @@ -38,6 +38,7 @@ class State(proto.Enum): DISABLED (2): The McpServer is disabled. """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 diff --git a/packages/google-cloud-apiregistry/mypy.ini b/packages/google-cloud-apiregistry/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-apiregistry/mypy.ini +++ b/packages/google-cloud-apiregistry/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-apiregistry/noxfile.py b/packages/google-cloud-apiregistry/noxfile.py index 762b83f8df40..b1ecdac17a3e 100644 --- a/packages/google-cloud-apiregistry/noxfile.py +++ b/packages/google-cloud-apiregistry/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-apiregistry/tests/unit/gapic/apiregistry_v1beta/test_cloud_api_registry.py b/packages/google-cloud-apiregistry/tests/unit/gapic/apiregistry_v1beta/test_cloud_api_registry.py index 4207e20b86bc..afaf2ca4afae 100644 --- a/packages/google-cloud-apiregistry/tests/unit/gapic/apiregistry_v1beta/test_cloud_api_registry.py +++ b/packages/google-cloud-apiregistry/tests/unit/gapic/apiregistry_v1beta/test_cloud_api_registry.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.apiregistry_v1beta.services.cloud_api_registry import ( CloudApiRegistryAsyncClient, @@ -972,10 +977,9 @@ def test_cloud_api_registry_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1020,10 +1024,9 @@ def test_cloud_api_registry_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1062,9 @@ def test_cloud_api_registry_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1314,9 +1316,7 @@ def test_cloud_api_registry_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1766,9 +1766,9 @@ def test_list_mcp_servers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_mcp_servers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_mcp_servers] = ( + mock_rpc + ) request = {} client.list_mcp_servers(request) @@ -3259,9 +3259,9 @@ def test_list_mcp_servers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_mcp_servers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_mcp_servers] = ( + mock_rpc + ) request = {} client.list_mcp_servers(request) diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/__init__.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/__init__.py index 4cc2b3054f63..437020511a2d 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/__init__.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.applications import ApplicationsAsyncClient, ApplicationsClient from .services.authorized_certificates import ( AuthorizedCertificatesAsyncClient, diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/async_client.py index 7c0d48ac54c3..2f51c395f087 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -111,7 +111,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApplicationsAsyncClient: The constructed client. """ - return ApplicationsClient.from_service_account_info.__func__(ApplicationsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ApplicationsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ApplicationsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -127,7 +130,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApplicationsAsyncClient: The constructed client. """ - return ApplicationsClient.from_service_account_file.__func__(ApplicationsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ApplicationsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ApplicationsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/client.py index 7f82b4813c82..72136a3afc1c 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -600,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApplicationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApplicationsClient._read_environment_variables() + ) self._client_cert_source = ApplicationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -639,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApplicationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/base.py index 7e97af103208..42b58a4dd0c2 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine, application diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc.py index 016932ec909f..83e2e6661b26 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, application diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc_asyncio.py index cf74d017d13a..a2995e8361da 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, application diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/rest.py index fb13ba6b8672..ed43c201899a 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -490,9 +490,7 @@ def __call__( """ - http_options = ( - _BaseApplicationsRestTransport._BaseCreateApplication._get_http_options() - ) + http_options = _BaseApplicationsRestTransport._BaseCreateApplication._get_http_options() request, metadata = self._interceptor.pre_create_application( request, metadata @@ -791,9 +789,7 @@ def __call__( """ - http_options = ( - _BaseApplicationsRestTransport._BaseRepairApplication._get_http_options() - ) + http_options = _BaseApplicationsRestTransport._BaseRepairApplication._get_http_options() request, metadata = self._interceptor.pre_repair_application( request, metadata @@ -944,9 +940,7 @@ def __call__( """ - http_options = ( - _BaseApplicationsRestTransport._BaseUpdateApplication._get_http_options() - ) + http_options = _BaseApplicationsRestTransport._BaseUpdateApplication._get_http_options() request, metadata = self._interceptor.pre_update_application( request, metadata diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/async_client.py index 5ce7824ad9ec..f9cbc59e3738 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -118,7 +118,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AuthorizedCertificatesAsyncClient: The constructed client. """ - return AuthorizedCertificatesClient.from_service_account_info.__func__(AuthorizedCertificatesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AuthorizedCertificatesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AuthorizedCertificatesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +137,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AuthorizedCertificatesAsyncClient: The constructed client. """ - return AuthorizedCertificatesClient.from_service_account_file.__func__(AuthorizedCertificatesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AuthorizedCertificatesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + AuthorizedCertificatesAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -172,7 +180,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AuthorizedCertificatesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AuthorizedCertificatesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AuthorizedCertificatesTransport: diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/client.py index 9bc51100f535..f3e78b39b64d 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -80,9 +80,7 @@ class AuthorizedCertificatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AuthorizedCertificatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AuthorizedCertificatesTransport]] _transport_registry["grpc"] = AuthorizedCertificatesGrpcTransport _transport_registry["grpc_asyncio"] = AuthorizedCertificatesGrpcAsyncIOTransport _transport_registry["rest"] = AuthorizedCertificatesRestTransport @@ -609,11 +607,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AuthorizedCertificatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AuthorizedCertificatesClient._read_environment_variables() + ) self._client_cert_source = AuthorizedCertificatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -648,8 +644,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AuthorizedCertificatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/pagers.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/pagers.py index 82799da9fd2e..fd1ff7268080 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/pagers.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/__init__.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/__init__.py index 8a2cd57fe131..686c4eabc3c0 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/__init__.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AuthorizedCertificatesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AuthorizedCertificatesTransport]] _transport_registry["grpc"] = AuthorizedCertificatesGrpcTransport _transport_registry["grpc_asyncio"] = AuthorizedCertificatesGrpcAsyncIOTransport _transport_registry["rest"] = AuthorizedCertificatesRestTransport diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/base.py index a64a9b5167e4..14f359bf23c6 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine, certificate diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc.py index d6fc32166e82..f89120186996 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.appengine_admin_v1.types import appengine, certificate @@ -347,12 +347,12 @@ def list_authorized_certificates( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_authorized_certificates" not in self._stubs: - self._stubs[ - "list_authorized_certificates" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/ListAuthorizedCertificates", - request_serializer=appengine.ListAuthorizedCertificatesRequest.serialize, - response_deserializer=appengine.ListAuthorizedCertificatesResponse.deserialize, + self._stubs["list_authorized_certificates"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/ListAuthorizedCertificates", + request_serializer=appengine.ListAuthorizedCertificatesRequest.serialize, + response_deserializer=appengine.ListAuthorizedCertificatesResponse.deserialize, + ) ) return self._stubs["list_authorized_certificates"] @@ -377,12 +377,12 @@ def get_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_authorized_certificate" not in self._stubs: - self._stubs[ - "get_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/GetAuthorizedCertificate", - request_serializer=appengine.GetAuthorizedCertificateRequest.serialize, - response_deserializer=certificate.AuthorizedCertificate.deserialize, + self._stubs["get_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/GetAuthorizedCertificate", + request_serializer=appengine.GetAuthorizedCertificateRequest.serialize, + response_deserializer=certificate.AuthorizedCertificate.deserialize, + ) ) return self._stubs["get_authorized_certificate"] @@ -408,12 +408,12 @@ def create_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_authorized_certificate" not in self._stubs: - self._stubs[ - "create_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/CreateAuthorizedCertificate", - request_serializer=appengine.CreateAuthorizedCertificateRequest.serialize, - response_deserializer=certificate.AuthorizedCertificate.deserialize, + self._stubs["create_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/CreateAuthorizedCertificate", + request_serializer=appengine.CreateAuthorizedCertificateRequest.serialize, + response_deserializer=certificate.AuthorizedCertificate.deserialize, + ) ) return self._stubs["create_authorized_certificate"] @@ -444,12 +444,12 @@ def update_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_authorized_certificate" not in self._stubs: - self._stubs[ - "update_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/UpdateAuthorizedCertificate", - request_serializer=appengine.UpdateAuthorizedCertificateRequest.serialize, - response_deserializer=certificate.AuthorizedCertificate.deserialize, + self._stubs["update_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/UpdateAuthorizedCertificate", + request_serializer=appengine.UpdateAuthorizedCertificateRequest.serialize, + response_deserializer=certificate.AuthorizedCertificate.deserialize, + ) ) return self._stubs["update_authorized_certificate"] @@ -472,12 +472,12 @@ def delete_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_authorized_certificate" not in self._stubs: - self._stubs[ - "delete_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/DeleteAuthorizedCertificate", - request_serializer=appengine.DeleteAuthorizedCertificateRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/DeleteAuthorizedCertificate", + request_serializer=appengine.DeleteAuthorizedCertificateRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_authorized_certificate"] diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc_asyncio.py index 61a21766a889..0af5c558e76e 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, certificate @@ -355,12 +355,12 @@ def list_authorized_certificates( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_authorized_certificates" not in self._stubs: - self._stubs[ - "list_authorized_certificates" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/ListAuthorizedCertificates", - request_serializer=appengine.ListAuthorizedCertificatesRequest.serialize, - response_deserializer=appengine.ListAuthorizedCertificatesResponse.deserialize, + self._stubs["list_authorized_certificates"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/ListAuthorizedCertificates", + request_serializer=appengine.ListAuthorizedCertificatesRequest.serialize, + response_deserializer=appengine.ListAuthorizedCertificatesResponse.deserialize, + ) ) return self._stubs["list_authorized_certificates"] @@ -386,12 +386,12 @@ def get_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_authorized_certificate" not in self._stubs: - self._stubs[ - "get_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/GetAuthorizedCertificate", - request_serializer=appengine.GetAuthorizedCertificateRequest.serialize, - response_deserializer=certificate.AuthorizedCertificate.deserialize, + self._stubs["get_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/GetAuthorizedCertificate", + request_serializer=appengine.GetAuthorizedCertificateRequest.serialize, + response_deserializer=certificate.AuthorizedCertificate.deserialize, + ) ) return self._stubs["get_authorized_certificate"] @@ -417,12 +417,12 @@ def create_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_authorized_certificate" not in self._stubs: - self._stubs[ - "create_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/CreateAuthorizedCertificate", - request_serializer=appengine.CreateAuthorizedCertificateRequest.serialize, - response_deserializer=certificate.AuthorizedCertificate.deserialize, + self._stubs["create_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/CreateAuthorizedCertificate", + request_serializer=appengine.CreateAuthorizedCertificateRequest.serialize, + response_deserializer=certificate.AuthorizedCertificate.deserialize, + ) ) return self._stubs["create_authorized_certificate"] @@ -453,12 +453,12 @@ def update_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_authorized_certificate" not in self._stubs: - self._stubs[ - "update_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/UpdateAuthorizedCertificate", - request_serializer=appengine.UpdateAuthorizedCertificateRequest.serialize, - response_deserializer=certificate.AuthorizedCertificate.deserialize, + self._stubs["update_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/UpdateAuthorizedCertificate", + request_serializer=appengine.UpdateAuthorizedCertificateRequest.serialize, + response_deserializer=certificate.AuthorizedCertificate.deserialize, + ) ) return self._stubs["update_authorized_certificate"] @@ -483,12 +483,12 @@ def delete_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_authorized_certificate" not in self._stubs: - self._stubs[ - "delete_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/DeleteAuthorizedCertificate", - request_serializer=appengine.DeleteAuthorizedCertificateRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/DeleteAuthorizedCertificate", + request_serializer=appengine.DeleteAuthorizedCertificateRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_authorized_certificate"] diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest.py index 6eed1eff9d98..81230a5827a8 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.appengine_admin_v1.types import appengine, certificate @@ -490,9 +490,7 @@ def __call__( """ - http_options = ( - _BaseAuthorizedCertificatesRestTransport._BaseCreateAuthorizedCertificate._get_http_options() - ) + http_options = _BaseAuthorizedCertificatesRestTransport._BaseCreateAuthorizedCertificate._get_http_options() request, metadata = self._interceptor.pre_create_authorized_certificate( request, metadata @@ -561,11 +559,10 @@ def __call__( resp = self._interceptor.post_create_authorized_certificate(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_authorized_certificate_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_authorized_certificate_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -647,9 +644,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAuthorizedCertificatesRestTransport._BaseDeleteAuthorizedCertificate._get_http_options() - ) + http_options = _BaseAuthorizedCertificatesRestTransport._BaseDeleteAuthorizedCertificate._get_http_options() request, metadata = self._interceptor.pre_delete_authorized_certificate( request, metadata @@ -767,9 +762,7 @@ def __call__( """ - http_options = ( - _BaseAuthorizedCertificatesRestTransport._BaseGetAuthorizedCertificate._get_http_options() - ) + http_options = _BaseAuthorizedCertificatesRestTransport._BaseGetAuthorizedCertificate._get_http_options() request, metadata = self._interceptor.pre_get_authorized_certificate( request, metadata @@ -922,9 +915,7 @@ def __call__( """ - http_options = ( - _BaseAuthorizedCertificatesRestTransport._BaseListAuthorizedCertificates._get_http_options() - ) + http_options = _BaseAuthorizedCertificatesRestTransport._BaseListAuthorizedCertificates._get_http_options() request, metadata = self._interceptor.pre_list_authorized_certificates( request, metadata @@ -1081,9 +1072,7 @@ def __call__( """ - http_options = ( - _BaseAuthorizedCertificatesRestTransport._BaseUpdateAuthorizedCertificate._get_http_options() - ) + http_options = _BaseAuthorizedCertificatesRestTransport._BaseUpdateAuthorizedCertificate._get_http_options() request, metadata = self._interceptor.pre_update_authorized_certificate( request, metadata @@ -1152,11 +1141,10 @@ def __call__( resp = self._interceptor.post_update_authorized_certificate(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_authorized_certificate_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_authorized_certificate_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1192,7 +1180,9 @@ def create_authorized_certificate( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateAuthorizedCertificate(self._session, self._host, self._interceptor) # type: ignore + return self._CreateAuthorizedCertificate( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_authorized_certificate( @@ -1200,7 +1190,9 @@ def delete_authorized_certificate( ) -> Callable[[appengine.DeleteAuthorizedCertificateRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteAuthorizedCertificate(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteAuthorizedCertificate( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_authorized_certificate( @@ -1210,7 +1202,9 @@ def get_authorized_certificate( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetAuthorizedCertificate(self._session, self._host, self._interceptor) # type: ignore + return self._GetAuthorizedCertificate( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_authorized_certificates( @@ -1221,7 +1215,9 @@ def list_authorized_certificates( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListAuthorizedCertificates(self._session, self._host, self._interceptor) # type: ignore + return self._ListAuthorizedCertificates( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_authorized_certificate( @@ -1232,7 +1228,9 @@ def update_authorized_certificate( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateAuthorizedCertificate(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAuthorizedCertificate( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest_base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest_base.py index e1908daf0f34..39f00a1d017b 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest_base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.appengine_admin_v1.types import appengine, certificate diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/async_client.py index e1e63800bc60..fdaefb63d6e6 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -114,7 +114,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AuthorizedDomainsAsyncClient: The constructed client. """ - return AuthorizedDomainsClient.from_service_account_info.__func__(AuthorizedDomainsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AuthorizedDomainsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AuthorizedDomainsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +133,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AuthorizedDomainsAsyncClient: The constructed client. """ - return AuthorizedDomainsClient.from_service_account_file.__func__(AuthorizedDomainsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AuthorizedDomainsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AuthorizedDomainsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/client.py index 039bf8e83afb..ce6aedd58404 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class AuthorizedDomainsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AuthorizedDomainsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AuthorizedDomainsTransport]] _transport_registry["grpc"] = AuthorizedDomainsGrpcTransport _transport_registry["grpc_asyncio"] = AuthorizedDomainsGrpcAsyncIOTransport _transport_registry["rest"] = AuthorizedDomainsRestTransport @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AuthorizedDomainsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AuthorizedDomainsClient._read_environment_variables() + ) self._client_cert_source = AuthorizedDomainsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -644,8 +640,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AuthorizedDomainsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/pagers.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/pagers.py index dd1ef6cf9bba..b661dffaf16f 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/pagers.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/base.py index a7596352c9d8..d09dadb0a9bd 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc.py index fc410bde8dc4..c76625483ecf 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.appengine_admin_v1.types import appengine diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc_asyncio.py index 67dfc209d653..018c382272bb 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/rest.py index 3f08a82d27e8..d29250992bd6 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -284,9 +284,7 @@ def __call__( """ - http_options = ( - _BaseAuthorizedDomainsRestTransport._BaseListAuthorizedDomains._get_http_options() - ) + http_options = _BaseAuthorizedDomainsRestTransport._BaseListAuthorizedDomains._get_http_options() request, metadata = self._interceptor.pre_list_authorized_domains( request, metadata diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/async_client.py index 09390cd25616..695a0865d581 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -116,7 +116,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DomainMappingsAsyncClient: The constructed client. """ - return DomainMappingsClient.from_service_account_info.__func__(DomainMappingsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DomainMappingsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DomainMappingsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +135,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DomainMappingsAsyncClient: The constructed client. """ - return DomainMappingsClient.from_service_account_file.__func__(DomainMappingsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DomainMappingsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DomainMappingsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/client.py index b72c58d190ff..e4f946f4e1b2 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -83,9 +83,7 @@ class DomainMappingsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DomainMappingsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DomainMappingsTransport]] _transport_registry["grpc"] = DomainMappingsGrpcTransport _transport_registry["grpc_asyncio"] = DomainMappingsGrpcAsyncIOTransport _transport_registry["rest"] = DomainMappingsRestTransport @@ -603,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DomainMappingsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DomainMappingsClient._read_environment_variables() + ) self._client_cert_source = DomainMappingsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -642,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DomainMappingsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/pagers.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/pagers.py index 9d01155bf811..91645c638b8b 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/pagers.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/base.py index 8510cc891841..6035be42c379 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine, domain_mapping diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc.py index 738454660b29..5094f07f29e3 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, domain_mapping diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc_asyncio.py index 43ccd5368e96..d8b390ea0fec 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, domain_mapping diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/rest.py index 4d1b84ce71da..5a19d0fb8cf3 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -550,9 +550,7 @@ def __call__( """ - http_options = ( - _BaseDomainMappingsRestTransport._BaseCreateDomainMapping._get_http_options() - ) + http_options = _BaseDomainMappingsRestTransport._BaseCreateDomainMapping._get_http_options() request, metadata = self._interceptor.pre_create_domain_mapping( request, metadata @@ -704,9 +702,7 @@ def __call__( """ - http_options = ( - _BaseDomainMappingsRestTransport._BaseDeleteDomainMapping._get_http_options() - ) + http_options = _BaseDomainMappingsRestTransport._BaseDeleteDomainMapping._get_http_options() request, metadata = self._interceptor.pre_delete_domain_mapping( request, metadata @@ -850,9 +846,7 @@ def __call__( """ - http_options = ( - _BaseDomainMappingsRestTransport._BaseGetDomainMapping._get_http_options() - ) + http_options = _BaseDomainMappingsRestTransport._BaseGetDomainMapping._get_http_options() request, metadata = self._interceptor.pre_get_domain_mapping( request, metadata @@ -999,9 +993,7 @@ def __call__( """ - http_options = ( - _BaseDomainMappingsRestTransport._BaseListDomainMappings._get_http_options() - ) + http_options = _BaseDomainMappingsRestTransport._BaseListDomainMappings._get_http_options() request, metadata = self._interceptor.pre_list_domain_mappings( request, metadata @@ -1153,9 +1145,7 @@ def __call__( """ - http_options = ( - _BaseDomainMappingsRestTransport._BaseUpdateDomainMapping._get_http_options() - ) + http_options = _BaseDomainMappingsRestTransport._BaseUpdateDomainMapping._get_http_options() request, metadata = self._interceptor.pre_update_domain_mapping( request, metadata diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/async_client.py index 291d4545687d..30c155c47cfe 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -115,7 +115,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FirewallAsyncClient: The constructed client. """ - return FirewallClient.from_service_account_info.__func__(FirewallAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + FirewallClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(FirewallAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +134,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FirewallAsyncClient: The constructed client. """ - return FirewallClient.from_service_account_file.__func__(FirewallAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + FirewallClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(FirewallAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/client.py index 7d192d189895..e3a1898d6e24 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -608,11 +608,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FirewallClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FirewallClient._read_environment_variables() + ) self._client_cert_source = FirewallClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -647,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FirewallTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/pagers.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/pagers.py index 6b0e26b0db47..9dacf6fda002 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/pagers.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/base.py index 5d937bd11971..4117fd4b8c7c 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine, firewall diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc.py index b03351d968ef..8ac35be68eb6 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.appengine_admin_v1.types import appengine, firewall @@ -389,12 +389,12 @@ def batch_update_ingress_rules( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_ingress_rules" not in self._stubs: - self._stubs[ - "batch_update_ingress_rules" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.Firewall/BatchUpdateIngressRules", - request_serializer=appengine.BatchUpdateIngressRulesRequest.serialize, - response_deserializer=appengine.BatchUpdateIngressRulesResponse.deserialize, + self._stubs["batch_update_ingress_rules"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.Firewall/BatchUpdateIngressRules", + request_serializer=appengine.BatchUpdateIngressRulesRequest.serialize, + response_deserializer=appengine.BatchUpdateIngressRulesResponse.deserialize, + ) ) return self._stubs["batch_update_ingress_rules"] diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc_asyncio.py index 3a1f4d2770f0..4f6e9ac426d7 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, firewall @@ -398,12 +398,12 @@ def batch_update_ingress_rules( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_ingress_rules" not in self._stubs: - self._stubs[ - "batch_update_ingress_rules" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.Firewall/BatchUpdateIngressRules", - request_serializer=appengine.BatchUpdateIngressRulesRequest.serialize, - response_deserializer=appengine.BatchUpdateIngressRulesResponse.deserialize, + self._stubs["batch_update_ingress_rules"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.Firewall/BatchUpdateIngressRules", + request_serializer=appengine.BatchUpdateIngressRulesRequest.serialize, + response_deserializer=appengine.BatchUpdateIngressRulesResponse.deserialize, + ) ) return self._stubs["batch_update_ingress_rules"] diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest.py index bac29037760d..4a8f900ca0f3 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.appengine_admin_v1.types import appengine, firewall @@ -539,9 +539,7 @@ def __call__( Response message for ``Firewall.UpdateAllIngressRules``. """ - http_options = ( - _BaseFirewallRestTransport._BaseBatchUpdateIngressRules._get_http_options() - ) + http_options = _BaseFirewallRestTransport._BaseBatchUpdateIngressRules._get_http_options() request, metadata = self._interceptor.pre_batch_update_ingress_rules( request, metadata @@ -1371,7 +1369,9 @@ def batch_update_ingress_rules( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchUpdateIngressRules(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateIngressRules( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_ingress_rule( diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest_base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest_base.py index 57c2efd0776f..937766eeea7a 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest_base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.appengine_admin_v1.types import appengine, firewall diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/async_client.py index c089f910e07c..b8687acb13cf 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: InstancesAsyncClient: The constructed client. """ - return InstancesClient.from_service_account_info.__func__(InstancesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + InstancesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(InstancesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: InstancesAsyncClient: The constructed client. """ - return InstancesClient.from_service_account_file.__func__(InstancesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + InstancesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(InstancesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/client.py index ad9fd8234b39..63b71f0b2121 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -626,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstancesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstancesClient._read_environment_variables() + ) self._client_cert_source = InstancesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstancesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/pagers.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/pagers.py index 3aa7c8cb6bf5..510157eb6226 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/pagers.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/base.py index 17fd1aa5dad2..fd3c50c66890 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine, instance diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc.py index 46a04f3da6a4..692f0b7ef416 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, instance diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc_asyncio.py index 0b884d0bdd3a..cb3461fe03a8 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, instance diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/rest.py index 138ab7d47afb..80c6efb3cc3c 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/async_client.py index 2fbe8f3176e7..c4af09d9019a 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -49,9 +49,8 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.services import pagers -from google.cloud.appengine_admin_v1.types import appengine, network_settings +from google.cloud.appengine_admin_v1.types import appengine, network_settings, service from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import service from .client import ServicesClient from .transports.base import DEFAULT_CLIENT_INFO, ServicesTransport @@ -109,7 +108,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ServicesAsyncClient: The constructed client. """ - return ServicesClient.from_service_account_info.__func__(ServicesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ServicesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ServicesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -125,7 +127,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ServicesAsyncClient: The constructed client. """ - return ServicesClient.from_service_account_file.__func__(ServicesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ServicesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ServicesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/client.py index 40dbe4c50180..48f17675d6a0 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -66,9 +66,8 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.services import pagers -from google.cloud.appengine_admin_v1.types import appengine, network_settings +from google.cloud.appengine_admin_v1.types import appengine, network_settings, service from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import service from .transports.base import DEFAULT_CLIENT_INFO, ServicesTransport from .transports.grpc import ServicesGrpcTransport @@ -602,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServicesClient._read_environment_variables() + ) self._client_cert_source = ServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/pagers.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/pagers.py index 9d6255602818..d819a68b5ce4 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/pagers.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/base.py index 19d7031d57ca..e1e560d131af 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine, service diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc.py index d16c79450f05..fb326a494a35 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, service diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc_asyncio.py index 81367d87e6d4..e1e96c558e77 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, service diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/rest.py index ea53dfe0bac9..9b02f4edff39 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/async_client.py index ee2bb926669a..e877a1d89347 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -51,9 +51,8 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.versions import pagers -from google.cloud.appengine_admin_v1.types import app_yaml, appengine, deploy +from google.cloud.appengine_admin_v1.types import app_yaml, appengine, deploy, version from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import version from .client import VersionsClient from .transports.base import DEFAULT_CLIENT_INFO, VersionsTransport @@ -111,7 +110,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_info.__func__(VersionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + VersionsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(VersionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -127,7 +129,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_file.__func__(VersionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + VersionsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(VersionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/client.py index a2145729de3a..a27269e84cc8 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -68,9 +68,8 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.versions import pagers -from google.cloud.appengine_admin_v1.types import app_yaml, appengine, deploy +from google.cloud.appengine_admin_v1.types import app_yaml, appengine, deploy, version from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import version from .transports.base import DEFAULT_CLIENT_INFO, VersionsTransport from .transports.grpc import VersionsGrpcTransport @@ -604,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VersionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VersionsClient._read_environment_variables() + ) self._client_cert_source = VersionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +640,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VersionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/pagers.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/pagers.py index 2b850ad5f8ac..ea393bb6ac5d 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/pagers.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/base.py index b347ce47134d..28c3046bf5ac 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine, version diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc.py index 8c866946e586..4afb2cfe3e0e 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, version diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc_asyncio.py index a32ed2bc5683..92da4c13961e 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, version diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/rest.py index 82c9c566cf3e..c234841ba071 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/__init__.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/__init__.py index a07f2784027d..dd66cc3217fe 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/__init__.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/__init__.py @@ -75,23 +75,56 @@ UpdateVersionRequest, VersionView, ) -from .application import Application, UrlDispatchRule -from .audit_data import AuditData, CreateVersionMethod, UpdateServiceMethod +from .application import ( + Application, + UrlDispatchRule, +) +from .audit_data import ( + AuditData, + CreateVersionMethod, + UpdateServiceMethod, +) from .certificate import ( AuthorizedCertificate, CertificateRawData, ManagedCertificate, ManagementStatus, ) -from .deploy import CloudBuildOptions, ContainerInfo, Deployment, FileInfo, ZipInfo -from .domain import AuthorizedDomain -from .domain_mapping import DomainMapping, ResourceRecord, SslSettings -from .firewall import FirewallRule -from .instance import Instance -from .location import LocationMetadata -from .network_settings import NetworkSettings -from .operation import CreateVersionMetadataV1, OperationMetadataV1 -from .service import Service, TrafficSplit +from .deploy import ( + CloudBuildOptions, + ContainerInfo, + Deployment, + FileInfo, + ZipInfo, +) +from .domain import ( + AuthorizedDomain, +) +from .domain_mapping import ( + DomainMapping, + ResourceRecord, + SslSettings, +) +from .firewall import ( + FirewallRule, +) +from .instance import ( + Instance, +) +from .location import ( + LocationMetadata, +) +from .network_settings import ( + NetworkSettings, +) +from .operation import ( + CreateVersionMetadataV1, + OperationMetadataV1, +) +from .service import ( + Service, + TrafficSplit, +) from .version import ( AutomaticScaling, BasicScaling, diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/app_yaml.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/app_yaml.py index d05b2cf60551..95bfdd6f0569 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/app_yaml.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/app_yaml.py @@ -54,6 +54,7 @@ class AuthFailAction(proto.Enum): Rejects request with a ``401`` HTTP status code and an error message. """ + AUTH_FAIL_ACTION_UNSPECIFIED = 0 AUTH_FAIL_ACTION_REDIRECT = 1 AUTH_FAIL_ACTION_UNAUTHORIZED = 2 @@ -77,6 +78,7 @@ class LoginRequirement(proto.Enum): If the user has signed in, the handler proceeds normally. Otherwise, the auth_fail_action is taken. """ + LOGIN_UNSPECIFIED = 0 LOGIN_OPTIONAL = 1 LOGIN_ADMIN = 2 @@ -110,6 +112,7 @@ class SecurityLevel(proto.Enum): redirected to the HTTPS URL with the same path. Query parameters are reserved for the redirect. """ + _pb_options = {"allow_alias": True} SECURE_UNSPECIFIED = 0 SECURE_DEFAULT = 0 @@ -194,6 +197,7 @@ class ErrorCode(proto.Enum): Deadline reached before the application responds. """ + _pb_options = {"allow_alias": True} ERROR_CODE_UNSPECIFIED = 0 ERROR_CODE_DEFAULT = 0 @@ -282,6 +286,7 @@ class RedirectHttpResponseCode(proto.Enum): REDIRECT_HTTP_RESPONSE_CODE_307 (4): ``307 Temporary Redirect`` code. """ + REDIRECT_HTTP_RESPONSE_CODE_UNSPECIFIED = 0 REDIRECT_HTTP_RESPONSE_CODE_301 = 1 REDIRECT_HTTP_RESPONSE_CODE_302 = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/appengine.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/appengine.py index 6ec34a5f37d8..bc7720fdb5a5 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/appengine.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/appengine.py @@ -20,11 +20,10 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.appengine_admin_v1.types import domain_mapping as ga_domain_mapping from google.cloud.appengine_admin_v1.types import application as ga_application from google.cloud.appengine_admin_v1.types import certificate as ga_certificate -from google.cloud.appengine_admin_v1.types import domain -from google.cloud.appengine_admin_v1.types import firewall, instance +from google.cloud.appengine_admin_v1.types import domain, firewall, instance +from google.cloud.appengine_admin_v1.types import domain_mapping as ga_domain_mapping from google.cloud.appengine_admin_v1.types import service as ga_service from google.cloud.appengine_admin_v1.types import version as ga_version @@ -95,6 +94,7 @@ class VersionView(proto.Enum): resources, but is not returned in ``Get`` or ``List`` by default. """ + BASIC = 0 FULL = 1 @@ -112,6 +112,7 @@ class AuthorizedCertificateView(proto.Enum): information on the domain mappings that have this certificate mapped. """ + BASIC_CERTIFICATE = 0 FULL_CERTIFICATE = 1 @@ -135,6 +136,7 @@ class DomainOverrideStrategy(proto.Enum): Engine application, that app will no longer serve from that domain. """ + UNSPECIFIED_DOMAIN_OVERRIDE_STRATEGY = 0 STRICT = 1 OVERRIDE = 2 @@ -923,12 +925,12 @@ class ListAuthorizedCertificatesResponse(proto.Message): def raw_page(self): return self - certificates: MutableSequence[ - ga_certificate.AuthorizedCertificate - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=ga_certificate.AuthorizedCertificate, + certificates: MutableSequence[ga_certificate.AuthorizedCertificate] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=ga_certificate.AuthorizedCertificate, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1074,12 +1076,12 @@ class ListDomainMappingsResponse(proto.Message): def raw_page(self): return self - domain_mappings: MutableSequence[ - ga_domain_mapping.DomainMapping - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=ga_domain_mapping.DomainMapping, + domain_mappings: MutableSequence[ga_domain_mapping.DomainMapping] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=ga_domain_mapping.DomainMapping, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/application.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/application.py index f9e1f5c0b121..e163675593b8 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/application.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/application.py @@ -120,6 +120,7 @@ class ServingStatus(proto.Enum): SYSTEM_DISABLED (3): Application has been disabled by the system. """ + UNSPECIFIED = 0 SERVING = 1 USER_DISABLED = 2 @@ -138,6 +139,7 @@ class DatabaseType(proto.Enum): CLOUD_DATASTORE_COMPATIBILITY (3): Cloud Firestore in Datastore Mode """ + DATABASE_TYPE_UNSPECIFIED = 0 CLOUD_DATASTORE = 1 CLOUD_FIRESTORE = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/certificate.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/certificate.py index dfb8b17a35d0..4c6335704491 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/certificate.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/certificate.py @@ -72,6 +72,7 @@ class ManagementStatus(proto.Enum): domain. The last successfully provisioned certificate may still be serving. """ + MANAGEMENT_STATUS_UNSPECIFIED = 0 OK = 1 PENDING = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/domain_mapping.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/domain_mapping.py index aca8bc775edc..d3a00e351a3a 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/domain_mapping.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/domain_mapping.py @@ -125,6 +125,7 @@ class SslManagementType(proto.Enum): SSL support or a user-obtained SSL certificate has been explictly mapped to this domain. """ + SSL_MANAGEMENT_TYPE_UNSPECIFIED = 0 AUTOMATIC = 1 MANUAL = 2 @@ -175,6 +176,7 @@ class RecordType(proto.Enum): A CNAME resource record. Data is a domain name to be aliased. """ + RECORD_TYPE_UNSPECIFIED = 0 A = 1 AAAA = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/firewall.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/firewall.py index b8b0ea570eb6..6dca5f5e3663 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/firewall.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/firewall.py @@ -73,6 +73,7 @@ class Action(proto.Enum): DENY (2): Matching requests are denied. """ + UNSPECIFIED_ACTION = 0 ALLOW = 1 DENY = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/instance.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/instance.py index a3d1bd200711..68992ec5e287 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/instance.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/instance.py @@ -104,6 +104,7 @@ class Availability(proto.Enum): DYNAMIC (2): No description available. """ + UNSPECIFIED = 0 RESIDENT = 1 DYNAMIC = 2 @@ -142,6 +143,7 @@ class LivenessState(proto.Enum): cannot be established, or the server does not respond within the specified timeout. """ + LIVENESS_STATE_UNSPECIFIED = 0 UNKNOWN = 1 HEALTHY = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/network_settings.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/network_settings.py index 211a6045870e..80f99816c4d3 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/network_settings.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/network_settings.py @@ -52,6 +52,7 @@ class IngressTrafficAllowed(proto.Enum): Allow HTTP traffic from private VPC sources and through load balancers. """ + INGRESS_TRAFFIC_ALLOWED_UNSPECIFIED = 0 INGRESS_TRAFFIC_ALLOWED_ALL = 1 INGRESS_TRAFFIC_ALLOWED_INTERNAL_ONLY = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/service.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/service.py index d653f81d84e0..d54e666008fc 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/service.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/service.py @@ -149,6 +149,7 @@ class ShardBy(proto.Enum): probability proportional to the version's traffic share. """ + UNSPECIFIED = 0 COOKIE = 1 IP = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/version.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/version.py index e5832427f856..1704295d73ba 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/version.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/version.py @@ -77,6 +77,7 @@ class InboundServiceType(proto.Enum): INBOUND_SERVICE_WARMUP (9): Enables warmup requests. """ + INBOUND_SERVICE_UNSPECIFIED = 0 INBOUND_SERVICE_MAIL = 1 INBOUND_SERVICE_MAIL_BOUNCE = 2 @@ -103,6 +104,7 @@ class ServingStatus(proto.Enum): settings are ignored until the state of the version changes to ``SERVING``. """ + SERVING_STATUS_UNSPECIFIED = 0 SERVING = 1 STOPPED = 2 @@ -556,6 +558,7 @@ class RolloutStrategy(proto.Enum): Endpoints service configuration ID will be updated with each rollout. """ + UNSPECIFIED_ROLLOUT_STRATEGY = 0 FIXED = 1 MANAGED = 2 @@ -1051,6 +1054,7 @@ class EgressSetting(proto.Enum): Use the VPC Access Connector for private IP space from RFC1918. """ + EGRESS_SETTING_UNSPECIFIED = 0 ALL_TRAFFIC = 1 PRIVATE_IP_RANGES = 2 diff --git a/packages/google-cloud-appengine-admin/mypy.ini b/packages/google-cloud-appengine-admin/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-appengine-admin/mypy.ini +++ b/packages/google-cloud-appengine-admin/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-appengine-admin/noxfile.py b/packages/google-cloud-appengine-admin/noxfile.py index 89f252592c01..f94a0aaf7e6d 100644 --- a/packages/google-cloud-appengine-admin/noxfile.py +++ b/packages/google-cloud-appengine-admin/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_applications.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_applications.py index ee6f8cf33b69..172419108c10 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_applications.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_applications.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.applications import ( ApplicationsAsyncClient, @@ -938,10 +938,9 @@ def test_applications_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +985,9 @@ def test_applications_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1023,9 @@ def test_applications_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1271,9 +1268,7 @@ def test_applications_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1750,9 +1745,9 @@ def test_create_application_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_application] = ( + mock_rpc + ) request = {} client.create_application(request) @@ -1944,9 +1939,9 @@ def test_update_application_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_application] = ( + mock_rpc + ) request = {} client.update_application(request) @@ -2203,9 +2198,9 @@ def test_repair_application_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.repair_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.repair_application] = ( + mock_rpc + ) request = {} client.repair_application(request) @@ -2489,9 +2484,9 @@ def test_create_application_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_application] = ( + mock_rpc + ) request = {} client.create_application(request) @@ -2533,9 +2528,9 @@ def test_update_application_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_application] = ( + mock_rpc + ) request = {} client.update_application(request) @@ -2577,9 +2572,9 @@ def test_repair_application_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.repair_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.repair_application] = ( + mock_rpc + ) request = {} client.repair_application(request) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py index 948ee1a4fd37..ddbdc84e58ce 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.authorized_certificates import ( AuthorizedCertificatesAsyncClient, @@ -998,10 +1003,9 @@ def test_authorized_certificates_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1050,9 @@ def test_authorized_certificates_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1088,9 @@ def test_authorized_certificates_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1348,9 +1350,7 @@ def test_authorized_certificates_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py index c8f360cbc7a2..c13e9d1ea087 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -978,10 +983,9 @@ def test_authorized_domains_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1030,9 @@ def test_authorized_domains_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1065,10 +1068,9 @@ def test_authorized_domains_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1320,9 +1322,7 @@ def test_authorized_domains_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py index c0a1c74166f4..645c0ded6cde 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.domain_mappings import ( DomainMappingsAsyncClient, @@ -958,10 +958,9 @@ def test_domain_mappings_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1005,9 @@ def test_domain_mappings_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1043,9 @@ def test_domain_mappings_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1295,9 +1292,7 @@ def test_domain_mappings_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1416,9 +1411,9 @@ def test_list_domain_mappings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_domain_mappings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_domain_mappings] = ( + mock_rpc + ) request = {} client.list_domain_mappings(request) @@ -1875,9 +1870,9 @@ def test_get_domain_mapping_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_domain_mapping] = ( + mock_rpc + ) request = {} client.get_domain_mapping(request) @@ -2130,9 +2125,9 @@ def test_create_domain_mapping_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_domain_mapping] = ( + mock_rpc + ) request = {} client.create_domain_mapping(request) @@ -2390,9 +2385,9 @@ def test_update_domain_mapping_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_domain_mapping] = ( + mock_rpc + ) request = {} client.update_domain_mapping(request) @@ -2650,9 +2645,9 @@ def test_delete_domain_mapping_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_domain_mapping] = ( + mock_rpc + ) request = {} client.delete_domain_mapping(request) @@ -2844,9 +2839,9 @@ def test_list_domain_mappings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_domain_mappings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_domain_mappings] = ( + mock_rpc + ) request = {} client.list_domain_mappings(request) @@ -2947,9 +2942,9 @@ def test_get_domain_mapping_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_domain_mapping] = ( + mock_rpc + ) request = {} client.get_domain_mapping(request) @@ -2988,9 +2983,9 @@ def test_create_domain_mapping_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_domain_mapping] = ( + mock_rpc + ) request = {} client.create_domain_mapping(request) @@ -3033,9 +3028,9 @@ def test_update_domain_mapping_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_domain_mapping] = ( + mock_rpc + ) request = {} client.update_domain_mapping(request) @@ -3078,9 +3073,9 @@ def test_delete_domain_mapping_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_domain_mapping] = ( + mock_rpc + ) request = {} client.delete_domain_mapping(request) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_firewall.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_firewall.py index 4b759237bd98..4980c60faf50 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_firewall.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_firewall.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.firewall import ( FirewallAsyncClient, @@ -908,10 +913,9 @@ def test_firewall_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -956,10 +960,9 @@ def test_firewall_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -995,10 +998,9 @@ def test_firewall_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1227,9 +1229,7 @@ def test_firewall_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1350,9 +1350,9 @@ def test_list_ingress_rules_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_ingress_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_ingress_rules] = ( + mock_rpc + ) request = {} client.list_ingress_rules(request) @@ -2064,9 +2064,9 @@ def test_create_ingress_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_ingress_rule] = ( + mock_rpc + ) request = {} client.create_ingress_rule(request) @@ -2325,9 +2325,9 @@ def test_get_ingress_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ingress_rule] = ( + mock_rpc + ) request = {} client.get_ingress_rule(request) @@ -2586,9 +2586,9 @@ def test_update_ingress_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_ingress_rule] = ( + mock_rpc + ) request = {} client.update_ingress_rule(request) @@ -2844,9 +2844,9 @@ def test_delete_ingress_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_ingress_rule] = ( + mock_rpc + ) request = {} client.delete_ingress_rule(request) @@ -3024,9 +3024,9 @@ def test_list_ingress_rules_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_ingress_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_ingress_rules] = ( + mock_rpc + ) request = {} client.list_ingress_rules(request) @@ -3168,9 +3168,9 @@ def test_create_ingress_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_ingress_rule] = ( + mock_rpc + ) request = {} client.create_ingress_rule(request) @@ -3206,9 +3206,9 @@ def test_get_ingress_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ingress_rule] = ( + mock_rpc + ) request = {} client.get_ingress_rule(request) @@ -3246,9 +3246,9 @@ def test_update_ingress_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_ingress_rule] = ( + mock_rpc + ) request = {} client.update_ingress_rule(request) @@ -3286,9 +3286,9 @@ def test_delete_ingress_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_ingress_rule] = ( + mock_rpc + ) request = {} client.delete_ingress_rule(request) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_instances.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_instances.py index 9ecc28b542c4..fbec93a09895 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_instances.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_instances.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.instances import ( InstancesAsyncClient, @@ -927,10 +927,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +974,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1012,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1250,9 +1247,7 @@ def test_instances_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_services.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_services.py index f0dab8339865..36446cb082f5 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_services.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.services import ( ServicesAsyncClient, @@ -70,9 +70,8 @@ pagers, transports, ) -from google.cloud.appengine_admin_v1.types import appengine, network_settings +from google.cloud.appengine_admin_v1.types import appengine, network_settings, service from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -921,10 +920,9 @@ def test_services_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +967,9 @@ def test_services_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1005,9 @@ def test_services_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1240,9 +1236,7 @@ def test_services_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_versions.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_versions.py index 8753d7fd01d5..8d4706935f52 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_versions.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_versions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.cloud.appengine_admin_v1.services.versions import ( VersionsAsyncClient, @@ -72,9 +72,8 @@ pagers, transports, ) -from google.cloud.appengine_admin_v1.types import app_yaml, appengine, deploy +from google.cloud.appengine_admin_v1.types import app_yaml, appengine, deploy, version from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import version CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -923,10 +922,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +969,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1007,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1242,9 +1238,7 @@ def test_versions_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/__init__.py b/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/__init__.py index 1b8f2c459f3b..dfb8b1975712 100644 --- a/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/__init__.py +++ b/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.request_log import LogLine, RequestLog, SourceLocation, SourceReference if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/types/__init__.py b/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/types/__init__.py index f3e9e9adafed..60c54b1253b5 100644 --- a/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/types/__init__.py +++ b/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/types/__init__.py @@ -13,7 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .request_log import LogLine, RequestLog, SourceLocation, SourceReference +from .request_log import ( + LogLine, + RequestLog, + SourceLocation, + SourceReference, +) __all__ = ( "LogLine", diff --git a/packages/google-cloud-appengine-logging/mypy.ini b/packages/google-cloud-appengine-logging/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-appengine-logging/mypy.ini +++ b/packages/google-cloud-appengine-logging/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-appengine-logging/noxfile.py b/packages/google-cloud-appengine-logging/noxfile.py index 18c73d8c070d..4b4da45029ce 100644 --- a/packages/google-cloud-appengine-logging/noxfile.py +++ b/packages/google-cloud-appengine-logging/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/__init__.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/__init__.py index 8619478baed4..ad9bc019a640 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/__init__.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.app_hub import AppHubAsyncClient, AppHubClient from .types.apphub_service import ( CreateApplicationRequest, diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/async_client.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/async_client.py index 1ca3793fedcb..389c94590ce3 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/async_client.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apphub_v1 import gapic_version as package_version @@ -46,26 +46,30 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apphub_v1.services.app_hub import pagers from google.cloud.apphub_v1.types import ( - service_project_attachment as gca_service_project_attachment, + apphub_service, + application, + attributes, + service, + service_project_attachment, + workload, ) -from google.cloud.apphub_v1.types import apphub_service -from google.cloud.apphub_v1.types import application from google.cloud.apphub_v1.types import application as gca_application -from google.cloud.apphub_v1.types import attributes -from google.cloud.apphub_v1.types import service from google.cloud.apphub_v1.types import service as gca_service -from google.cloud.apphub_v1.types import service_project_attachment -from google.cloud.apphub_v1.types import workload +from google.cloud.apphub_v1.types import ( + service_project_attachment as gca_service_project_attachment, +) from google.cloud.apphub_v1.types import workload as gca_workload from .client import AppHubClient @@ -142,7 +146,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AppHubAsyncClient: The constructed client. """ - return AppHubClient.from_service_account_info.__func__(AppHubAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AppHubClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AppHubAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +165,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AppHubAsyncClient: The constructed client. """ - return AppHubClient.from_service_account_file.__func__(AppHubAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AppHubClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AppHubAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/client.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/client.py index 0a5e7460733e..f944bcabf1d4 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/client.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apphub_v1 import gapic_version as package_version @@ -63,26 +63,30 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.apphub_v1.services.app_hub import pagers from google.cloud.apphub_v1.types import ( - service_project_attachment as gca_service_project_attachment, + apphub_service, + application, + attributes, + service, + service_project_attachment, + workload, ) -from google.cloud.apphub_v1.types import apphub_service -from google.cloud.apphub_v1.types import application from google.cloud.apphub_v1.types import application as gca_application -from google.cloud.apphub_v1.types import attributes -from google.cloud.apphub_v1.types import service from google.cloud.apphub_v1.types import service as gca_service -from google.cloud.apphub_v1.types import service_project_attachment -from google.cloud.apphub_v1.types import workload +from google.cloud.apphub_v1.types import ( + service_project_attachment as gca_service_project_attachment, +) from google.cloud.apphub_v1.types import workload as gca_workload from .transports.base import DEFAULT_CLIENT_INFO, AppHubTransport @@ -755,11 +759,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AppHubClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AppHubClient._read_environment_variables() + ) self._client_cert_source = AppHubClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -794,8 +796,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AppHubTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/pagers.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/pagers.py index 1773057463b6..df3acf78db98 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/pagers.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/pagers.py @@ -73,7 +73,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -235,7 +235,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -393,7 +393,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -469,7 +469,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -549,7 +549,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -627,7 +627,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -709,7 +709,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -785,7 +785,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -865,7 +865,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -941,7 +941,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/base.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/base.py index 57957ab15315..d5e1ddf41aeb 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/base.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apphub_v1 import gapic_version as package_version from google.cloud.apphub_v1.types import ( @@ -777,13 +779,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc.py index 83062da68856..1aeb0ef16606 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apphub_v1.types import ( apphub_service, @@ -373,12 +375,12 @@ def lookup_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_service_project_attachment" not in self._stubs: - self._stubs[ - "lookup_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/LookupServiceProjectAttachment", - request_serializer=apphub_service.LookupServiceProjectAttachmentRequest.serialize, - response_deserializer=apphub_service.LookupServiceProjectAttachmentResponse.deserialize, + self._stubs["lookup_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/LookupServiceProjectAttachment", + request_serializer=apphub_service.LookupServiceProjectAttachmentRequest.serialize, + response_deserializer=apphub_service.LookupServiceProjectAttachmentResponse.deserialize, + ) ) return self._stubs["lookup_service_project_attachment"] @@ -405,12 +407,12 @@ def list_service_project_attachments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_service_project_attachments" not in self._stubs: - self._stubs[ - "list_service_project_attachments" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/ListServiceProjectAttachments", - request_serializer=apphub_service.ListServiceProjectAttachmentsRequest.serialize, - response_deserializer=apphub_service.ListServiceProjectAttachmentsResponse.deserialize, + self._stubs["list_service_project_attachments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/ListServiceProjectAttachments", + request_serializer=apphub_service.ListServiceProjectAttachmentsRequest.serialize, + response_deserializer=apphub_service.ListServiceProjectAttachmentsResponse.deserialize, + ) ) return self._stubs["list_service_project_attachments"] @@ -436,12 +438,12 @@ def create_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_project_attachment" not in self._stubs: - self._stubs[ - "create_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/CreateServiceProjectAttachment", - request_serializer=apphub_service.CreateServiceProjectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/CreateServiceProjectAttachment", + request_serializer=apphub_service.CreateServiceProjectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_service_project_attachment"] @@ -467,12 +469,12 @@ def get_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_service_project_attachment" not in self._stubs: - self._stubs[ - "get_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/GetServiceProjectAttachment", - request_serializer=apphub_service.GetServiceProjectAttachmentRequest.serialize, - response_deserializer=service_project_attachment.ServiceProjectAttachment.deserialize, + self._stubs["get_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/GetServiceProjectAttachment", + request_serializer=apphub_service.GetServiceProjectAttachmentRequest.serialize, + response_deserializer=service_project_attachment.ServiceProjectAttachment.deserialize, + ) ) return self._stubs["get_service_project_attachment"] @@ -498,12 +500,12 @@ def delete_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_project_attachment" not in self._stubs: - self._stubs[ - "delete_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/DeleteServiceProjectAttachment", - request_serializer=apphub_service.DeleteServiceProjectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/DeleteServiceProjectAttachment", + request_serializer=apphub_service.DeleteServiceProjectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_service_project_attachment"] @@ -533,12 +535,12 @@ def detach_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "detach_service_project_attachment" not in self._stubs: - self._stubs[ - "detach_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/DetachServiceProjectAttachment", - request_serializer=apphub_service.DetachServiceProjectAttachmentRequest.serialize, - response_deserializer=apphub_service.DetachServiceProjectAttachmentResponse.deserialize, + self._stubs["detach_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/DetachServiceProjectAttachment", + request_serializer=apphub_service.DetachServiceProjectAttachmentRequest.serialize, + response_deserializer=apphub_service.DetachServiceProjectAttachmentResponse.deserialize, + ) ) return self._stubs["detach_service_project_attachment"] @@ -845,12 +847,12 @@ def lookup_discovered_workload( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_discovered_workload" not in self._stubs: - self._stubs[ - "lookup_discovered_workload" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/LookupDiscoveredWorkload", - request_serializer=apphub_service.LookupDiscoveredWorkloadRequest.serialize, - response_deserializer=apphub_service.LookupDiscoveredWorkloadResponse.deserialize, + self._stubs["lookup_discovered_workload"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/LookupDiscoveredWorkload", + request_serializer=apphub_service.LookupDiscoveredWorkloadRequest.serialize, + response_deserializer=apphub_service.LookupDiscoveredWorkloadResponse.deserialize, + ) ) return self._stubs["lookup_discovered_workload"] diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc_asyncio.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc_asyncio.py index 23de8ea45709..eb7d73610ee6 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc_asyncio.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apphub_v1.types import ( apphub_service, @@ -381,12 +383,12 @@ def lookup_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_service_project_attachment" not in self._stubs: - self._stubs[ - "lookup_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/LookupServiceProjectAttachment", - request_serializer=apphub_service.LookupServiceProjectAttachmentRequest.serialize, - response_deserializer=apphub_service.LookupServiceProjectAttachmentResponse.deserialize, + self._stubs["lookup_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/LookupServiceProjectAttachment", + request_serializer=apphub_service.LookupServiceProjectAttachmentRequest.serialize, + response_deserializer=apphub_service.LookupServiceProjectAttachmentResponse.deserialize, + ) ) return self._stubs["lookup_service_project_attachment"] @@ -413,12 +415,12 @@ def list_service_project_attachments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_service_project_attachments" not in self._stubs: - self._stubs[ - "list_service_project_attachments" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/ListServiceProjectAttachments", - request_serializer=apphub_service.ListServiceProjectAttachmentsRequest.serialize, - response_deserializer=apphub_service.ListServiceProjectAttachmentsResponse.deserialize, + self._stubs["list_service_project_attachments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/ListServiceProjectAttachments", + request_serializer=apphub_service.ListServiceProjectAttachmentsRequest.serialize, + response_deserializer=apphub_service.ListServiceProjectAttachmentsResponse.deserialize, + ) ) return self._stubs["list_service_project_attachments"] @@ -445,12 +447,12 @@ def create_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_project_attachment" not in self._stubs: - self._stubs[ - "create_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/CreateServiceProjectAttachment", - request_serializer=apphub_service.CreateServiceProjectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/CreateServiceProjectAttachment", + request_serializer=apphub_service.CreateServiceProjectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_service_project_attachment"] @@ -476,12 +478,12 @@ def get_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_service_project_attachment" not in self._stubs: - self._stubs[ - "get_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/GetServiceProjectAttachment", - request_serializer=apphub_service.GetServiceProjectAttachmentRequest.serialize, - response_deserializer=service_project_attachment.ServiceProjectAttachment.deserialize, + self._stubs["get_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/GetServiceProjectAttachment", + request_serializer=apphub_service.GetServiceProjectAttachmentRequest.serialize, + response_deserializer=service_project_attachment.ServiceProjectAttachment.deserialize, + ) ) return self._stubs["get_service_project_attachment"] @@ -508,12 +510,12 @@ def delete_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_project_attachment" not in self._stubs: - self._stubs[ - "delete_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/DeleteServiceProjectAttachment", - request_serializer=apphub_service.DeleteServiceProjectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/DeleteServiceProjectAttachment", + request_serializer=apphub_service.DeleteServiceProjectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_service_project_attachment"] @@ -543,12 +545,12 @@ def detach_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "detach_service_project_attachment" not in self._stubs: - self._stubs[ - "detach_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/DetachServiceProjectAttachment", - request_serializer=apphub_service.DetachServiceProjectAttachmentRequest.serialize, - response_deserializer=apphub_service.DetachServiceProjectAttachmentResponse.deserialize, + self._stubs["detach_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/DetachServiceProjectAttachment", + request_serializer=apphub_service.DetachServiceProjectAttachmentRequest.serialize, + response_deserializer=apphub_service.DetachServiceProjectAttachmentResponse.deserialize, + ) ) return self._stubs["detach_service_project_attachment"] @@ -864,12 +866,12 @@ def lookup_discovered_workload( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_discovered_workload" not in self._stubs: - self._stubs[ - "lookup_discovered_workload" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/LookupDiscoveredWorkload", - request_serializer=apphub_service.LookupDiscoveredWorkloadRequest.serialize, - response_deserializer=apphub_service.LookupDiscoveredWorkloadResponse.deserialize, + self._stubs["lookup_discovered_workload"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/LookupDiscoveredWorkload", + request_serializer=apphub_service.LookupDiscoveredWorkloadRequest.serialize, + response_deserializer=apphub_service.LookupDiscoveredWorkloadResponse.deserialize, + ) ) return self._stubs["lookup_discovered_workload"] diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest.py index 0287323a7319..2db7a0a84cde 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2370,9 +2372,7 @@ def __call__( """ - http_options = ( - _BaseAppHubRestTransport._BaseCreateServiceProjectAttachment._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseCreateServiceProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_create_service_project_attachment( request, metadata @@ -2441,11 +2441,10 @@ def __call__( resp = self._interceptor.post_create_service_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_service_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_service_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2980,9 +2979,7 @@ def __call__( """ - http_options = ( - _BaseAppHubRestTransport._BaseDeleteServiceProjectAttachment._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseDeleteServiceProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_delete_service_project_attachment( request, metadata @@ -3046,11 +3043,10 @@ def __call__( resp = self._interceptor.post_delete_service_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_service_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_service_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3281,9 +3277,7 @@ def __call__( """ - http_options = ( - _BaseAppHubRestTransport._BaseDetachServiceProjectAttachment._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseDetachServiceProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_detach_service_project_attachment( request, metadata @@ -3354,11 +3348,10 @@ def __call__( resp = self._interceptor.post_detach_service_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_detach_service_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_detach_service_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4059,9 +4052,7 @@ def __call__( """ - http_options = ( - _BaseAppHubRestTransport._BaseGetServiceProjectAttachment._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseGetServiceProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_get_service_project_attachment( request, metadata @@ -4125,11 +4116,10 @@ def __call__( resp = self._interceptor.post_get_service_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_service_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_service_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4663,9 +4653,7 @@ def __call__( Response for ListDiscoveredWorkloads. """ - http_options = ( - _BaseAppHubRestTransport._BaseListDiscoveredWorkloads._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseListDiscoveredWorkloads._get_http_options() request, metadata = self._interceptor.pre_list_discovered_workloads( request, metadata @@ -4815,9 +4803,7 @@ def __call__( """ - http_options = ( - _BaseAppHubRestTransport._BaseListServiceProjectAttachments._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseListServiceProjectAttachments._get_http_options() request, metadata = self._interceptor.pre_list_service_project_attachments( request, metadata @@ -4881,11 +4867,10 @@ def __call__( resp = self._interceptor.post_list_service_project_attachments(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_service_project_attachments_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_service_project_attachments_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5264,9 +5249,7 @@ def __call__( Response for LookupDiscoveredService. """ - http_options = ( - _BaseAppHubRestTransport._BaseLookupDiscoveredService._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseLookupDiscoveredService._get_http_options() request, metadata = self._interceptor.pre_lookup_discovered_service( request, metadata @@ -5415,9 +5398,7 @@ def __call__( """ - http_options = ( - _BaseAppHubRestTransport._BaseLookupDiscoveredWorkload._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseLookupDiscoveredWorkload._get_http_options() request, metadata = self._interceptor.pre_lookup_discovered_workload( request, metadata @@ -5569,9 +5550,7 @@ def __call__( """ - http_options = ( - _BaseAppHubRestTransport._BaseLookupServiceProjectAttachment._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseLookupServiceProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_lookup_service_project_attachment( request, metadata @@ -5637,11 +5616,10 @@ def __call__( resp = self._interceptor.post_lookup_service_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_lookup_service_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_lookup_service_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6159,7 +6137,9 @@ def create_service_project_attachment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateServiceProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._CreateServiceProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_workload( @@ -6193,7 +6173,9 @@ def delete_service_project_attachment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteServiceProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteServiceProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_workload( @@ -6212,7 +6194,9 @@ def detach_service_project_attachment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DetachServiceProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._DetachServiceProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_application( @@ -6259,7 +6243,9 @@ def get_service_project_attachment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetServiceProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._GetServiceProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_workload( @@ -6289,7 +6275,9 @@ def list_discovered_services( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListDiscoveredServices(self._session, self._host, self._interceptor) # type: ignore + return self._ListDiscoveredServices( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_discovered_workloads( @@ -6300,7 +6288,9 @@ def list_discovered_workloads( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListDiscoveredWorkloads(self._session, self._host, self._interceptor) # type: ignore + return self._ListDiscoveredWorkloads( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_service_project_attachments( @@ -6311,7 +6301,9 @@ def list_service_project_attachments( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListServiceProjectAttachments(self._session, self._host, self._interceptor) # type: ignore + return self._ListServiceProjectAttachments( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_services( @@ -6342,7 +6334,9 @@ def lookup_discovered_service( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._LookupDiscoveredService(self._session, self._host, self._interceptor) # type: ignore + return self._LookupDiscoveredService( + self._session, self._host, self._interceptor + ) # type: ignore @property def lookup_discovered_workload( @@ -6353,7 +6347,9 @@ def lookup_discovered_workload( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._LookupDiscoveredWorkload(self._session, self._host, self._interceptor) # type: ignore + return self._LookupDiscoveredWorkload( + self._session, self._host, self._interceptor + ) # type: ignore @property def lookup_service_project_attachment( @@ -6364,7 +6360,9 @@ def lookup_service_project_attachment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._LookupServiceProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._LookupServiceProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_application( diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest_base.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest_base.py index e1ee40f866d3..d02950dd1e9c 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest_base.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/__init__.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/__init__.py index 8e8ae6176b3d..832cdbebb610 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/__init__.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/__init__.py @@ -53,10 +53,25 @@ UpdateServiceRequest, UpdateWorkloadRequest, ) -from .application import Application, Scope -from .attributes import Attributes, ContactInfo, Criticality, Environment -from .service import DiscoveredService, Service, ServiceProperties, ServiceReference -from .service_project_attachment import ServiceProjectAttachment +from .application import ( + Application, + Scope, +) +from .attributes import ( + Attributes, + ContactInfo, + Criticality, + Environment, +) +from .service import ( + DiscoveredService, + Service, + ServiceProperties, + ServiceReference, +) +from .service_project_attachment import ( + ServiceProjectAttachment, +) from .workload import ( DiscoveredWorkload, Workload, diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/apphub_service.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/apphub_service.py index 147fbd8753be..b0446e2cc7a1 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/apphub_service.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/apphub_service.py @@ -21,11 +21,11 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.apphub_v1.types import application as gca_application +from google.cloud.apphub_v1.types import service as gca_service from google.cloud.apphub_v1.types import ( service_project_attachment as gca_service_project_attachment, ) -from google.cloud.apphub_v1.types import application as gca_application -from google.cloud.apphub_v1.types import service as gca_service from google.cloud.apphub_v1.types import workload as gca_workload __protobuf__ = proto.module( @@ -454,12 +454,12 @@ class ListDiscoveredServicesResponse(proto.Message): def raw_page(self): return self - discovered_services: MutableSequence[ - gca_service.DiscoveredService - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gca_service.DiscoveredService, + discovered_services: MutableSequence[gca_service.DiscoveredService] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gca_service.DiscoveredService, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1075,12 +1075,12 @@ class ListDiscoveredWorkloadsResponse(proto.Message): def raw_page(self): return self - discovered_workloads: MutableSequence[ - gca_workload.DiscoveredWorkload - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gca_workload.DiscoveredWorkload, + discovered_workloads: MutableSequence[gca_workload.DiscoveredWorkload] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gca_workload.DiscoveredWorkload, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/application.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/application.py index b1e7ef45869b..8b6c612b23fa 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/application.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/application.py @@ -80,6 +80,7 @@ class State(proto.Enum): DELETING (3): The Application is being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -147,6 +148,7 @@ class Type(proto.Enum): GLOBAL (2): Global type. """ + TYPE_UNSPECIFIED = 0 REGIONAL = 1 GLOBAL = 2 diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/attributes.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/attributes.py index 8e5f62f2a7bd..1c0b3568cbac 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/attributes.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/attributes.py @@ -102,6 +102,7 @@ class Type(proto.Enum): LOW (4): Low impact. """ + TYPE_UNSPECIFIED = 0 MISSION_CRITICAL = 1 HIGH = 2 @@ -138,6 +139,7 @@ class Type(proto.Enum): DEVELOPMENT (4): Development environment. """ + TYPE_UNSPECIFIED = 0 PRODUCTION = 1 STAGING = 2 diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service.py index b859a7881d1c..1c88bc2b0229 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service.py @@ -90,6 +90,7 @@ class State(proto.Enum): The underlying networking resources have been deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service_project_attachment.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service_project_attachment.py index dea31343c39a..16962705e2c2 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service_project_attachment.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service_project_attachment.py @@ -74,6 +74,7 @@ class State(proto.Enum): The ServiceProjectAttachment is being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/workload.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/workload.py index 6aed42659c2b..0cd7a837d393 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/workload.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/workload.py @@ -90,6 +90,7 @@ class State(proto.Enum): The underlying compute resources have been deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-apphub/mypy.ini b/packages/google-cloud-apphub/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-apphub/mypy.ini +++ b/packages/google-cloud-apphub/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-apphub/noxfile.py b/packages/google-cloud-apphub/noxfile.py index 5d0bfeac654a..8c4e04ce7625 100644 --- a/packages/google-cloud-apphub/noxfile.py +++ b/packages/google-cloud-apphub/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-apphub/tests/unit/gapic/apphub_v1/test_app_hub.py b/packages/google-cloud-apphub/tests/unit/gapic/apphub_v1/test_app_hub.py index 81c895eb1ca9..145e0d989fd0 100644 --- a/packages/google-cloud-apphub/tests/unit/gapic/apphub_v1/test_app_hub.py +++ b/packages/google-cloud-apphub/tests/unit/gapic/apphub_v1/test_app_hub.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.apphub_v1.services.app_hub import ( AppHubAsyncClient, @@ -76,16 +78,18 @@ transports, ) from google.cloud.apphub_v1.types import ( - service_project_attachment as gca_service_project_attachment, + apphub_service, + application, + attributes, + service, + service_project_attachment, + workload, ) -from google.cloud.apphub_v1.types import apphub_service -from google.cloud.apphub_v1.types import application from google.cloud.apphub_v1.types import application as gca_application -from google.cloud.apphub_v1.types import attributes -from google.cloud.apphub_v1.types import service from google.cloud.apphub_v1.types import service as gca_service -from google.cloud.apphub_v1.types import service_project_attachment -from google.cloud.apphub_v1.types import workload +from google.cloud.apphub_v1.types import ( + service_project_attachment as gca_service_project_attachment, +) from google.cloud.apphub_v1.types import workload as gca_workload CRED_INFO_JSON = { @@ -923,10 +927,9 @@ def test_app_hub_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +974,9 @@ def test_app_hub_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1012,9 @@ def test_app_hub_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1242,9 +1243,7 @@ def test_app_hub_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4245,9 +4244,9 @@ def test_get_discovered_service_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_discovered_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_discovered_service] = ( + mock_rpc + ) request = {} client.get_discovered_service(request) @@ -9957,9 +9956,9 @@ def test_list_applications_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_applications - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_applications] = ( + mock_rpc + ) request = {} client.list_applications(request) @@ -10503,9 +10502,9 @@ def test_create_application_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_application] = ( + mock_rpc + ) request = {} client.create_application(request) @@ -11208,9 +11207,9 @@ def test_update_application_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_application] = ( + mock_rpc + ) request = {} client.update_application(request) @@ -11566,9 +11565,9 @@ def test_delete_application_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_application] = ( + mock_rpc + ) request = {} client.delete_application(request) @@ -12367,9 +12366,9 @@ def test_create_service_project_attachment_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "serviceProjectAttachmentId" - ] = "service_project_attachment_id_value" + jsonified_request["serviceProjectAttachmentId"] = ( + "service_project_attachment_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() @@ -13393,9 +13392,9 @@ def test_get_discovered_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_discovered_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_discovered_service] = ( + mock_rpc + ) request = {} client.get_discovered_service(request) @@ -16531,9 +16530,9 @@ def test_list_applications_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_applications - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_applications] = ( + mock_rpc + ) request = {} client.list_applications(request) @@ -16795,9 +16794,9 @@ def test_create_application_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_application] = ( + mock_rpc + ) request = {} client.create_application(request) @@ -17195,9 +17194,9 @@ def test_update_application_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_application] = ( + mock_rpc + ) request = {} client.update_application(request) @@ -17398,9 +17397,9 @@ def test_delete_application_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_application] = ( + mock_rpc + ) request = {} client.delete_application(request) diff --git a/packages/google-cloud-artifact-registry/CHANGELOG.md b/packages/google-cloud-artifact-registry/CHANGELOG.md index 97fba4375de2..baaf44fc1a86 100644 --- a/packages/google-cloud-artifact-registry/CHANGELOG.md +++ b/packages/google-cloud-artifact-registry/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://pypi.org/project/google-cloud-artifact-registry/#history +## [1.20.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-artifact-registry-v1.19.0...google-cloud-artifact-registry-v1.20.0) (2026-02-12) + + +### Features + +* add DIRSUM_SHA256 hash type ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) + ## [1.19.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-artifact-registry-v1.18.0...google-cloud-artifact-registry-v1.19.0) (2026-01-08) diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry/gapic_version.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry/gapic_version.py index 7313c97c3096..adaa11ae7120 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry/gapic_version.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "1.19.0" # {x-release-please-version} +__version__ = "1.20.0" # {x-release-please-version} diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/__init__.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/__init__.py index d65bace512d3..5f8f0726919a 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/__init__.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.artifact_registry import ( ArtifactRegistryAsyncClient, ArtifactRegistryClient, diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/gapic_version.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/gapic_version.py index 7313c97c3096..adaa11ae7120 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/gapic_version.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "1.19.0" # {x-release-please-version} +__version__ = "1.20.0" # {x-release-please-version} diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/async_client.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/async_client.py index fd2510e3d9c5..2da068e323b6 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/async_client.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.artifactregistry_v1 import gapic_version as package_version @@ -46,37 +46,41 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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.type.expr_pb2 as expr_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.artifactregistry_v1.services.artifact_registry import pagers -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + service, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import service, settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config from .client import ArtifactRegistryClient from .transports.base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport @@ -203,7 +207,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ArtifactRegistryAsyncClient: The constructed client. """ - return ArtifactRegistryClient.from_service_account_info.__func__(ArtifactRegistryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ArtifactRegistryClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ArtifactRegistryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -219,7 +226,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ArtifactRegistryAsyncClient: The constructed client. """ - return ArtifactRegistryClient.from_service_account_file.__func__(ArtifactRegistryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ArtifactRegistryClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ArtifactRegistryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/client.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/client.py index ae3899db853a..cc50a6f8c8dd 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/client.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.artifactregistry_v1 import gapic_version as package_version @@ -63,37 +63,41 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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.type.expr_pb2 as expr_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.artifactregistry_v1.services.artifact_registry import pagers -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + service, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import service, settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config from .transports.base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport from .transports.grpc import ArtifactRegistryGrpcTransport @@ -109,9 +113,7 @@ class ArtifactRegistryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ArtifactRegistryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ArtifactRegistryTransport]] _transport_registry["grpc"] = ArtifactRegistryGrpcTransport _transport_registry["grpc_asyncio"] = ArtifactRegistryGrpcAsyncIOTransport _transport_registry["rest"] = ArtifactRegistryRestTransport @@ -1016,11 +1018,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ArtifactRegistryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ArtifactRegistryClient._read_environment_variables() + ) self._client_cert_source = ArtifactRegistryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1055,8 +1055,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ArtifactRegistryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/pagers.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/pagers.py index 9bfe72415650..fc9033120415 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/pagers.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/pagers.py @@ -76,7 +76,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -152,7 +152,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -308,7 +308,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -388,7 +388,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -464,7 +464,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -544,7 +544,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -620,7 +620,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -700,7 +700,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -776,7 +776,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -856,7 +856,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -932,7 +932,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1012,7 +1012,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1088,7 +1088,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1168,7 +1168,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1244,7 +1244,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1324,7 +1324,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1400,7 +1400,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1480,7 +1480,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1556,7 +1556,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1636,7 +1636,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1712,7 +1712,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/base.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/base.py index 5829dc7374ab..e179008f5ee6 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/base.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/base.py @@ -17,40 +17,43 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.artifactregistry_v1 import gapic_version as package_version -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc.py index 04b642857573..dfef683662c4 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc.py @@ -16,43 +16,46 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config from .base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc_asyncio.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc_asyncio.py index 8b39df006eb1..155d8ce8470c 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc_asyncio.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc_asyncio.py @@ -17,45 +17,48 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config from .base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport from .grpc import ArtifactRegistryGrpcTransport diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest.py index 4d4275458e56..eb5eb8577a65 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest.py @@ -16,43 +16,46 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseArtifactRegistryRestTransport @@ -3021,9 +3024,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseBatchDeleteVersions._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseBatchDeleteVersions._get_http_options() request, metadata = self._interceptor.pre_batch_delete_versions( request, metadata @@ -3176,9 +3177,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseCreateAttachment._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseCreateAttachment._get_http_options() request, metadata = self._interceptor.pre_create_attachment( request, metadata @@ -3331,9 +3330,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseCreateRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseCreateRepository._get_http_options() request, metadata = self._interceptor.pre_create_repository( request, metadata @@ -3793,9 +3790,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseDeleteAttachment._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseDeleteAttachment._get_http_options() request, metadata = self._interceptor.pre_delete_attachment( request, metadata @@ -4085,9 +4080,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseDeletePackage._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseDeletePackage._get_http_options() request, metadata = self._interceptor.pre_delete_package(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseDeletePackage._get_transcoded_request( @@ -4231,9 +4224,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseDeleteRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseDeleteRepository._get_http_options() request, metadata = self._interceptor.pre_delete_repository( request, metadata @@ -4590,9 +4581,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseDeleteVersion._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseDeleteVersion._get_http_options() request, metadata = self._interceptor.pre_delete_version(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseDeleteVersion._get_transcoded_request( @@ -4737,9 +4726,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseExportArtifact._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseExportArtifact._get_http_options() request, metadata = self._interceptor.pre_export_artifact(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseExportArtifact._get_transcoded_request( @@ -4890,9 +4877,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetAttachment._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetAttachment._get_http_options() request, metadata = self._interceptor.pre_get_attachment(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseGetAttachment._get_transcoded_request( @@ -5042,9 +5027,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetDockerImage._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetDockerImage._get_http_options() request, metadata = self._interceptor.pre_get_docker_image( request, metadata @@ -5561,9 +5544,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetMavenArtifact._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetMavenArtifact._get_http_options() request, metadata = self._interceptor.pre_get_maven_artifact( request, metadata @@ -5709,9 +5690,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetNpmPackage._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetNpmPackage._get_http_options() request, metadata = self._interceptor.pre_get_npm_package(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseGetNpmPackage._get_transcoded_request( @@ -6003,9 +5982,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetProjectSettings._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetProjectSettings._get_http_options() request, metadata = self._interceptor.pre_get_project_settings( request, metadata @@ -6152,9 +6129,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetPythonPackage._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetPythonPackage._get_http_options() request, metadata = self._interceptor.pre_get_python_package( request, metadata @@ -6300,9 +6275,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetRepository._get_http_options() request, metadata = self._interceptor.pre_get_repository(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseGetRepository._get_transcoded_request( @@ -6900,9 +6873,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetVPCSCConfig._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetVPCSCConfig._get_http_options() request, metadata = self._interceptor.pre_get_vpcsc_config( request, metadata @@ -7052,9 +7023,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseImportAptArtifacts._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseImportAptArtifacts._get_http_options() request, metadata = self._interceptor.pre_import_apt_artifacts( request, metadata @@ -7207,9 +7176,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseImportYumArtifacts._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseImportYumArtifacts._get_http_options() request, metadata = self._interceptor.pre_import_yum_artifacts( request, metadata @@ -7359,9 +7326,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListAttachments._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListAttachments._get_http_options() request, metadata = self._interceptor.pre_list_attachments( request, metadata @@ -7510,9 +7475,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListDockerImages._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListDockerImages._get_http_options() request, metadata = self._interceptor.pre_list_docker_images( request, metadata @@ -7805,9 +7768,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListMavenArtifacts._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListMavenArtifacts._get_http_options() request, metadata = self._interceptor.pre_list_maven_artifacts( request, metadata @@ -7956,9 +7917,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListNpmPackages._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListNpmPackages._get_http_options() request, metadata = self._interceptor.pre_list_npm_packages( request, metadata @@ -8251,9 +8210,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListPythonPackages._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListPythonPackages._get_http_options() request, metadata = self._interceptor.pre_list_python_packages( request, metadata @@ -8402,9 +8359,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListRepositories._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListRepositories._get_http_options() request, metadata = self._interceptor.pre_list_repositories( request, metadata @@ -9211,9 +9166,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -9518,9 +9471,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseUpdatePackage._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseUpdatePackage._get_http_options() request, metadata = self._interceptor.pre_update_package(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseUpdatePackage._get_transcoded_request( @@ -9671,9 +9622,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseUpdateProjectSettings._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseUpdateProjectSettings._get_http_options() request, metadata = self._interceptor.pre_update_project_settings( request, metadata @@ -9828,9 +9777,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseUpdateRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseUpdateRepository._get_http_options() request, metadata = self._interceptor.pre_update_repository( request, metadata @@ -10295,9 +10242,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseUpdateVersion._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseUpdateVersion._get_http_options() request, metadata = self._interceptor.pre_update_version(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseUpdateVersion._get_transcoded_request( @@ -10448,9 +10393,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseUpdateVPCSCConfig._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseUpdateVPCSCConfig._get_http_options() request, metadata = self._interceptor.pre_update_vpcsc_config( request, metadata @@ -11127,9 +11070,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseListLocations._get_transcoded_request( diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest_base.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest_base.py index ff1019deadfd..08a5c36181b4 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest_base.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest_base.py @@ -17,34 +17,37 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import gapic_v1, path_template +from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config from .base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/__init__.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/__init__.py index ae936e3c1384..34ba68f9e01e 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/__init__.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/__init__.py @@ -62,9 +62,15 @@ ListFilesResponse, UpdateFileRequest, ) -from .generic import GenericArtifact -from .go import GoModule -from .kfp_artifact import KfpArtifact +from .generic import ( + GenericArtifact, +) +from .go import ( + GoModule, +) +from .kfp_artifact import ( + KfpArtifact, +) from .package import ( DeletePackageRequest, GetPackageRequest, @@ -97,7 +103,9 @@ Rule, UpdateRuleRequest, ) -from .service import OperationMetadata +from .service import ( + OperationMetadata, +) from .settings import ( GetProjectSettingsRequest, ProjectSettings, @@ -123,7 +131,11 @@ Version, VersionView, ) -from .vpcsc_config import GetVPCSCConfigRequest, UpdateVPCSCConfigRequest, VPCSCConfig +from .vpcsc_config import ( + GetVPCSCConfigRequest, + UpdateVPCSCConfigRequest, + VPCSCConfig, +) from .yum_artifact import ( ImportYumArtifactsErrorInfo, ImportYumArtifactsGcsSource, diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/apt_artifact.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/apt_artifact.py index 402b8f5d65dc..6c8d41c20043 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/apt_artifact.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/apt_artifact.py @@ -70,6 +70,7 @@ class PackageType(proto.Enum): SOURCE (2): Source package. """ + PACKAGE_TYPE_UNSPECIFIED = 0 BINARY = 1 SOURCE = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/file.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/file.py index 17706b96dfad..55c580916b07 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/file.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/file.py @@ -58,6 +58,7 @@ class HashType(proto.Enum): DIRSUM_SHA256 (3): Dirsum SHA256 hash. """ + HASH_TYPE_UNSPECIFIED = 0 SHA256 = 1 MD5 = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/repository.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/repository.py index ef57dcc00d13..e339981d2788 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/repository.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/repository.py @@ -115,6 +115,7 @@ class TagState(proto.Enum): ANY (3): Applies to all versions. """ + TAG_STATE_UNSPECIFIED = 0 TAGGED = 1 UNTAGGED = 2 @@ -219,6 +220,7 @@ class Action(proto.Enum): KEEP (2): Keep action. """ + ACTION_UNSPECIFIED = 0 DELETE = 1 KEEP = 2 @@ -395,6 +397,7 @@ class PublicRepository(proto.Enum): DOCKER_HUB (1): Docker Hub. """ + PUBLIC_REPOSITORY_UNSPECIFIED = 0 DOCKER_HUB = 1 @@ -458,6 +461,7 @@ class PublicRepository(proto.Enum): MAVEN_CENTRAL (1): Maven Central. """ + PUBLIC_REPOSITORY_UNSPECIFIED = 0 MAVEN_CENTRAL = 1 @@ -525,6 +529,7 @@ class PublicRepository(proto.Enum): NPMJS (1): npmjs. """ + PUBLIC_REPOSITORY_UNSPECIFIED = 0 NPMJS = 1 @@ -592,6 +597,7 @@ class PublicRepository(proto.Enum): PYPI (1): PyPI. """ + PUBLIC_REPOSITORY_UNSPECIFIED = 0 PYPI = 1 @@ -671,6 +677,7 @@ class RepositoryBase(proto.Enum): DEBIAN_SNAPSHOT (3): Archived Debian. """ + REPOSITORY_BASE_UNSPECIFIED = 0 DEBIAN = 1 UBUNTU = 2 @@ -773,6 +780,7 @@ class RepositoryBase(proto.Enum): Fedora Extra Packages for Enterprise Linux (EPEL). """ + REPOSITORY_BASE_UNSPECIFIED = 0 CENTOS = 1 CENTOS_DEBUG = 2 @@ -1024,6 +1032,7 @@ class Format(proto.Enum): RUBY (12): Ruby package format. """ + FORMAT_UNSPECIFIED = 0 DOCKER = 1 MAVEN = 2 @@ -1052,6 +1061,7 @@ class Mode(proto.Enum): A remote repository to serve artifacts from a remote source. """ + MODE_UNSPECIFIED = 0 STANDARD_REPOSITORY = 1 VIRTUAL_REPOSITORY = 2 @@ -1086,6 +1096,7 @@ class VersionPolicy(proto.Enum): SNAPSHOT - repository will accept only Snapshot versions. """ + VERSION_POLICY_UNSPECIFIED = 0 RELEASE = 1 SNAPSHOT = 2 @@ -1154,6 +1165,7 @@ class EnablementConfig(proto.Enum): No automatic vulnerability scanning will be performed for this repository. """ + ENABLEMENT_CONFIG_UNSPECIFIED = 0 INHERITED = 1 DISABLED = 2 @@ -1176,6 +1188,7 @@ class EnablementState(proto.Enum): Vulnerability scanning is active for this repository. """ + ENABLEMENT_STATE_UNSPECIFIED = 0 SCANNING_UNSUPPORTED = 1 SCANNING_DISABLED = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/rule.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/rule.py index 44c2c287f95c..ce0dd89388e2 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/rule.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/rule.py @@ -70,6 +70,7 @@ class Action(proto.Enum): DENY (2): Deny the operation. """ + ACTION_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 @@ -83,6 +84,7 @@ class Operation(proto.Enum): DOWNLOAD (1): Download operation. """ + OPERATION_UNSPECIFIED = 0 DOWNLOAD = 1 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/settings.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/settings.py index df7474cf712c..b8752b5bde77 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/settings.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/settings.py @@ -71,6 +71,7 @@ class RedirectionState(proto.Enum): Redirection is partially enabled and missing images are copied from GCR """ + REDIRECTION_STATE_UNSPECIFIED = 0 REDIRECTION_FROM_GCR_IO_DISABLED = 1 REDIRECTION_FROM_GCR_IO_ENABLED = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/version.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/version.py index 9083946ca637..bcc222b1575d 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/version.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/version.py @@ -54,6 +54,7 @@ class VersionView(proto.Enum): FULL (2): Include everything. """ + VERSION_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/vpcsc_config.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/vpcsc_config.py index b03b2eb984c2..35a1944e6635 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/vpcsc_config.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/vpcsc_config.py @@ -66,6 +66,7 @@ class VPCSCPolicy(proto.Enum): Upstreams for the Remote Repositories if the resource is in the perimeter. """ + VPCSC_POLICY_UNSPECIFIED = 0 DENY = 1 ALLOW = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/yum_artifact.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/yum_artifact.py index f30e38a816e4..8b2ab7acad04 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/yum_artifact.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/yum_artifact.py @@ -62,6 +62,7 @@ class PackageType(proto.Enum): SOURCE (2): Source package (.srpm). """ + PACKAGE_TYPE_UNSPECIFIED = 0 BINARY = 1 SOURCE = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/__init__.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/__init__.py index 79f516af2b6b..fb16f489aa29 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/__init__.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.artifact_registry import ( ArtifactRegistryAsyncClient, ArtifactRegistryClient, diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/gapic_version.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/gapic_version.py index 7313c97c3096..adaa11ae7120 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/gapic_version.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "1.19.0" # {x-release-please-version} +__version__ = "1.20.0" # {x-release-please-version} diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/async_client.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/async_client.py index 8d94bf368a30..7c103239ffc2 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/async_client.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.artifactregistry_v1beta2 import gapic_version as package_version @@ -46,22 +46,28 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore from google.cloud.artifactregistry_v1beta2.services.artifact_registry import pagers -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + service, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import service, settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact from .client import ArtifactRegistryClient from .transports.base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport @@ -160,7 +166,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ArtifactRegistryAsyncClient: The constructed client. """ - return ArtifactRegistryClient.from_service_account_info.__func__(ArtifactRegistryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ArtifactRegistryClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ArtifactRegistryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -176,7 +185,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ArtifactRegistryAsyncClient: The constructed client. """ - return ArtifactRegistryClient.from_service_account_file.__func__(ArtifactRegistryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ArtifactRegistryClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ArtifactRegistryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/client.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/client.py index 7d59d82c06e7..945172688d34 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/client.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.artifactregistry_v1beta2 import gapic_version as package_version @@ -63,22 +63,28 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore from google.cloud.artifactregistry_v1beta2.services.artifact_registry import pagers -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + service, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import service, settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact from .transports.base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport from .transports.grpc import ArtifactRegistryGrpcTransport @@ -94,9 +100,7 @@ class ArtifactRegistryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ArtifactRegistryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ArtifactRegistryTransport]] _transport_registry["grpc"] = ArtifactRegistryGrpcTransport _transport_registry["grpc_asyncio"] = ArtifactRegistryGrpcAsyncIOTransport _transport_registry["rest"] = ArtifactRegistryRestTransport @@ -792,11 +796,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ArtifactRegistryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ArtifactRegistryClient._read_environment_variables() + ) self._client_cert_source = ArtifactRegistryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -831,8 +833,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ArtifactRegistryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/pagers.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/pagers.py index d419d4f7e36a..f561d55d733b 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/pagers.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/pagers.py @@ -73,7 +73,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -149,7 +149,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -305,7 +305,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -385,7 +385,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -461,7 +461,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -541,7 +541,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -617,7 +617,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -697,7 +697,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -773,7 +773,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/base.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/base.py index 4b9445e0463d..fa0f8bad128d 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/base.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/base.py @@ -17,27 +17,32 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.artifactregistry_v1beta2 import gapic_version as package_version -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc.py index feb5d935cbd7..e0238c2a1ab2 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc.py @@ -16,30 +16,35 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact from .base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc_asyncio.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc_asyncio.py index 92d46f37f231..6e28de0f6086 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc_asyncio.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc_asyncio.py @@ -17,32 +17,37 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact from .base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport from .grpc import ArtifactRegistryGrpcTransport diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest.py index 558a0dc3b197..76bbbeb8cc36 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest.py @@ -16,30 +16,35 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseArtifactRegistryRestTransport @@ -1650,9 +1655,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseCreateRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseCreateRepository._get_http_options() request, metadata = self._interceptor.pre_create_repository( request, metadata @@ -1955,9 +1958,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseDeletePackage._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseDeletePackage._get_http_options() request, metadata = self._interceptor.pre_delete_package(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseDeletePackage._get_transcoded_request( @@ -2101,9 +2102,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseDeleteRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseDeleteRepository._get_http_options() request, metadata = self._interceptor.pre_delete_repository( request, metadata @@ -2354,9 +2353,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseDeleteVersion._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseDeleteVersion._get_http_options() request, metadata = self._interceptor.pre_delete_version(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseDeleteVersion._get_transcoded_request( @@ -3016,9 +3013,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetProjectSettings._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetProjectSettings._get_http_options() request, metadata = self._interceptor.pre_get_project_settings( request, metadata @@ -3164,9 +3159,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetRepository._get_http_options() request, metadata = self._interceptor.pre_get_repository(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseGetRepository._get_transcoded_request( @@ -3614,9 +3607,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseImportAptArtifacts._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseImportAptArtifacts._get_http_options() request, metadata = self._interceptor.pre_import_apt_artifacts( request, metadata @@ -3769,9 +3760,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseImportYumArtifacts._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseImportYumArtifacts._get_http_options() request, metadata = self._interceptor.pre_import_yum_artifacts( request, metadata @@ -4209,9 +4198,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListRepositories._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListRepositories._get_http_options() request, metadata = self._interceptor.pre_list_repositories( request, metadata @@ -4874,9 +4861,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5029,9 +5014,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseUpdateProjectSettings._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseUpdateProjectSettings._get_http_options() request, metadata = self._interceptor.pre_update_project_settings( request, metadata @@ -5186,9 +5169,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseUpdateRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseUpdateRepository._get_http_options() request, metadata = self._interceptor.pre_update_repository( request, metadata @@ -5821,9 +5802,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseListLocations._get_transcoded_request( diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest_base.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest_base.py index 98a1438bcadb..020262de4acb 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest_base.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest_base.py @@ -17,21 +17,26 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import gapic_v1, path_template +from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact from .base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/__init__.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/__init__.py index 591fc4bcbdfd..49121e432f10 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/__init__.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/__init__.py @@ -21,7 +21,13 @@ ImportAptArtifactsRequest, ImportAptArtifactsResponse, ) -from .file import File, GetFileRequest, Hash, ListFilesRequest, ListFilesResponse +from .file import ( + File, + GetFileRequest, + Hash, + ListFilesRequest, + ListFilesResponse, +) from .package import ( DeletePackageRequest, GetPackageRequest, @@ -38,7 +44,9 @@ Repository, UpdateRepositoryRequest, ) -from .service import OperationMetadata +from .service import ( + OperationMetadata, +) from .settings import ( GetProjectSettingsRequest, ProjectSettings, diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/apt_artifact.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/apt_artifact.py index 4c36242504cb..b6332227b606 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/apt_artifact.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/apt_artifact.py @@ -70,6 +70,7 @@ class PackageType(proto.Enum): SOURCE (2): Source package. """ + PACKAGE_TYPE_UNSPECIFIED = 0 BINARY = 1 SOURCE = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/file.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/file.py index 592e79b30ea0..933f187c721b 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/file.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/file.py @@ -53,6 +53,7 @@ class HashType(proto.Enum): MD5 (2): MD5 hash. """ + HASH_TYPE_UNSPECIFIED = 0 SHA256 = 1 MD5 = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/repository.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/repository.py index 3e2551d32748..b09fccea3749 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/repository.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/repository.py @@ -98,6 +98,7 @@ class Format(proto.Enum): PYTHON (8): Python package format. """ + FORMAT_UNSPECIFIED = 0 DOCKER = 1 MAVEN = 2 @@ -135,6 +136,7 @@ class VersionPolicy(proto.Enum): SNAPSHOT - repository will accept only Snapshot versions. """ + VERSION_POLICY_UNSPECIFIED = 0 RELEASE = 1 SNAPSHOT = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/settings.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/settings.py index eae8134c5365..b4557cf3db94 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/settings.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/settings.py @@ -62,6 +62,7 @@ class RedirectionState(proto.Enum): Redirection is enabled, and has been finalized so cannot be reverted. """ + REDIRECTION_STATE_UNSPECIFIED = 0 REDIRECTION_FROM_GCR_IO_DISABLED = 1 REDIRECTION_FROM_GCR_IO_ENABLED = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/version.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/version.py index 741d0495b52d..3062ef4a0d8e 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/version.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/version.py @@ -50,6 +50,7 @@ class VersionView(proto.Enum): FULL (2): Include everything. """ + VERSION_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/yum_artifact.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/yum_artifact.py index 570b0ab69717..ee870187de96 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/yum_artifact.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/yum_artifact.py @@ -62,6 +62,7 @@ class PackageType(proto.Enum): SOURCE (2): Source package (.srpm). """ + PACKAGE_TYPE_UNSPECIFIED = 0 BINARY = 1 SOURCE = 2 diff --git a/packages/google-cloud-artifact-registry/mypy.ini b/packages/google-cloud-artifact-registry/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-artifact-registry/mypy.ini +++ b/packages/google-cloud-artifact-registry/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-artifact-registry/noxfile.py b/packages/google-cloud-artifact-registry/noxfile.py index 1fb96e3aed91..89b6d574a3d2 100644 --- a/packages/google-cloud-artifact-registry/noxfile.py +++ b/packages/google-cloud-artifact-registry/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_async.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_async.py index 8af708ea1494..a79a246566e0 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_async.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START artifactregistry_v1_generated_ArtifactRegistry_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_sync.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_sync.py index f136977d2f8b..07c8d8c9fbc0 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_sync.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START artifactregistry_v1_generated_ArtifactRegistry_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_async.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_async.py index 08ff3c796df7..f82e5fc18bc8 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_async.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START artifactregistry_v1_generated_ArtifactRegistry_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_sync.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_sync.py index 0856ce7c5cfd..bf81bfa8fadb 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_sync.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START artifactregistry_v1_generated_ArtifactRegistry_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_async.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_async.py index 1f2de3d3d74b..80bc6cfb23a0 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_async.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START artifactregistry_v1_generated_ArtifactRegistry_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_sync.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_sync.py index e44d49b612e6..20b9f4c89791 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_sync.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START artifactregistry_v1_generated_ArtifactRegistry_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_async.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_async.py index e165ab88a6b7..6de97280a555 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_async.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START artifactregistry_v1beta2_generated_ArtifactRegistry_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1beta2 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_sync.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_sync.py index 75ff35ed6141..e921fede777a 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_sync.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START artifactregistry_v1beta2_generated_ArtifactRegistry_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1beta2 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_async.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_async.py index 4c88b496dce8..4b17c8863759 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_async.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START artifactregistry_v1beta2_generated_ArtifactRegistry_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1beta2 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_sync.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_sync.py index 35e6c94a2335..1a304ebec175 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_sync.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START artifactregistry_v1beta2_generated_ArtifactRegistry_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1beta2 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_async.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_async.py index 675fec1f2bbe..62463e89c610 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_async.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START artifactregistry_v1beta2_generated_ArtifactRegistry_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1beta2 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_sync.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_sync.py index 2fdb706899b3..40b5e7b0f6cd 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_sync.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START artifactregistry_v1beta2_generated_ArtifactRegistry_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1beta2 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/snippet_metadata_google.devtools.artifactregistry.v1.json b/packages/google-cloud-artifact-registry/samples/generated_samples/snippet_metadata_google.devtools.artifactregistry.v1.json index 26ef988ada90..c9b77207377c 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/snippet_metadata_google.devtools.artifactregistry.v1.json +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/snippet_metadata_google.devtools.artifactregistry.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-artifact-registry", - "version": "1.19.0" + "version": "1.20.0" }, "snippets": [ { diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/snippet_metadata_google.devtools.artifactregistry.v1beta2.json b/packages/google-cloud-artifact-registry/samples/generated_samples/snippet_metadata_google.devtools.artifactregistry.v1beta2.json index afca8dbd2c33..04f82b5843e4 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/snippet_metadata_google.devtools.artifactregistry.v1beta2.json +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/snippet_metadata_google.devtools.artifactregistry.v1beta2.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-artifact-registry", - "version": "1.19.0" + "version": "1.20.0" }, "snippets": [ { diff --git a/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1/test_artifact_registry.py b/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1/test_artifact_registry.py index c4f542f8637b..dfe8cc35b2d2 100644 --- a/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1/test_artifact_registry.py +++ b/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1/test_artifact_registry.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,19 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,25 +64,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.options_pb2 as options_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.artifactregistry_v1.services.artifact_registry import ( ArtifactRegistryAsyncClient, @@ -78,26 +78,30 @@ pagers, transports, ) -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + service, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import service, settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1009,10 +1013,9 @@ def test_artifact_registry_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1060,9 @@ def test_artifact_registry_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1096,10 +1098,9 @@ def test_artifact_registry_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1351,9 +1352,7 @@ def test_artifact_registry_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1473,9 +1472,9 @@ def test_list_docker_images_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_docker_images - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_docker_images] = ( + mock_rpc + ) request = {} client.list_docker_images(request) @@ -2020,9 +2019,9 @@ def test_get_docker_image_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_docker_image - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_docker_image] = ( + mock_rpc + ) request = {} client.get_docker_image(request) @@ -2363,9 +2362,9 @@ def test_list_maven_artifacts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_maven_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_maven_artifacts] = ( + mock_rpc + ) request = {} client.list_maven_artifacts(request) @@ -2914,9 +2913,9 @@ def test_get_maven_artifact_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_maven_artifact - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_maven_artifact] = ( + mock_rpc + ) request = {} client.get_maven_artifact(request) @@ -3263,9 +3262,9 @@ def test_list_npm_packages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_npm_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_npm_packages] = ( + mock_rpc + ) request = {} client.list_npm_packages(request) @@ -4139,9 +4138,9 @@ def test_list_python_packages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_python_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_python_packages] = ( + mock_rpc + ) request = {} client.list_python_packages(request) @@ -4688,9 +4687,9 @@ def test_get_python_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_python_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_python_package] = ( + mock_rpc + ) request = {} client.get_python_package(request) @@ -5032,9 +5031,9 @@ def test_import_apt_artifacts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_apt_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_apt_artifacts] = ( + mock_rpc + ) request = {} client.import_apt_artifacts(request) @@ -5291,9 +5290,9 @@ def test_import_yum_artifacts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_yum_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_yum_artifacts] = ( + mock_rpc + ) request = {} client.import_yum_artifacts(request) @@ -5557,9 +5556,9 @@ def test_list_repositories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -6460,9 +6459,9 @@ def test_create_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -6866,9 +6865,9 @@ def test_update_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -7256,9 +7255,9 @@ def test_delete_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -9948,9 +9947,9 @@ def test_batch_delete_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_versions] = ( + mock_rpc + ) request = {} client.batch_delete_versions(request) @@ -16328,9 +16327,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -16610,9 +16609,9 @@ def test_get_project_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_project_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_project_settings] = ( + mock_rpc + ) request = {} client.get_project_settings(request) @@ -17316,9 +17315,9 @@ def test_get_vpcsc_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_vpcsc_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_vpcsc_config] = ( + mock_rpc + ) request = {} client.get_vpcsc_config(request) @@ -17647,9 +17646,9 @@ def test_update_vpcsc_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_vpcsc_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_vpcsc_config] = ( + mock_rpc + ) request = {} client.update_vpcsc_config(request) @@ -18328,9 +18327,9 @@ def test_list_attachments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_attachments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_attachments] = ( + mock_rpc + ) request = {} client.list_attachments(request) @@ -19193,9 +19192,9 @@ def test_create_attachment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_attachment] = ( + mock_rpc + ) request = {} client.create_attachment(request) @@ -19556,9 +19555,9 @@ def test_delete_attachment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_attachment] = ( + mock_rpc + ) request = {} client.delete_attachment(request) @@ -20087,9 +20086,9 @@ def test_list_docker_images_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_docker_images - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_docker_images] = ( + mock_rpc + ) request = {} client.list_docker_images(request) @@ -20349,9 +20348,9 @@ def test_get_docker_image_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_docker_image - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_docker_image] = ( + mock_rpc + ) request = {} client.get_docker_image(request) @@ -20533,9 +20532,9 @@ def test_list_maven_artifacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_maven_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_maven_artifacts] = ( + mock_rpc + ) request = {} client.list_maven_artifacts(request) @@ -20797,9 +20796,9 @@ def test_get_maven_artifact_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_maven_artifact - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_maven_artifact] = ( + mock_rpc + ) request = {} client.get_maven_artifact(request) @@ -20979,9 +20978,9 @@ def test_list_npm_packages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_npm_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_npm_packages] = ( + mock_rpc + ) request = {} client.list_npm_packages(request) @@ -21421,9 +21420,9 @@ def test_list_python_packages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_python_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_python_packages] = ( + mock_rpc + ) request = {} client.list_python_packages(request) @@ -21685,9 +21684,9 @@ def test_get_python_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_python_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_python_package] = ( + mock_rpc + ) request = {} client.get_python_package(request) @@ -21869,9 +21868,9 @@ def test_import_apt_artifacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_apt_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_apt_artifacts] = ( + mock_rpc + ) request = {} client.import_apt_artifacts(request) @@ -21913,9 +21912,9 @@ def test_import_yum_artifacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_yum_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_yum_artifacts] = ( + mock_rpc + ) request = {} client.import_yum_artifacts(request) @@ -21955,9 +21954,9 @@ def test_list_repositories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -22397,9 +22396,9 @@ def test_create_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -22613,9 +22612,9 @@ def test_update_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -22723,9 +22722,9 @@ def test_delete_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -23875,9 +23874,9 @@ def test_batch_delete_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_versions] = ( + mock_rpc + ) request = {} client.batch_delete_versions(request) @@ -26734,9 +26733,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -26869,9 +26868,9 @@ def test_get_project_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_project_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_project_settings] = ( + mock_rpc + ) request = {} client.get_project_settings(request) @@ -27150,9 +27149,9 @@ def test_get_vpcsc_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_vpcsc_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_vpcsc_config] = ( + mock_rpc + ) request = {} client.get_vpcsc_config(request) @@ -27331,9 +27330,9 @@ def test_update_vpcsc_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_vpcsc_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_vpcsc_config] = ( + mock_rpc + ) request = {} client.update_vpcsc_config(request) @@ -27531,9 +27530,9 @@ def test_list_attachments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_attachments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_attachments] = ( + mock_rpc + ) request = {} client.list_attachments(request) @@ -27975,9 +27974,9 @@ def test_create_attachment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_attachment] = ( + mock_rpc + ) request = {} client.create_attachment(request) @@ -28185,9 +28184,9 @@ def test_delete_attachment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_attachment] = ( + mock_rpc + ) request = {} client.delete_attachment(request) diff --git a/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1beta2/test_artifact_registry.py b/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1beta2/test_artifact_registry.py index ffd87c9f4287..1ad461e03d98 100644 --- a/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1beta2/test_artifact_registry.py +++ b/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1beta2/test_artifact_registry.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +63,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.options_pb2 as options_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.artifactregistry_v1beta2.services.artifact_registry import ( ArtifactRegistryAsyncClient, @@ -77,13 +77,19 @@ pagers, transports, ) -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + service, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import service, settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -995,10 +1001,9 @@ def test_artifact_registry_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1048,9 @@ def test_artifact_registry_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1086,9 @@ def test_artifact_registry_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1337,9 +1340,7 @@ def test_artifact_registry_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1452,9 +1453,9 @@ def test_import_apt_artifacts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_apt_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_apt_artifacts] = ( + mock_rpc + ) request = {} client.import_apt_artifacts(request) @@ -1711,9 +1712,9 @@ def test_import_yum_artifacts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_yum_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_yum_artifacts] = ( + mock_rpc + ) request = {} client.import_yum_artifacts(request) @@ -1973,9 +1974,9 @@ def test_list_repositories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -2848,9 +2849,9 @@ def test_create_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -3240,9 +3241,9 @@ def test_update_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -3616,9 +3617,9 @@ def test_delete_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -9488,9 +9489,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -9768,9 +9769,9 @@ def test_get_project_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_project_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_project_settings] = ( + mock_rpc + ) request = {} client.get_project_settings(request) @@ -10404,9 +10405,9 @@ def test_import_apt_artifacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_apt_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_apt_artifacts] = ( + mock_rpc + ) request = {} client.import_apt_artifacts(request) @@ -10448,9 +10449,9 @@ def test_import_yum_artifacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_yum_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_yum_artifacts] = ( + mock_rpc + ) request = {} client.import_yum_artifacts(request) @@ -10490,9 +10491,9 @@ def test_list_repositories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -10928,9 +10929,9 @@ def test_create_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -11122,9 +11123,9 @@ def test_update_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -11232,9 +11233,9 @@ def test_delete_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -13172,9 +13173,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -13307,9 +13308,9 @@ def test_get_project_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_project_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_project_settings] = ( + mock_rpc + ) request = {} client.get_project_settings(request) diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1/__init__.py index 4995dd9ee511..b3d2b7bb144c 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.asset_service import AssetServiceAsyncClient, AssetServiceClient from .types.asset_enrichment_resourceowners import ResourceOwners from .types.asset_service import ( diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/async_client.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/async_client.py index 28aab6d22d5a..1c2b0d2d35e2 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/async_client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1 import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_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 google.rpc.status_pb2 as status_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.asset_v1.services.asset_service import pagers from google.cloud.asset_v1.types import asset_service, assets @@ -131,7 +131,10 @@ 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): @@ -147,7 +150,10 @@ 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 diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/client.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/client.py index 52bc81957cd6..2814645640b6 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1 import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_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 google.rpc.status_pb2 as status_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.asset_v1.services.asset_service import pagers from google.cloud.asset_v1.types import asset_service, assets @@ -728,11 +728,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AssetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AssetServiceClient._read_environment_variables() + ) self._client_cert_source = AssetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -767,8 +765,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AssetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/pagers.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/pagers.py index 11261a60e0eb..64466fe1186a 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/pagers.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -769,7 +769,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -851,7 +851,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -935,7 +935,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1021,7 +1021,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1101,7 +1101,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/base.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/base.py index 82f192ce62bf..c3826a96437a 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/base.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.asset_v1 import gapic_version as package_version from google.cloud.asset_v1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc.py index 5e9e3277cd39..7c7e10a8342f 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.asset_v1.types import asset_service @@ -696,12 +696,12 @@ def analyze_iam_policy_longrunning( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "analyze_iam_policy_longrunning" not in self._stubs: - self._stubs[ - "analyze_iam_policy_longrunning" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/AnalyzeIamPolicyLongrunning", - request_serializer=asset_service.AnalyzeIamPolicyLongrunningRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["analyze_iam_policy_longrunning"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/AnalyzeIamPolicyLongrunning", + request_serializer=asset_service.AnalyzeIamPolicyLongrunningRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["analyze_iam_policy_longrunning"] @@ -939,12 +939,12 @@ def batch_get_effective_iam_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_effective_iam_policies" not in self._stubs: - self._stubs[ - "batch_get_effective_iam_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/BatchGetEffectiveIamPolicies", - request_serializer=asset_service.BatchGetEffectiveIamPoliciesRequest.serialize, - response_deserializer=asset_service.BatchGetEffectiveIamPoliciesResponse.deserialize, + self._stubs["batch_get_effective_iam_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/BatchGetEffectiveIamPolicies", + request_serializer=asset_service.BatchGetEffectiveIamPoliciesRequest.serialize, + response_deserializer=asset_service.BatchGetEffectiveIamPoliciesResponse.deserialize, + ) ) return self._stubs["batch_get_effective_iam_policies"] @@ -1001,12 +1001,12 @@ def analyze_org_policy_governed_containers( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "analyze_org_policy_governed_containers" not in self._stubs: - self._stubs[ - "analyze_org_policy_governed_containers" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedContainers", - request_serializer=asset_service.AnalyzeOrgPolicyGovernedContainersRequest.serialize, - response_deserializer=asset_service.AnalyzeOrgPolicyGovernedContainersResponse.deserialize, + self._stubs["analyze_org_policy_governed_containers"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedContainers", + request_serializer=asset_service.AnalyzeOrgPolicyGovernedContainersRequest.serialize, + response_deserializer=asset_service.AnalyzeOrgPolicyGovernedContainersResponse.deserialize, + ) ) return self._stubs["analyze_org_policy_governed_containers"] @@ -1082,12 +1082,12 @@ def analyze_org_policy_governed_assets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "analyze_org_policy_governed_assets" not in self._stubs: - self._stubs[ - "analyze_org_policy_governed_assets" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedAssets", - request_serializer=asset_service.AnalyzeOrgPolicyGovernedAssetsRequest.serialize, - response_deserializer=asset_service.AnalyzeOrgPolicyGovernedAssetsResponse.deserialize, + self._stubs["analyze_org_policy_governed_assets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedAssets", + request_serializer=asset_service.AnalyzeOrgPolicyGovernedAssetsRequest.serialize, + response_deserializer=asset_service.AnalyzeOrgPolicyGovernedAssetsResponse.deserialize, + ) ) return self._stubs["analyze_org_policy_governed_assets"] diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc_asyncio.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc_asyncio.py index 4f0339947f4e..9b59dfa7cfd8 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.asset_v1.types import asset_service @@ -714,12 +714,12 @@ def analyze_iam_policy_longrunning( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "analyze_iam_policy_longrunning" not in self._stubs: - self._stubs[ - "analyze_iam_policy_longrunning" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/AnalyzeIamPolicyLongrunning", - request_serializer=asset_service.AnalyzeIamPolicyLongrunningRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["analyze_iam_policy_longrunning"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/AnalyzeIamPolicyLongrunning", + request_serializer=asset_service.AnalyzeIamPolicyLongrunningRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["analyze_iam_policy_longrunning"] @@ -964,12 +964,12 @@ def batch_get_effective_iam_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_effective_iam_policies" not in self._stubs: - self._stubs[ - "batch_get_effective_iam_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/BatchGetEffectiveIamPolicies", - request_serializer=asset_service.BatchGetEffectiveIamPoliciesRequest.serialize, - response_deserializer=asset_service.BatchGetEffectiveIamPoliciesResponse.deserialize, + self._stubs["batch_get_effective_iam_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/BatchGetEffectiveIamPolicies", + request_serializer=asset_service.BatchGetEffectiveIamPoliciesRequest.serialize, + response_deserializer=asset_service.BatchGetEffectiveIamPoliciesResponse.deserialize, + ) ) return self._stubs["batch_get_effective_iam_policies"] @@ -1026,12 +1026,12 @@ def analyze_org_policy_governed_containers( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "analyze_org_policy_governed_containers" not in self._stubs: - self._stubs[ - "analyze_org_policy_governed_containers" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedContainers", - request_serializer=asset_service.AnalyzeOrgPolicyGovernedContainersRequest.serialize, - response_deserializer=asset_service.AnalyzeOrgPolicyGovernedContainersResponse.deserialize, + self._stubs["analyze_org_policy_governed_containers"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedContainers", + request_serializer=asset_service.AnalyzeOrgPolicyGovernedContainersRequest.serialize, + response_deserializer=asset_service.AnalyzeOrgPolicyGovernedContainersResponse.deserialize, + ) ) return self._stubs["analyze_org_policy_governed_containers"] @@ -1107,12 +1107,12 @@ def analyze_org_policy_governed_assets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "analyze_org_policy_governed_assets" not in self._stubs: - self._stubs[ - "analyze_org_policy_governed_assets" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedAssets", - request_serializer=asset_service.AnalyzeOrgPolicyGovernedAssetsRequest.serialize, - response_deserializer=asset_service.AnalyzeOrgPolicyGovernedAssetsResponse.deserialize, + self._stubs["analyze_org_policy_governed_assets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedAssets", + request_serializer=asset_service.AnalyzeOrgPolicyGovernedAssetsRequest.serialize, + response_deserializer=asset_service.AnalyzeOrgPolicyGovernedAssetsResponse.deserialize, + ) ) return self._stubs["analyze_org_policy_governed_assets"] diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest.py index 9f1f8c2e1dda..f0d585eb84e5 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.asset_v1.types import asset_service @@ -1681,9 +1681,7 @@ def __call__( """ - http_options = ( - _BaseAssetServiceRestTransport._BaseAnalyzeIamPolicyLongrunning._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseAnalyzeIamPolicyLongrunning._get_http_options() request, metadata = self._interceptor.pre_analyze_iam_policy_longrunning( request, metadata @@ -1752,11 +1750,10 @@ def __call__( resp = self._interceptor.post_analyze_iam_policy_longrunning(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_analyze_iam_policy_longrunning_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_analyze_iam_policy_longrunning_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1991,9 +1988,7 @@ def __call__( """ - http_options = ( - _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicies._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicies._get_http_options() request, metadata = self._interceptor.pre_analyze_org_policies( request, metadata @@ -2144,15 +2139,12 @@ def __call__( """ - http_options = ( - _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicyGovernedAssets._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicyGovernedAssets._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_analyze_org_policy_governed_assets( - request, metadata + request, metadata = ( + self._interceptor.pre_analyze_org_policy_governed_assets( + request, metadata + ) ) transcoded_request = _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicyGovernedAssets._get_transcoded_request( http_options, request @@ -2215,11 +2207,10 @@ def __call__( resp = self._interceptor.post_analyze_org_policy_governed_assets(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_analyze_org_policy_governed_assets_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_analyze_org_policy_governed_assets_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2307,15 +2298,12 @@ def __call__( """ - http_options = ( - _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicyGovernedContainers._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicyGovernedContainers._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_analyze_org_policy_governed_containers( - request, metadata + request, metadata = ( + self._interceptor.pre_analyze_org_policy_governed_containers( + request, metadata + ) ) transcoded_request = _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicyGovernedContainers._get_transcoded_request( http_options, request @@ -2376,11 +2364,10 @@ def __call__( resp = self._interceptor.post_analyze_org_policy_governed_containers(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_analyze_org_policy_governed_containers_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_analyze_org_policy_governed_containers_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2461,9 +2448,7 @@ def __call__( Batch get assets history response. """ - http_options = ( - _BaseAssetServiceRestTransport._BaseBatchGetAssetsHistory._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseBatchGetAssetsHistory._get_http_options() request, metadata = self._interceptor.pre_batch_get_assets_history( request, metadata @@ -2614,9 +2599,7 @@ def __call__( """ - http_options = ( - _BaseAssetServiceRestTransport._BaseBatchGetEffectiveIamPolicies._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseBatchGetEffectiveIamPolicies._get_http_options() request, metadata = self._interceptor.pre_batch_get_effective_iam_policies( request, metadata @@ -2682,11 +2665,10 @@ def __call__( resp = self._interceptor.post_batch_get_effective_iam_policies(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_get_effective_iam_policies_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_get_effective_iam_policies_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4364,9 +4346,7 @@ def __call__( Search all IAM policies response. """ - http_options = ( - _BaseAssetServiceRestTransport._BaseSearchAllIamPolicies._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseSearchAllIamPolicies._get_http_options() request, metadata = self._interceptor.pre_search_all_iam_policies( request, metadata @@ -4512,9 +4492,7 @@ def __call__( Search all resources response. """ - http_options = ( - _BaseAssetServiceRestTransport._BaseSearchAllResources._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseSearchAllResources._get_http_options() request, metadata = self._interceptor.pre_search_all_resources( request, metadata @@ -4942,7 +4920,9 @@ def analyze_iam_policy_longrunning( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AnalyzeIamPolicyLongrunning(self._session, self._host, self._interceptor) # type: ignore + return self._AnalyzeIamPolicyLongrunning( + self._session, self._host, self._interceptor + ) # type: ignore @property def analyze_move( @@ -4974,7 +4954,9 @@ def analyze_org_policy_governed_assets( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AnalyzeOrgPolicyGovernedAssets(self._session, self._host, self._interceptor) # type: ignore + return self._AnalyzeOrgPolicyGovernedAssets( + self._session, self._host, self._interceptor + ) # type: ignore @property def analyze_org_policy_governed_containers( @@ -4985,7 +4967,9 @@ def analyze_org_policy_governed_containers( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AnalyzeOrgPolicyGovernedContainers(self._session, self._host, self._interceptor) # type: ignore + return self._AnalyzeOrgPolicyGovernedContainers( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_get_assets_history( @@ -5007,7 +4991,9 @@ def batch_get_effective_iam_policies( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchGetEffectiveIamPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._BatchGetEffectiveIamPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_feed( diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest_base.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest_base.py index aac3f515f7d3..33b72d66dfb6 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest_base.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.asset_v1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/types/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1/types/__init__.py index d9f3fdd63167..fb95d771c1e4 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/types/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .asset_enrichment_resourceowners import ResourceOwners +from .asset_enrichment_resourceowners import ( + ResourceOwners, +) from .asset_service import ( AnalyzeIamPolicyLongrunningMetadata, AnalyzeIamPolicyLongrunningRequest, diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/types/asset_service.py b/packages/google-cloud-asset/google/cloud/asset_v1/types/asset_service.py index 38b9a201968a..00710e016331 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/types/asset_service.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/types/asset_service.py @@ -116,6 +116,7 @@ class ContentType(proto.Enum): RELATIONSHIP (7): The related resources. """ + CONTENT_TYPE_UNSPECIFIED = 0 RESOURCE = 1 IAM_POLICY = 2 @@ -910,6 +911,7 @@ class PartitionKey(proto.Enum): additional timestamp column representing when the request was received. """ + PARTITION_KEY_UNSPECIFIED = 0 READ_TIME = 1 REQUEST_TIME = 2 @@ -1888,23 +1890,23 @@ class IamPolicyAnalysis(proto.Message): number=1, message="IamPolicyAnalysisQuery", ) - analysis_results: MutableSequence[ - gca_assets.IamPolicyAnalysisResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=gca_assets.IamPolicyAnalysisResult, + analysis_results: MutableSequence[gca_assets.IamPolicyAnalysisResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=gca_assets.IamPolicyAnalysisResult, + ) ) fully_explored: bool = proto.Field( proto.BOOL, number=3, ) - non_critical_errors: MutableSequence[ - gca_assets.IamPolicyAnalysisState - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=gca_assets.IamPolicyAnalysisState, + non_critical_errors: MutableSequence[gca_assets.IamPolicyAnalysisState] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=gca_assets.IamPolicyAnalysisState, + ) ) main_analysis: IamPolicyAnalysis = proto.Field( @@ -1912,12 +1914,12 @@ class IamPolicyAnalysis(proto.Message): number=1, message=IamPolicyAnalysis, ) - service_account_impersonation_analysis: MutableSequence[ - IamPolicyAnalysis - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=IamPolicyAnalysis, + service_account_impersonation_analysis: MutableSequence[IamPolicyAnalysis] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=IamPolicyAnalysis, + ) ) fully_explored: bool = proto.Field( proto.BOOL, @@ -2032,6 +2034,7 @@ class PartitionKey(proto.Enum): additional timestamp column representing when the request was received. """ + PARTITION_KEY_UNSPECIFIED = 0 REQUEST_TIME = 1 @@ -2448,6 +2451,7 @@ class AnalysisView(proto.Enum): will prevent the specified resource move at runtime. """ + ANALYSIS_VIEW_UNSPECIFIED = 0 FULL = 1 BASIC = 2 @@ -3320,6 +3324,7 @@ class ConstraintDefault(proto.Enum): constraints. Indicate that enforcement is on for boolean constraints. """ + CONSTRAINT_DEFAULT_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 @@ -3452,6 +3457,7 @@ class MethodType(proto.Enum): Constraint applied when enforcing forced tagging. """ + METHOD_TYPE_UNSPECIFIED = 0 CREATE = 1 UPDATE = 2 @@ -3470,6 +3476,7 @@ class ActionType(proto.Enum): DENY (2): Deny action type. """ + ACTION_TYPE_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 @@ -3849,12 +3856,12 @@ class GovernedContainer(proto.Message): proto.STRING, number=7, ) - effective_tags: MutableSequence[ - gca_assets.EffectiveTagDetails - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message=gca_assets.EffectiveTagDetails, + effective_tags: MutableSequence[gca_assets.EffectiveTagDetails] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message=gca_assets.EffectiveTagDetails, + ) ) @property @@ -4045,12 +4052,12 @@ class GovernedResource(proto.Message): proto.STRING, number=8, ) - effective_tags: MutableSequence[ - gca_assets.EffectiveTagDetails - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message=gca_assets.EffectiveTagDetails, + effective_tags: MutableSequence[gca_assets.EffectiveTagDetails] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message=gca_assets.EffectiveTagDetails, + ) ) class GovernedIamPolicy(proto.Message): diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/types/assets.py b/packages/google-cloud-asset/google/cloud/asset_v1/types/assets.py index e79e3db5b1b2..8b563a6e78f4 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/types/assets.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/types/assets.py @@ -18,7 +18,6 @@ from typing import MutableMapping, MutableSequence import google.cloud.orgpolicy.v1.orgpolicy_pb2 as orgpolicy_pb2 # type: ignore -from google.cloud.osconfig_v1.types import inventory import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore import google.identity.accesscontextmanager.v1.access_level_pb2 as access_level_pb2 # type: ignore import google.identity.accesscontextmanager.v1.access_policy_pb2 as access_policy_pb2 # type: ignore @@ -27,6 +26,7 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.code_pb2 as code_pb2 # type: ignore import proto # type: ignore +from google.cloud.osconfig_v1.types import inventory from google.cloud.asset_v1.types import asset_enrichment_resourceowners @@ -92,6 +92,7 @@ class PriorAssetState(proto.Enum): DELETED (4): prior_asset is a deletion. """ + PRIOR_ASSET_STATE_UNSPECIFIED = 0 PRESENT = 1 INVALID = 2 @@ -1460,6 +1461,7 @@ class EvaluationValue(proto.Enum): expression contains variables that are either missing input values or have not been supported by Policy Analyzer yet. """ + EVALUATION_VALUE_UNSPECIFIED = 0 TRUE = 1 FALSE = 2 @@ -1662,26 +1664,26 @@ class AccessControlList(proto.Message): defined in the above IAM policy binding. """ - resources: MutableSequence[ - "IamPolicyAnalysisResult.Resource" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="IamPolicyAnalysisResult.Resource", + resources: MutableSequence["IamPolicyAnalysisResult.Resource"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="IamPolicyAnalysisResult.Resource", + ) ) - accesses: MutableSequence[ - "IamPolicyAnalysisResult.Access" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="IamPolicyAnalysisResult.Access", + accesses: MutableSequence["IamPolicyAnalysisResult.Access"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="IamPolicyAnalysisResult.Access", + ) ) - resource_edges: MutableSequence[ - "IamPolicyAnalysisResult.Edge" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="IamPolicyAnalysisResult.Edge", + resource_edges: MutableSequence["IamPolicyAnalysisResult.Edge"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="IamPolicyAnalysisResult.Edge", + ) ) condition_evaluation: "ConditionEvaluation" = proto.Field( proto.MESSAGE, @@ -1714,19 +1716,19 @@ class IdentityList(proto.Message): enabled in request. """ - identities: MutableSequence[ - "IamPolicyAnalysisResult.Identity" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="IamPolicyAnalysisResult.Identity", + identities: MutableSequence["IamPolicyAnalysisResult.Identity"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="IamPolicyAnalysisResult.Identity", + ) ) - group_edges: MutableSequence[ - "IamPolicyAnalysisResult.Edge" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="IamPolicyAnalysisResult.Edge", + group_edges: MutableSequence["IamPolicyAnalysisResult.Edge"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="IamPolicyAnalysisResult.Edge", + ) ) attached_resource_full_name: str = proto.Field( diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/__init__.py index 99992ac8cf50..ebce73f7e3cc 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.asset_service import AssetServiceAsyncClient, AssetServiceClient from .types.asset_service import ( SearchAllIamPoliciesRequest, diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/async_client.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/async_client.py index fb31e1fece9d..e7d6fbd776f5 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/async_client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p1beta1 import gapic_version as package_version @@ -109,7 +109,10 @@ 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): @@ -125,7 +128,10 @@ 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 diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/client.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/client.py index c02fc5d08e10..f1bd3462d456 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p1beta1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AssetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AssetServiceClient._read_environment_variables() + ) self._client_cert_source = AssetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AssetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/pagers.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/pagers.py index 794991b335cd..f5ea1427874e 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/pagers.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/base.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/base.py index 3a1ff3286d43..4aa7f5eb2218 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/base.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p1beta1 import gapic_version as package_version from google.cloud.asset_v1p1beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc.py index 19db61926711..405253354d25 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.asset_v1p1beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc_asyncio.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc_asyncio.py index 873556d87fdd..3f90e3808b0e 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.asset_v1p1beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/rest.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/rest.py index d49a55304d0e..e12c8535d5c1 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/rest.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -340,9 +340,7 @@ def __call__( Search all IAM policies response. """ - http_options = ( - _BaseAssetServiceRestTransport._BaseSearchAllIamPolicies._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseSearchAllIamPolicies._get_http_options() request, metadata = self._interceptor.pre_search_all_iam_policies( request, metadata @@ -488,9 +486,7 @@ def __call__( Search all resources response. """ - http_options = ( - _BaseAssetServiceRestTransport._BaseSearchAllResources._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseSearchAllResources._get_http_options() request, metadata = self._interceptor.pre_search_all_resources( request, metadata diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/types/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/types/__init__.py index 32139b2fe719..4bd7d9b700fe 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/types/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/types/__init__.py @@ -19,7 +19,11 @@ SearchAllResourcesRequest, SearchAllResourcesResponse, ) -from .assets import IamPolicySearchResult, Permissions, StandardResourceMetadata +from .assets import ( + IamPolicySearchResult, + Permissions, + StandardResourceMetadata, +) __all__ = ( "SearchAllIamPoliciesRequest", diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/__init__.py index b3d9931985c7..a80a31de72b9 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.asset_service import AssetServiceAsyncClient, AssetServiceClient from .types.asset_service import ( BatchGetAssetsHistoryResponse, diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/async_client.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/async_client.py index c28656f2de34..c58ac95ab706 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/async_client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p2beta1 import gapic_version as package_version @@ -110,7 +110,10 @@ 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): @@ -126,7 +129,10 @@ 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 diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/client.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/client.py index 1ce7f9d4e921..8aa79db182a2 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p2beta1 import gapic_version as package_version @@ -614,11 +614,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AssetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AssetServiceClient._read_environment_variables() + ) self._client_cert_source = AssetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -653,8 +651,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AssetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/base.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/base.py index 92dc7f8a2019..abd76ca51760 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/base.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.asset_v1p2beta1 import gapic_version as package_version from google.cloud.asset_v1p2beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc.py index 769fd94b78c3..c2d683faedf7 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.asset_v1p2beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc_asyncio.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc_asyncio.py index 5f06bdde29b4..c0f1fbdf4bf5 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.asset_v1p2beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest.py index 332fb429f74a..4205a2f9b850 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.asset_v1p2beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest_base.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest_base.py index 1148cc458e38..d9bc77956940 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest_base.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.asset_v1p2beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/__init__.py index 08b5c0fd84d1..7135c43325e5 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/__init__.py @@ -29,7 +29,12 @@ PubsubDestination, UpdateFeedRequest, ) -from .assets import Asset, Resource, TemporalAsset, TimeWindow +from .assets import ( + Asset, + Resource, + TemporalAsset, + TimeWindow, +) __all__ = ( "BatchGetAssetsHistoryResponse", diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/asset_service.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/asset_service.py index df4b6a4172ef..8d9887ba8d0a 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/asset_service.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/asset_service.py @@ -55,6 +55,7 @@ class ContentType(proto.Enum): IAM_POLICY (2): The actual IAM policy set on a resource. """ + CONTENT_TYPE_UNSPECIFIED = 0 RESOURCE = 1 IAM_POLICY = 2 diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/__init__.py index f15dc513e448..07ae62e4452e 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.asset_service import AssetServiceAsyncClient, AssetServiceClient from .types.asset_service import ContentType, ListAssetsRequest, ListAssetsResponse from .types.assets import Asset, Resource diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/async_client.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/async_client.py index 636ef197b0de..aacbfdad5993 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/async_client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p5beta1 import gapic_version as package_version @@ -119,7 +119,10 @@ 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): @@ -135,7 +138,10 @@ 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 diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/client.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/client.py index 56a9ab9cee35..c0a8e80e8c68 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p5beta1 import gapic_version as package_version @@ -664,11 +664,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AssetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AssetServiceClient._read_environment_variables() + ) self._client_cert_source = AssetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -703,8 +701,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AssetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/pagers.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/pagers.py index 92b63c63b745..db4ac60eb4c3 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/pagers.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/base.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/base.py index d274566c2dd8..ba975f3cabfe 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/base.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p5beta1 import gapic_version as package_version from google.cloud.asset_v1p5beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc.py index 496fdc18f57c..35d8a1eae0c2 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.asset_v1p5beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc_asyncio.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc_asyncio.py index 637952b8848e..c44a3cfe9a66 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.asset_v1p5beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/rest.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/rest.py index ae012e2e78ee..9b89535fd329 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/rest.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/__init__.py index fc6776b028fe..cb53450feaa3 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/__init__.py @@ -13,8 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .asset_service import ContentType, ListAssetsRequest, ListAssetsResponse -from .assets import Asset, Resource +from .asset_service import ( + ContentType, + ListAssetsRequest, + ListAssetsResponse, +) +from .assets import ( + Asset, + Resource, +) __all__ = ( "ListAssetsRequest", diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/asset_service.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/asset_service.py index db27d3aa583a..1370c584ea5b 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/asset_service.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/asset_service.py @@ -48,6 +48,7 @@ class ContentType(proto.Enum): The Access Context Manager policy set on an asset. """ + CONTENT_TYPE_UNSPECIFIED = 0 RESOURCE = 1 IAM_POLICY = 2 diff --git a/packages/google-cloud-asset/mypy.ini b/packages/google-cloud-asset/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-asset/mypy.ini +++ b/packages/google-cloud-asset/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-asset/noxfile.py b/packages/google-cloud-asset/noxfile.py index 4ab620d50577..1da9221e4895 100644 --- a/packages/google-cloud-asset/noxfile.py +++ b/packages/google-cloud-asset/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-asset/tests/unit/gapic/asset_v1/test_asset_service.py b/packages/google-cloud-asset/tests/unit/gapic/asset_v1/test_asset_service.py index ad3db82e7bb7..34fd788bb562 100644 --- a/packages/google-cloud-asset/tests/unit/gapic/asset_v1/test_asset_service.py +++ b/packages/google-cloud-asset/tests/unit/gapic/asset_v1/test_asset_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +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 google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +60,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 google.rpc.status_pb2 as status_pb2 # type: ignore -import google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.asset_v1.services.asset_service import ( AssetServiceAsyncClient, @@ -941,10 +941,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1274,9 +1271,7 @@ def test_asset_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4037,9 +4032,9 @@ def test_search_all_resources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_all_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_all_resources] = ( + mock_rpc + ) request = {} client.search_all_resources(request) @@ -5162,9 +5157,9 @@ def test_analyze_iam_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_iam_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_iam_policy] = ( + mock_rpc + ) request = {} client.analyze_iam_policy(request) @@ -6174,9 +6169,9 @@ def test_create_saved_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_saved_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_saved_query] = ( + mock_rpc + ) request = {} client.create_saved_query(request) @@ -6880,9 +6875,9 @@ def test_list_saved_queries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_saved_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_saved_queries] = ( + mock_rpc + ) request = {} client.list_saved_queries(request) @@ -7425,9 +7420,9 @@ def test_update_saved_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_saved_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_saved_query] = ( + mock_rpc + ) request = {} client.update_saved_query(request) @@ -7779,9 +7774,9 @@ def test_delete_saved_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_saved_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_saved_query] = ( + mock_rpc + ) request = {} client.delete_saved_query(request) @@ -8368,9 +8363,9 @@ def test_analyze_org_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_org_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_org_policies] = ( + mock_rpc + ) request = {} client.analyze_org_policies(request) @@ -11453,9 +11448,9 @@ def test_search_all_resources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_all_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_all_resources] = ( + mock_rpc + ) request = {} client.search_all_resources(request) @@ -11990,9 +11985,9 @@ def test_analyze_iam_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_iam_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_iam_policy] = ( + mock_rpc + ) request = {} client.analyze_iam_policy(request) @@ -12532,9 +12527,9 @@ def test_create_saved_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_saved_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_saved_query] = ( + mock_rpc + ) request = {} client.create_saved_query(request) @@ -12917,9 +12912,9 @@ def test_list_saved_queries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_saved_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_saved_queries] = ( + mock_rpc + ) request = {} client.list_saved_queries(request) @@ -13177,9 +13172,9 @@ def test_update_saved_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_saved_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_saved_query] = ( + mock_rpc + ) request = {} client.update_saved_query(request) @@ -13368,9 +13363,9 @@ def test_delete_saved_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_saved_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_saved_query] = ( + mock_rpc + ) request = {} client.delete_saved_query(request) @@ -13695,9 +13690,9 @@ def test_analyze_org_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_org_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_org_policies] = ( + mock_rpc + ) request = {} client.analyze_org_policies(request) diff --git a/packages/google-cloud-asset/tests/unit/gapic/asset_v1p1beta1/test_asset_service.py b/packages/google-cloud-asset/tests/unit/gapic/asset_v1p1beta1/test_asset_service.py index 0cd610334c2e..bdce557cc99b 100644 --- a/packages/google-cloud-asset/tests/unit/gapic/asset_v1p1beta1/test_asset_service.py +++ b/packages/google-cloud-asset/tests/unit/gapic/asset_v1p1beta1/test_asset_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -927,10 +932,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +979,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1017,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1260,9 +1262,7 @@ def test_asset_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1381,9 +1381,9 @@ def test_search_all_resources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_all_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_all_resources] = ( + mock_rpc + ) request = {} client.search_all_resources(request) @@ -2436,9 +2436,9 @@ def test_search_all_resources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_all_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_all_resources] = ( + mock_rpc + ) request = {} client.search_all_resources(request) diff --git a/packages/google-cloud-asset/tests/unit/gapic/asset_v1p2beta1/test_asset_service.py b/packages/google-cloud-asset/tests/unit/gapic/asset_v1p2beta1/test_asset_service.py index 19979e4a2b51..4cddea785765 100644 --- a/packages/google-cloud-asset/tests/unit/gapic/asset_v1p2beta1/test_asset_service.py +++ b/packages/google-cloud-asset/tests/unit/gapic/asset_v1p2beta1/test_asset_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.asset_v1p2beta1.services.asset_service import ( AssetServiceAsyncClient, @@ -927,10 +932,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +979,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1017,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1260,9 +1262,7 @@ def test_asset_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-asset/tests/unit/gapic/asset_v1p5beta1/test_asset_service.py b/packages/google-cloud-asset/tests/unit/gapic/asset_v1p5beta1/test_asset_service.py index 1cbe5238dbb8..8e934c31a73f 100644 --- a/packages/google-cloud-asset/tests/unit/gapic/asset_v1p5beta1/test_asset_service.py +++ b/packages/google-cloud-asset/tests/unit/gapic/asset_v1p5beta1/test_asset_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.asset_v1p5beta1.services.asset_service import ( AssetServiceAsyncClient, @@ -928,10 +933,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -976,10 +980,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1018,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1261,9 +1263,7 @@ def test_asset_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/__init__.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/__init__.py index 1619c4a8caad..05121265f1d7 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/__init__.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.assured_workloads_service import ( AssuredWorkloadsServiceAsyncClient, AssuredWorkloadsServiceClient, diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/async_client.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/async_client.py index 5ee5c24fe819..8baac4655d89 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/async_client.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.assuredworkloads_v1 import gapic_version as package_version @@ -46,9 +46,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.assuredworkloads_v1.services.assured_workloads_service import pagers from google.cloud.assuredworkloads_v1.types import assuredworkloads @@ -131,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AssuredWorkloadsServiceAsyncClient: The constructed client. """ - return AssuredWorkloadsServiceClient.from_service_account_info.__func__(AssuredWorkloadsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AssuredWorkloadsServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AssuredWorkloadsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AssuredWorkloadsServiceAsyncClient: The constructed client. """ - return AssuredWorkloadsServiceClient.from_service_account_file.__func__(AssuredWorkloadsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AssuredWorkloadsServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + AssuredWorkloadsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -185,7 +193,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AssuredWorkloadsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AssuredWorkloadsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AssuredWorkloadsServiceTransport: diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/client.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/client.py index 4bd643314178..65d5b389d99f 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/client.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.assuredworkloads_v1 import gapic_version as package_version @@ -63,9 +63,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.assuredworkloads_v1.services.assured_workloads_service import pagers from google.cloud.assuredworkloads_v1.types import assuredworkloads @@ -84,9 +84,7 @@ class AssuredWorkloadsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] _transport_registry["grpc"] = AssuredWorkloadsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AssuredWorkloadsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AssuredWorkloadsServiceRestTransport @@ -656,11 +654,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AssuredWorkloadsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AssuredWorkloadsServiceClient._read_environment_variables() + ) self._client_cert_source = ( AssuredWorkloadsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -697,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AssuredWorkloadsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/pagers.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/pagers.py index c02e44463a5e..f57706a75feb 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/pagers.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/__init__.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/__init__.py index 36a6ad6c6936..1376fc64c7b6 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/__init__.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] _transport_registry["grpc"] = AssuredWorkloadsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AssuredWorkloadsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AssuredWorkloadsServiceRestTransport diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/base.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/base.py index c4cfb6e98774..0b03e2b254ac 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/base.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.assuredworkloads_v1 import gapic_version as package_version from google.cloud.assuredworkloads_v1.types import assuredworkloads diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc.py index 79ab37fb12ea..90fe2aa81eb6 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.assuredworkloads_v1.types import assuredworkloads @@ -424,12 +424,12 @@ def restrict_allowed_resources( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restrict_allowed_resources" not in self._stubs: - self._stubs[ - "restrict_allowed_resources" - ] = self._logged_channel.unary_unary( - "/google.cloud.assuredworkloads.v1.AssuredWorkloadsService/RestrictAllowedResources", - request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, - response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + self._stubs["restrict_allowed_resources"] = ( + self._logged_channel.unary_unary( + "/google.cloud.assuredworkloads.v1.AssuredWorkloadsService/RestrictAllowedResources", + request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, + response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + ) ) return self._stubs["restrict_allowed_resources"] diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc_asyncio.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc_asyncio.py index e98d38995980..f7432214209c 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.assuredworkloads_v1.types import assuredworkloads @@ -436,12 +436,12 @@ def restrict_allowed_resources( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restrict_allowed_resources" not in self._stubs: - self._stubs[ - "restrict_allowed_resources" - ] = self._logged_channel.unary_unary( - "/google.cloud.assuredworkloads.v1.AssuredWorkloadsService/RestrictAllowedResources", - request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, - response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + self._stubs["restrict_allowed_resources"] = ( + self._logged_channel.unary_unary( + "/google.cloud.assuredworkloads.v1.AssuredWorkloadsService/RestrictAllowedResources", + request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, + response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + ) ) return self._stubs["restrict_allowed_resources"] diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest.py index f9412ab46371..6ab9d1084389 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.assuredworkloads_v1.types import assuredworkloads @@ -665,9 +665,7 @@ def __call__( """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseCreateWorkload._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseCreateWorkload._get_http_options() request, metadata = self._interceptor.pre_create_workload(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseCreateWorkload._get_transcoded_request( @@ -811,9 +809,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseDeleteWorkload._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseDeleteWorkload._get_http_options() request, metadata = self._interceptor.pre_delete_workload(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseDeleteWorkload._get_transcoded_request( @@ -945,9 +941,7 @@ def __call__( """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseGetWorkload._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseGetWorkload._get_http_options() request, metadata = self._interceptor.pre_get_workload(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseGetWorkload._get_transcoded_request( @@ -1110,9 +1104,7 @@ def __call__( Response of ListWorkloads endpoint. """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseListWorkloads._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseListWorkloads._get_http_options() request, metadata = self._interceptor.pre_list_workloads(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseListWorkloads._get_transcoded_request( @@ -1265,9 +1257,7 @@ def __call__( """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseRestrictAllowedResources._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseRestrictAllowedResources._get_http_options() request, metadata = self._interceptor.pre_restrict_allowed_resources( request, metadata @@ -1424,9 +1414,7 @@ def __call__( """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseUpdateWorkload._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseUpdateWorkload._get_http_options() request, metadata = self._interceptor.pre_update_workload(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseUpdateWorkload._get_transcoded_request( @@ -1594,7 +1582,9 @@ def restrict_allowed_resources( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RestrictAllowedResources(self._session, self._host, self._interceptor) # type: ignore + return self._RestrictAllowedResources( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_workload( @@ -1662,9 +1652,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1803,9 +1791,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest_base.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest_base.py index c792c0b8d339..f461302e048a 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest_base.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.assuredworkloads_v1.types import assuredworkloads diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/types/assuredworkloads.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/types/assuredworkloads.py index 0da26a5bb1bb..714b2c3d8e1e 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/types/assuredworkloads.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/types/assuredworkloads.py @@ -342,6 +342,7 @@ class ComplianceRegime(proto.Enum): ASSURED_WORKLOADS_FOR_PARTNERS (12): Assured Workloads for Partners """ + COMPLIANCE_REGIME_UNSPECIFIED = 0 IL4 = 1 CJIS = 2 @@ -367,6 +368,7 @@ class KajEnrollmentState(proto.Enum): KAJ_ENROLLMENT_STATE_COMPLETE (2): Complete State for KAJ Enrollment. """ + KAJ_ENROLLMENT_STATE_UNSPECIFIED = 0 KAJ_ENROLLMENT_STATE_PENDING = 1 KAJ_ENROLLMENT_STATE_COMPLETE = 2 @@ -380,6 +382,7 @@ class Partner(proto.Enum): LOCAL_CONTROLS_BY_S3NS (1): S3NS regime/controls. """ + PARTNER_UNSPECIFIED = 0 LOCAL_CONTROLS_BY_S3NS = 1 @@ -412,6 +415,7 @@ class ResourceType(proto.Enum): KEYRING (3): Keyring resource that hosts encryption keys. """ + RESOURCE_TYPE_UNSPECIFIED = 0 CONSUMER_PROJECT = 1 CONSUMER_FOLDER = 4 @@ -519,6 +523,7 @@ class SetupState(proto.Enum): STATUS_COMPLETE (2): SAA enrollment comopleted. """ + SETUP_STATE_UNSPECIFIED = 0 STATUS_PENDING = 1 STATUS_COMPLETE = 2 @@ -543,6 +548,7 @@ class SetupError(proto.Enum): Returned when exception was encountered during evaluation of other criteria. """ + SETUP_ERROR_UNSPECIFIED = 0 ERROR_INVALID_BASE_SETUP = 1 ERROR_MISSING_EXTERNAL_SIGNING_KEY = 2 @@ -555,12 +561,12 @@ class SetupError(proto.Enum): optional=True, enum="Workload.SaaEnrollmentResponse.SetupState", ) - setup_errors: MutableSequence[ - "Workload.SaaEnrollmentResponse.SetupError" - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum="Workload.SaaEnrollmentResponse.SetupError", + setup_errors: MutableSequence["Workload.SaaEnrollmentResponse.SetupError"] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum="Workload.SaaEnrollmentResponse.SetupError", + ) ) name: str = proto.Field( @@ -708,6 +714,7 @@ class RestrictionType(proto.Enum): https://cloud.google.com/assured-workloads/docs/supported-products for the list of supported resources. """ + RESTRICTION_TYPE_UNSPECIFIED = 0 ALLOW_ALL_GCP_RESOURCES = 1 ALLOW_COMPLIANT_RESOURCES = 2 @@ -954,6 +961,7 @@ class State(proto.Enum): EXCEPTION (4): Violation is Exception """ + STATE_UNSPECIFIED = 0 RESOLVED = 2 UNRESOLVED = 3 @@ -999,6 +1007,7 @@ class RemediationType(proto.Enum): Remediation type for gcp.restrictCmekCryptoKeyProjects """ + REMEDIATION_TYPE_UNSPECIFIED = 0 REMEDIATION_BOOLEAN_ORG_POLICY_VIOLATION = 1 REMEDIATION_LIST_ALLOWED_VALUES_ORG_POLICY_VIOLATION = 2 diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/__init__.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/__init__.py index b0f718fbf11e..2ef0eff62acf 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/__init__.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.assured_workloads_service import ( AssuredWorkloadsServiceAsyncClient, AssuredWorkloadsServiceClient, diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/async_client.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/async_client.py index 601efc71b4e6..22ad7369fbaf 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/async_client.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.assuredworkloads_v1beta1 import gapic_version as package_version @@ -46,9 +46,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.assuredworkloads_v1beta1.services.assured_workloads_service import ( pagers, @@ -129,7 +129,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AssuredWorkloadsServiceAsyncClient: The constructed client. """ - return AssuredWorkloadsServiceClient.from_service_account_info.__func__(AssuredWorkloadsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AssuredWorkloadsServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AssuredWorkloadsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +148,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AssuredWorkloadsServiceAsyncClient: The constructed client. """ - return AssuredWorkloadsServiceClient.from_service_account_file.__func__(AssuredWorkloadsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AssuredWorkloadsServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + AssuredWorkloadsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -183,7 +191,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AssuredWorkloadsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AssuredWorkloadsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AssuredWorkloadsServiceTransport: diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/client.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/client.py index 6910a038aaeb..fdb7526b2c61 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/client.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.assuredworkloads_v1beta1 import gapic_version as package_version @@ -63,9 +63,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.assuredworkloads_v1beta1.services.assured_workloads_service import ( pagers, @@ -86,9 +86,7 @@ class AssuredWorkloadsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] _transport_registry["grpc"] = AssuredWorkloadsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AssuredWorkloadsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AssuredWorkloadsServiceRestTransport @@ -634,11 +632,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AssuredWorkloadsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AssuredWorkloadsServiceClient._read_environment_variables() + ) self._client_cert_source = ( AssuredWorkloadsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -675,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AssuredWorkloadsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/pagers.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/pagers.py index ae838924f0db..1f4bccc24ea2 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/pagers.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/__init__.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/__init__.py index 36a6ad6c6936..1376fc64c7b6 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/__init__.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] _transport_registry["grpc"] = AssuredWorkloadsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AssuredWorkloadsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AssuredWorkloadsServiceRestTransport diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/base.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/base.py index 29f5f1dd3806..8d35013de49f 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/base.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.assuredworkloads_v1beta1 import gapic_version as package_version from google.cloud.assuredworkloads_v1beta1.types import assuredworkloads diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc.py index a55861d5d9af..2311822e3408 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.assuredworkloads_v1beta1.types import assuredworkloads @@ -424,12 +424,12 @@ def restrict_allowed_resources( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restrict_allowed_resources" not in self._stubs: - self._stubs[ - "restrict_allowed_resources" - ] = self._logged_channel.unary_unary( - "/google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsService/RestrictAllowedResources", - request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, - response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + self._stubs["restrict_allowed_resources"] = ( + self._logged_channel.unary_unary( + "/google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsService/RestrictAllowedResources", + request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, + response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + ) ) return self._stubs["restrict_allowed_resources"] diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc_asyncio.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc_asyncio.py index f367ecdda579..2664cde99f1f 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.assuredworkloads_v1beta1.types import assuredworkloads @@ -436,12 +436,12 @@ def restrict_allowed_resources( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restrict_allowed_resources" not in self._stubs: - self._stubs[ - "restrict_allowed_resources" - ] = self._logged_channel.unary_unary( - "/google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsService/RestrictAllowedResources", - request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, - response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + self._stubs["restrict_allowed_resources"] = ( + self._logged_channel.unary_unary( + "/google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsService/RestrictAllowedResources", + request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, + response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + ) ) return self._stubs["restrict_allowed_resources"] diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest.py index ceeb81c57b44..abd6652ca99e 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.assuredworkloads_v1beta1.types import assuredworkloads @@ -503,9 +503,7 @@ def __call__( """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseCreateWorkload._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseCreateWorkload._get_http_options() request, metadata = self._interceptor.pre_create_workload(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseCreateWorkload._get_transcoded_request( @@ -649,9 +647,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseDeleteWorkload._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseDeleteWorkload._get_http_options() request, metadata = self._interceptor.pre_delete_workload(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseDeleteWorkload._get_transcoded_request( @@ -806,9 +802,7 @@ def __call__( """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseRestrictAllowedResources._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseRestrictAllowedResources._get_http_options() request, metadata = self._interceptor.pre_restrict_allowed_resources( request, metadata @@ -980,7 +974,9 @@ def restrict_allowed_resources( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RestrictAllowedResources(self._session, self._host, self._interceptor) # type: ignore + return self._RestrictAllowedResources( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_workload( @@ -1048,9 +1044,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1189,9 +1183,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest_base.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest_base.py index 5fd985230a4e..b9c305263ad8 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest_base.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.assuredworkloads_v1beta1.types import assuredworkloads diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/types/assuredworkloads.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/types/assuredworkloads.py index 1e14c8a2ed1e..62a23f7dc1b3 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/types/assuredworkloads.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/types/assuredworkloads.py @@ -133,6 +133,7 @@ class RestrictionType(proto.Enum): https://cloud.google.com/assured-workloads/docs/supported-products for the list of supported resources. """ + RESTRICTION_TYPE_UNSPECIFIED = 0 ALLOW_ALL_GCP_RESOURCES = 1 ALLOW_COMPLIANT_RESOURCES = 2 @@ -484,6 +485,7 @@ class ComplianceRegime(proto.Enum): Assured Workloads for Australia Regions and Support controls """ + COMPLIANCE_REGIME_UNSPECIFIED = 0 IL4 = 1 CJIS = 2 @@ -508,6 +510,7 @@ class KajEnrollmentState(proto.Enum): KAJ_ENROLLMENT_STATE_COMPLETE (2): Complete State for KAJ Enrollment. """ + KAJ_ENROLLMENT_STATE_UNSPECIFIED = 0 KAJ_ENROLLMENT_STATE_PENDING = 1 KAJ_ENROLLMENT_STATE_COMPLETE = 2 @@ -540,6 +543,7 @@ class ResourceType(proto.Enum): KEYRING (3): Keyring resource that hosts encryption keys. """ + RESOURCE_TYPE_UNSPECIFIED = 0 CONSUMER_PROJECT = 1 CONSUMER_FOLDER = 4 @@ -704,6 +708,7 @@ class SetupState(proto.Enum): STATUS_COMPLETE (2): SAA enrollment comopleted. """ + SETUP_STATE_UNSPECIFIED = 0 STATUS_PENDING = 1 STATUS_COMPLETE = 2 @@ -728,6 +733,7 @@ class SetupError(proto.Enum): Returned when exception was encountered during evaluation of other criteria. """ + SETUP_ERROR_UNSPECIFIED = 0 ERROR_INVALID_BASE_SETUP = 1 ERROR_MISSING_EXTERNAL_SIGNING_KEY = 2 @@ -740,12 +746,12 @@ class SetupError(proto.Enum): optional=True, enum="Workload.SaaEnrollmentResponse.SetupState", ) - setup_errors: MutableSequence[ - "Workload.SaaEnrollmentResponse.SetupError" - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum="Workload.SaaEnrollmentResponse.SetupError", + setup_errors: MutableSequence["Workload.SaaEnrollmentResponse.SetupError"] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum="Workload.SaaEnrollmentResponse.SetupError", + ) ) name: str = proto.Field( @@ -881,12 +887,12 @@ class CreateWorkloadOperationMetadata(proto.Message): number=4, enum="Workload.ComplianceRegime", ) - resource_settings: MutableSequence[ - "Workload.ResourceSettings" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="Workload.ResourceSettings", + resource_settings: MutableSequence["Workload.ResourceSettings"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="Workload.ResourceSettings", + ) ) diff --git a/packages/google-cloud-assured-workloads/mypy.ini b/packages/google-cloud-assured-workloads/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-assured-workloads/mypy.ini +++ b/packages/google-cloud-assured-workloads/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-assured-workloads/noxfile.py b/packages/google-cloud-assured-workloads/noxfile.py index 32632e5a5177..713c62cac859 100644 --- a/packages/google-cloud-assured-workloads/noxfile.py +++ b/packages/google-cloud-assured-workloads/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_service.py b/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_service.py index 53d1e67d279b..c2caf31d624a 100644 --- a/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_service.py +++ b/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 google.cloud.assuredworkloads_v1.services.assured_workloads_service import ( AssuredWorkloadsServiceAsyncClient, @@ -1011,10 +1011,9 @@ def test_assured_workloads_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1058,9 @@ def test_assured_workloads_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1096,9 @@ def test_assured_workloads_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1361,9 +1358,7 @@ def test_assured_workloads_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4405,9 +4400,9 @@ def test_acknowledge_violation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.acknowledge_violation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.acknowledge_violation] = ( + mock_rpc + ) request = {} client.acknowledge_violation(request) diff --git a/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py b/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py index 3905d59b6a15..5b24dbfafa1b 100644 --- a/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py +++ b/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 google.cloud.assuredworkloads_v1beta1.services.assured_workloads_service import ( AssuredWorkloadsServiceAsyncClient, @@ -1011,10 +1011,9 @@ def test_assured_workloads_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1058,9 @@ def test_assured_workloads_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1096,9 @@ def test_assured_workloads_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1361,9 +1358,7 @@ def test_assured_workloads_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3006,9 +3001,9 @@ def test_analyze_workload_move_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_workload_move - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_workload_move] = ( + mock_rpc + ) request = {} client.analyze_workload_move(request) diff --git a/packages/google-cloud-audit-log/google/cloud/audit/audit_log_pb2.py b/packages/google-cloud-audit-log/google/cloud/audit/audit_log_pb2.py index 34afbb24f6d0..e1e726d1c40a 100644 --- a/packages/google-cloud-audit-log/google/cloud/audit/audit_log_pb2.py +++ b/packages/google-cloud-audit-log/google/cloud/audit/audit_log_pb2.py @@ -18,6 +18,7 @@ # source: google/cloud/audit/audit_log.proto # Protobuf Python Version: 4.25.3 """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database diff --git a/packages/google-cloud-audit-log/google/cloud/audit/audit_log_pb2.pyi b/packages/google-cloud-audit-log/google/cloud/audit/audit_log_pb2.pyi index db41c838c6c9..88329d0276c8 100644 --- a/packages/google-cloud-audit-log/google/cloud/audit/audit_log_pb2.pyi +++ b/packages/google-cloud-audit-log/google/cloud/audit/audit_log_pb2.pyi @@ -142,7 +142,6 @@ class AuthorizationInfo(_message.Message): "resource_attributes", "permission_type", ) - class PermissionType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () PERMISSION_TYPE_UNSPECIFIED: _ClassVar[AuthorizationInfo.PermissionType] @@ -150,6 +149,7 @@ class AuthorizationInfo(_message.Message): ADMIN_WRITE: _ClassVar[AuthorizationInfo.PermissionType] DATA_READ: _ClassVar[AuthorizationInfo.PermissionType] DATA_WRITE: _ClassVar[AuthorizationInfo.PermissionType] + PERMISSION_TYPE_UNSPECIFIED: AuthorizationInfo.PermissionType ADMIN_READ: AuthorizationInfo.PermissionType ADMIN_WRITE: AuthorizationInfo.PermissionType @@ -221,7 +221,6 @@ class ResourceLocation(_message.Message): class ServiceAccountDelegationInfo(_message.Message): __slots__ = ("principal_subject", "first_party_principal", "third_party_principal") - class FirstPartyPrincipal(_message.Message): __slots__ = ("principal_email", "service_metadata") PRINCIPAL_EMAIL_FIELD_NUMBER: _ClassVar[int] @@ -242,6 +241,7 @@ class ServiceAccountDelegationInfo(_message.Message): self, third_party_claims: _Optional[_Union[_struct_pb2.Struct, _Mapping]] = ..., ) -> None: ... + PRINCIPAL_SUBJECT_FIELD_NUMBER: _ClassVar[int] FIRST_PARTY_PRINCIPAL_FIELD_NUMBER: _ClassVar[int] THIRD_PARTY_PRINCIPAL_FIELD_NUMBER: _ClassVar[int] @@ -272,7 +272,6 @@ class PolicyViolationInfo(_message.Message): class OrgPolicyViolationInfo(_message.Message): __slots__ = ("payload", "resource_type", "resource_tags", "violation_info") - class ResourceTagsEntry(_message.Message): __slots__ = ("key", "value") KEY_FIELD_NUMBER: _ClassVar[int] @@ -282,6 +281,7 @@ class OrgPolicyViolationInfo(_message.Message): def __init__( self, key: _Optional[str] = ..., value: _Optional[str] = ... ) -> None: ... + PAYLOAD_FIELD_NUMBER: _ClassVar[int] RESOURCE_TYPE_FIELD_NUMBER: _ClassVar[int] RESOURCE_TAGS_FIELD_NUMBER: _ClassVar[int] @@ -300,13 +300,13 @@ class OrgPolicyViolationInfo(_message.Message): class ViolationInfo(_message.Message): __slots__ = ("constraint", "error_message", "checked_value", "policy_type") - class PolicyType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () POLICY_TYPE_UNSPECIFIED: _ClassVar[ViolationInfo.PolicyType] BOOLEAN_CONSTRAINT: _ClassVar[ViolationInfo.PolicyType] LIST_CONSTRAINT: _ClassVar[ViolationInfo.PolicyType] CUSTOM_CONSTRAINT: _ClassVar[ViolationInfo.PolicyType] + POLICY_TYPE_UNSPECIFIED: ViolationInfo.PolicyType BOOLEAN_CONSTRAINT: ViolationInfo.PolicyType LIST_CONSTRAINT: ViolationInfo.PolicyType diff --git a/packages/google-cloud-audit-log/google/cloud/audit/bigquery_audit_metadata_pb2.py b/packages/google-cloud-audit-log/google/cloud/audit/bigquery_audit_metadata_pb2.py index 04d151302d85..789b26636006 100644 --- a/packages/google-cloud-audit-log/google/cloud/audit/bigquery_audit_metadata_pb2.py +++ b/packages/google-cloud-audit-log/google/cloud/audit/bigquery_audit_metadata_pb2.py @@ -18,6 +18,7 @@ # source: google/cloud/audit/bigquery_audit_metadata.proto # Protobuf Python Version: 4.25.3 """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database diff --git a/packages/google-cloud-audit-log/google/cloud/audit/bigquery_audit_metadata_pb2.pyi b/packages/google-cloud-audit-log/google/cloud/audit/bigquery_audit_metadata_pb2.pyi index 07d4619d11cf..eceacf0f47a7 100644 --- a/packages/google-cloud-audit-log/google/cloud/audit/bigquery_audit_metadata_pb2.pyi +++ b/packages/google-cloud-audit-log/google/cloud/audit/bigquery_audit_metadata_pb2.pyi @@ -56,7 +56,6 @@ class BigQueryAuditMetadata(_message.Message): "unlink_dataset", "first_party_app_metadata", ) - class CreateDisposition(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () CREATE_DISPOSITION_UNSPECIFIED: _ClassVar[ @@ -64,43 +63,43 @@ class BigQueryAuditMetadata(_message.Message): ] CREATE_NEVER: _ClassVar[BigQueryAuditMetadata.CreateDisposition] CREATE_IF_NEEDED: _ClassVar[BigQueryAuditMetadata.CreateDisposition] + CREATE_DISPOSITION_UNSPECIFIED: BigQueryAuditMetadata.CreateDisposition CREATE_NEVER: BigQueryAuditMetadata.CreateDisposition CREATE_IF_NEEDED: BigQueryAuditMetadata.CreateDisposition - class WriteDisposition(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () WRITE_DISPOSITION_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.WriteDisposition] WRITE_EMPTY: _ClassVar[BigQueryAuditMetadata.WriteDisposition] WRITE_TRUNCATE: _ClassVar[BigQueryAuditMetadata.WriteDisposition] WRITE_APPEND: _ClassVar[BigQueryAuditMetadata.WriteDisposition] + WRITE_DISPOSITION_UNSPECIFIED: BigQueryAuditMetadata.WriteDisposition WRITE_EMPTY: BigQueryAuditMetadata.WriteDisposition WRITE_TRUNCATE: BigQueryAuditMetadata.WriteDisposition WRITE_APPEND: BigQueryAuditMetadata.WriteDisposition - class OperationType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () OPERATION_TYPE_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.OperationType] COPY: _ClassVar[BigQueryAuditMetadata.OperationType] SNAPSHOT: _ClassVar[BigQueryAuditMetadata.OperationType] RESTORE: _ClassVar[BigQueryAuditMetadata.OperationType] + OPERATION_TYPE_UNSPECIFIED: BigQueryAuditMetadata.OperationType COPY: BigQueryAuditMetadata.OperationType SNAPSHOT: BigQueryAuditMetadata.OperationType RESTORE: BigQueryAuditMetadata.OperationType - class JobState(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () JOB_STATE_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.JobState] PENDING: _ClassVar[BigQueryAuditMetadata.JobState] RUNNING: _ClassVar[BigQueryAuditMetadata.JobState] DONE: _ClassVar[BigQueryAuditMetadata.JobState] + JOB_STATE_UNSPECIFIED: BigQueryAuditMetadata.JobState PENDING: BigQueryAuditMetadata.JobState RUNNING: BigQueryAuditMetadata.JobState DONE: BigQueryAuditMetadata.JobState - class QueryStatementType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () QUERY_STATEMENT_TYPE_UNSPECIFIED: _ClassVar[ @@ -142,6 +141,7 @@ class BigQueryAuditMetadata(_message.Message): CREATE_EXTERNAL_TABLE: _ClassVar[BigQueryAuditMetadata.QueryStatementType] EXPORT_DATA: _ClassVar[BigQueryAuditMetadata.QueryStatementType] CALL: _ClassVar[BigQueryAuditMetadata.QueryStatementType] + QUERY_STATEMENT_TYPE_UNSPECIFIED: BigQueryAuditMetadata.QueryStatementType SELECT: BigQueryAuditMetadata.QueryStatementType ASSERT: BigQueryAuditMetadata.QueryStatementType @@ -179,15 +179,14 @@ class BigQueryAuditMetadata(_message.Message): CREATE_EXTERNAL_TABLE: BigQueryAuditMetadata.QueryStatementType EXPORT_DATA: BigQueryAuditMetadata.QueryStatementType CALL: BigQueryAuditMetadata.QueryStatementType - class JobInsertion(_message.Message): __slots__ = ("job", "reason") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.JobInsertion.Reason] JOB_INSERT_REQUEST: _ClassVar[BigQueryAuditMetadata.JobInsertion.Reason] QUERY_REQUEST: _ClassVar[BigQueryAuditMetadata.JobInsertion.Reason] + REASON_UNSPECIFIED: BigQueryAuditMetadata.JobInsertion.Reason JOB_INSERT_REQUEST: BigQueryAuditMetadata.JobInsertion.Reason QUERY_REQUEST: BigQueryAuditMetadata.JobInsertion.Reason @@ -220,11 +219,11 @@ class BigQueryAuditMetadata(_message.Message): class JobDeletion(_message.Message): __slots__ = ("job_name", "reason") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.JobDeletion.Reason] JOB_DELETE_REQUEST: _ClassVar[BigQueryAuditMetadata.JobDeletion.Reason] + REASON_UNSPECIFIED: BigQueryAuditMetadata.JobDeletion.Reason JOB_DELETE_REQUEST: BigQueryAuditMetadata.JobDeletion.Reason JOB_NAME_FIELD_NUMBER: _ClassVar[int] @@ -241,12 +240,12 @@ class BigQueryAuditMetadata(_message.Message): class DatasetCreation(_message.Message): __slots__ = ("dataset", "reason", "job_name") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.DatasetCreation.Reason] CREATE: _ClassVar[BigQueryAuditMetadata.DatasetCreation.Reason] QUERY: _ClassVar[BigQueryAuditMetadata.DatasetCreation.Reason] + REASON_UNSPECIFIED: BigQueryAuditMetadata.DatasetCreation.Reason CREATE: BigQueryAuditMetadata.DatasetCreation.Reason QUERY: BigQueryAuditMetadata.DatasetCreation.Reason @@ -267,13 +266,13 @@ class BigQueryAuditMetadata(_message.Message): class DatasetChange(_message.Message): __slots__ = ("dataset", "reason", "job_name") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.DatasetChange.Reason] UPDATE: _ClassVar[BigQueryAuditMetadata.DatasetChange.Reason] SET_IAM_POLICY: _ClassVar[BigQueryAuditMetadata.DatasetChange.Reason] QUERY: _ClassVar[BigQueryAuditMetadata.DatasetChange.Reason] + REASON_UNSPECIFIED: BigQueryAuditMetadata.DatasetChange.Reason UPDATE: BigQueryAuditMetadata.DatasetChange.Reason SET_IAM_POLICY: BigQueryAuditMetadata.DatasetChange.Reason @@ -295,12 +294,12 @@ class BigQueryAuditMetadata(_message.Message): class DatasetDeletion(_message.Message): __slots__ = ("reason", "job_name") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.DatasetDeletion.Reason] DELETE: _ClassVar[BigQueryAuditMetadata.DatasetDeletion.Reason] QUERY: _ClassVar[BigQueryAuditMetadata.DatasetDeletion.Reason] + REASON_UNSPECIFIED: BigQueryAuditMetadata.DatasetDeletion.Reason DELETE: BigQueryAuditMetadata.DatasetDeletion.Reason QUERY: BigQueryAuditMetadata.DatasetDeletion.Reason @@ -318,13 +317,13 @@ class BigQueryAuditMetadata(_message.Message): class TableCreation(_message.Message): __slots__ = ("table", "reason", "job_name") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.TableCreation.Reason] JOB: _ClassVar[BigQueryAuditMetadata.TableCreation.Reason] QUERY: _ClassVar[BigQueryAuditMetadata.TableCreation.Reason] TABLE_INSERT_REQUEST: _ClassVar[BigQueryAuditMetadata.TableCreation.Reason] + REASON_UNSPECIFIED: BigQueryAuditMetadata.TableCreation.Reason JOB: BigQueryAuditMetadata.TableCreation.Reason QUERY: BigQueryAuditMetadata.TableCreation.Reason @@ -346,11 +345,11 @@ class BigQueryAuditMetadata(_message.Message): class ModelCreation(_message.Message): __slots__ = ("model", "reason", "job_name") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.ModelCreation.Reason] QUERY: _ClassVar[BigQueryAuditMetadata.ModelCreation.Reason] + REASON_UNSPECIFIED: BigQueryAuditMetadata.ModelCreation.Reason QUERY: BigQueryAuditMetadata.ModelCreation.Reason MODEL_FIELD_NUMBER: _ClassVar[int] @@ -370,7 +369,6 @@ class BigQueryAuditMetadata(_message.Message): class RoutineCreation(_message.Message): __slots__ = ("routine", "reason", "job_name") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.RoutineCreation.Reason] @@ -378,6 +376,7 @@ class BigQueryAuditMetadata(_message.Message): ROUTINE_INSERT_REQUEST: _ClassVar[ BigQueryAuditMetadata.RoutineCreation.Reason ] + REASON_UNSPECIFIED: BigQueryAuditMetadata.RoutineCreation.Reason QUERY: BigQueryAuditMetadata.RoutineCreation.Reason ROUTINE_INSERT_REQUEST: BigQueryAuditMetadata.RoutineCreation.Reason @@ -406,7 +405,6 @@ class BigQueryAuditMetadata(_message.Message): "job_name", "session_name", ) - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.TableDataRead.Reason] @@ -422,6 +420,7 @@ class BigQueryAuditMetadata(_message.Message): MATERIALIZED_VIEW_REFRESH: _ClassVar[ BigQueryAuditMetadata.TableDataRead.Reason ] + REASON_UNSPECIFIED: BigQueryAuditMetadata.TableDataRead.Reason JOB: BigQueryAuditMetadata.TableDataRead.Reason TABLEDATA_LIST_REQUEST: BigQueryAuditMetadata.TableDataRead.Reason @@ -458,13 +457,13 @@ class BigQueryAuditMetadata(_message.Message): class TableChange(_message.Message): __slots__ = ("table", "truncated", "reason", "job_name") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.TableChange.Reason] TABLE_UPDATE_REQUEST: _ClassVar[BigQueryAuditMetadata.TableChange.Reason] JOB: _ClassVar[BigQueryAuditMetadata.TableChange.Reason] QUERY: _ClassVar[BigQueryAuditMetadata.TableChange.Reason] + REASON_UNSPECIFIED: BigQueryAuditMetadata.TableChange.Reason TABLE_UPDATE_REQUEST: BigQueryAuditMetadata.TableChange.Reason JOB: BigQueryAuditMetadata.TableChange.Reason @@ -489,7 +488,6 @@ class BigQueryAuditMetadata(_message.Message): class ModelMetadataChange(_message.Message): __slots__ = ("model", "reason", "job_name") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[ @@ -499,6 +497,7 @@ class BigQueryAuditMetadata(_message.Message): BigQueryAuditMetadata.ModelMetadataChange.Reason ] QUERY: _ClassVar[BigQueryAuditMetadata.ModelMetadataChange.Reason] + REASON_UNSPECIFIED: BigQueryAuditMetadata.ModelMetadataChange.Reason MODEL_PATCH_REQUEST: BigQueryAuditMetadata.ModelMetadataChange.Reason QUERY: BigQueryAuditMetadata.ModelMetadataChange.Reason @@ -519,7 +518,6 @@ class BigQueryAuditMetadata(_message.Message): class RoutineChange(_message.Message): __slots__ = ("routine", "reason", "job_name") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.RoutineChange.Reason] @@ -527,6 +525,7 @@ class BigQueryAuditMetadata(_message.Message): ROUTINE_UPDATE_REQUEST: _ClassVar[ BigQueryAuditMetadata.RoutineChange.Reason ] + REASON_UNSPECIFIED: BigQueryAuditMetadata.RoutineChange.Reason QUERY: BigQueryAuditMetadata.RoutineChange.Reason ROUTINE_UPDATE_REQUEST: BigQueryAuditMetadata.RoutineChange.Reason @@ -554,7 +553,6 @@ class BigQueryAuditMetadata(_message.Message): "job_name", "stream_name", ) - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.TableDataChange.Reason] @@ -564,6 +562,7 @@ class BigQueryAuditMetadata(_message.Message): BigQueryAuditMetadata.TableDataChange.Reason ] WRITE_API: _ClassVar[BigQueryAuditMetadata.TableDataChange.Reason] + REASON_UNSPECIFIED: BigQueryAuditMetadata.TableDataChange.Reason JOB: BigQueryAuditMetadata.TableDataChange.Reason QUERY: BigQueryAuditMetadata.TableDataChange.Reason @@ -595,11 +594,11 @@ class BigQueryAuditMetadata(_message.Message): class ModelDataChange(_message.Message): __slots__ = ("reason", "job_name") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.ModelDataChange.Reason] QUERY: _ClassVar[BigQueryAuditMetadata.ModelDataChange.Reason] + REASON_UNSPECIFIED: BigQueryAuditMetadata.ModelDataChange.Reason QUERY: BigQueryAuditMetadata.ModelDataChange.Reason REASON_FIELD_NUMBER: _ClassVar[int] @@ -616,11 +615,11 @@ class BigQueryAuditMetadata(_message.Message): class ModelDataRead(_message.Message): __slots__ = ("reason", "job_name") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.ModelDataRead.Reason] JOB: _ClassVar[BigQueryAuditMetadata.ModelDataRead.Reason] + REASON_UNSPECIFIED: BigQueryAuditMetadata.ModelDataRead.Reason JOB: BigQueryAuditMetadata.ModelDataRead.Reason REASON_FIELD_NUMBER: _ClassVar[int] @@ -637,13 +636,13 @@ class BigQueryAuditMetadata(_message.Message): class TableDeletion(_message.Message): __slots__ = ("reason", "job_name") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.TableDeletion.Reason] TABLE_DELETE_REQUEST: _ClassVar[BigQueryAuditMetadata.TableDeletion.Reason] EXPIRED: _ClassVar[BigQueryAuditMetadata.TableDeletion.Reason] QUERY: _ClassVar[BigQueryAuditMetadata.TableDeletion.Reason] + REASON_UNSPECIFIED: BigQueryAuditMetadata.TableDeletion.Reason TABLE_DELETE_REQUEST: BigQueryAuditMetadata.TableDeletion.Reason EXPIRED: BigQueryAuditMetadata.TableDeletion.Reason @@ -662,13 +661,13 @@ class BigQueryAuditMetadata(_message.Message): class ModelDeletion(_message.Message): __slots__ = ("reason", "job_name") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.ModelDeletion.Reason] MODEL_DELETE_REQUEST: _ClassVar[BigQueryAuditMetadata.ModelDeletion.Reason] EXPIRED: _ClassVar[BigQueryAuditMetadata.ModelDeletion.Reason] QUERY: _ClassVar[BigQueryAuditMetadata.ModelDeletion.Reason] + REASON_UNSPECIFIED: BigQueryAuditMetadata.ModelDeletion.Reason MODEL_DELETE_REQUEST: BigQueryAuditMetadata.ModelDeletion.Reason EXPIRED: BigQueryAuditMetadata.ModelDeletion.Reason @@ -687,7 +686,6 @@ class BigQueryAuditMetadata(_message.Message): class RoutineDeletion(_message.Message): __slots__ = ("routine", "reason", "job_name") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.RoutineDeletion.Reason] @@ -695,6 +693,7 @@ class BigQueryAuditMetadata(_message.Message): ROUTINE_DELETE_REQUEST: _ClassVar[ BigQueryAuditMetadata.RoutineDeletion.Reason ] + REASON_UNSPECIFIED: BigQueryAuditMetadata.RoutineDeletion.Reason QUERY: BigQueryAuditMetadata.RoutineDeletion.Reason ROUTINE_DELETE_REQUEST: BigQueryAuditMetadata.RoutineDeletion.Reason @@ -766,11 +765,11 @@ class BigQueryAuditMetadata(_message.Message): class UnlinkDataset(_message.Message): __slots__ = ("linked_dataset", "source_dataset", "reason") - class Reason(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () REASON_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.UnlinkDataset.Reason] UNLINK_API: _ClassVar[BigQueryAuditMetadata.UnlinkDataset.Reason] + REASON_UNSPECIFIED: BigQueryAuditMetadata.UnlinkDataset.Reason UNLINK_API: BigQueryAuditMetadata.UnlinkDataset.Reason LINKED_DATASET_FIELD_NUMBER: _ClassVar[int] @@ -821,7 +820,6 @@ class BigQueryAuditMetadata(_message.Message): "table_copy_config", "labels", ) - class Type(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () TYPE_UNSPECIFIED: _ClassVar[BigQueryAuditMetadata.JobConfig.Type] @@ -829,12 +827,12 @@ class BigQueryAuditMetadata(_message.Message): COPY: _ClassVar[BigQueryAuditMetadata.JobConfig.Type] EXPORT: _ClassVar[BigQueryAuditMetadata.JobConfig.Type] IMPORT: _ClassVar[BigQueryAuditMetadata.JobConfig.Type] + TYPE_UNSPECIFIED: BigQueryAuditMetadata.JobConfig.Type QUERY: BigQueryAuditMetadata.JobConfig.Type COPY: BigQueryAuditMetadata.JobConfig.Type EXPORT: BigQueryAuditMetadata.JobConfig.Type IMPORT: BigQueryAuditMetadata.JobConfig.Type - class Query(_message.Message): __slots__ = ( "query", @@ -848,7 +846,6 @@ class BigQueryAuditMetadata(_message.Message): "destination_table_encryption", "statement_type", ) - class Priority(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () PRIORITY_UNSPECIFIED: _ClassVar[ @@ -858,6 +855,7 @@ class BigQueryAuditMetadata(_message.Message): BigQueryAuditMetadata.JobConfig.Query.Priority ] QUERY_BATCH: _ClassVar[BigQueryAuditMetadata.JobConfig.Query.Priority] + PRIORITY_UNSPECIFIED: BigQueryAuditMetadata.JobConfig.Query.Priority QUERY_INTERACTIVE: BigQueryAuditMetadata.JobConfig.Query.Priority QUERY_BATCH: BigQueryAuditMetadata.JobConfig.Query.Priority @@ -1035,6 +1033,7 @@ class BigQueryAuditMetadata(_message.Message): def __init__( self, key: _Optional[str] = ..., value: _Optional[str] = ... ) -> None: ... + TYPE_FIELD_NUMBER: _ClassVar[int] QUERY_CONFIG_FIELD_NUMBER: _ClassVar[int] LOAD_CONFIG_FIELD_NUMBER: _ClassVar[int] @@ -1105,7 +1104,6 @@ class BigQueryAuditMetadata(_message.Message): "reservation", "parent_job_name", ) - class Query(_message.Message): __slots__ = ( "total_processed_bytes", @@ -1166,6 +1164,7 @@ class BigQueryAuditMetadata(_message.Message): def __init__( self, name: _Optional[str] = ..., slot_ms: _Optional[int] = ... ) -> None: ... + CREATE_TIME_FIELD_NUMBER: _ClassVar[int] START_TIME_FIELD_NUMBER: _ClassVar[int] END_TIME_FIELD_NUMBER: _ClassVar[int] @@ -1320,7 +1319,6 @@ class BigQueryAuditMetadata(_message.Message): class EntityInfo(_message.Message): __slots__ = ("friendly_name", "description", "labels") - class LabelsEntry(_message.Message): __slots__ = ("key", "value") KEY_FIELD_NUMBER: _ClassVar[int] @@ -1330,6 +1328,7 @@ class BigQueryAuditMetadata(_message.Message): def __init__( self, key: _Optional[str] = ..., value: _Optional[str] = ... ) -> None: ... + FRIENDLY_NAME_FIELD_NUMBER: _ClassVar[int] DESCRIPTION_FIELD_NUMBER: _ClassVar[int] LABELS_FIELD_NUMBER: _ClassVar[int] @@ -1438,6 +1437,7 @@ class BigQueryAuditMetadata(_message.Message): DOC_ID_FIELD_NUMBER: _ClassVar[int] doc_id: str def __init__(self, doc_id: _Optional[str] = ...) -> None: ... + JOB_INSERTION_FIELD_NUMBER: _ClassVar[int] JOB_CHANGE_FIELD_NUMBER: _ClassVar[int] JOB_DELETION_FIELD_NUMBER: _ClassVar[int] diff --git a/packages/google-cloud-audit-log/noxfile.py b/packages/google-cloud-audit-log/noxfile.py index 9f03d459551c..fb626e845cd3 100644 --- a/packages/google-cloud-audit-log/noxfile.py +++ b/packages/google-cloud-audit-log/noxfile.py @@ -142,6 +142,15 @@ def format(session): ) +@nox.session(python=DEFAULT_PYTHON_VERSION) +def mypy(session): + """Run the type checker.""" + + # TODO(https://github.com/googleapis/google-cloud-python/issues/13362): + # Enable mypy once this bug is fixed. + session.skip("Skip mypy since this library doesn't have py.typed") + + @nox.session(python=DEFAULT_PYTHON_VERSION) def lint_setup_py(session): """Verify that setup.py is valid (including RST check).""" diff --git a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/__init__.py b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/__init__.py index db5145630490..bf3a2054199d 100644 --- a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/__init__.py +++ b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.audit_manager import AuditManagerAsyncClient, AuditManagerClient from .types.auditmanager import ( AuditReport, diff --git a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/async_client.py b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/async_client.py index ea8808e2c5a7..e5ac0c3f65fe 100644 --- a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/async_client.py +++ b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.auditmanager_v1 import gapic_version as package_version @@ -46,9 +46,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.auditmanager_v1.services.audit_manager import pagers from google.cloud.auditmanager_v1.types import auditmanager @@ -135,7 +135,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AuditManagerAsyncClient: The constructed client. """ - return AuditManagerClient.from_service_account_info.__func__(AuditManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AuditManagerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AuditManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -151,7 +154,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AuditManagerAsyncClient: The constructed client. """ - return AuditManagerClient.from_service_account_file.__func__(AuditManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AuditManagerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AuditManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/client.py b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/client.py index 2225a9845c1e..5f26f5173c7f 100644 --- a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/client.py +++ b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.auditmanager_v1 import gapic_version as package_version @@ -63,9 +63,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.auditmanager_v1.services.audit_manager import pagers from google.cloud.auditmanager_v1.types import auditmanager @@ -731,11 +731,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AuditManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AuditManagerClient._read_environment_variables() + ) self._client_cert_source = AuditManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -770,8 +768,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AuditManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/pagers.py b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/pagers.py index e1202a1b75c8..9eeb4908b293 100644 --- a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/pagers.py +++ b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -459,7 +459,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/base.py b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/base.py index f5477f5069ec..214c9caab529 100644 --- a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/base.py +++ b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.auditmanager_v1 import gapic_version as package_version from google.cloud.auditmanager_v1.types import auditmanager @@ -377,13 +377,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/grpc.py b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/grpc.py index 8ff2484653cc..e7f281f74d8b 100644 --- a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/grpc.py +++ b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.auditmanager_v1.types import auditmanager @@ -397,12 +397,12 @@ def generate_audit_scope_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_audit_scope_report" not in self._stubs: - self._stubs[ - "generate_audit_scope_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.auditmanager.v1.AuditManager/GenerateAuditScopeReport", - request_serializer=auditmanager.GenerateAuditScopeReportRequest.serialize, - response_deserializer=auditmanager.AuditScopeReport.deserialize, + self._stubs["generate_audit_scope_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.auditmanager.v1.AuditManager/GenerateAuditScopeReport", + request_serializer=auditmanager.GenerateAuditScopeReportRequest.serialize, + response_deserializer=auditmanager.AuditScopeReport.deserialize, + ) ) return self._stubs["generate_audit_scope_report"] @@ -510,12 +510,12 @@ def get_resource_enrollment_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_resource_enrollment_status" not in self._stubs: - self._stubs[ - "get_resource_enrollment_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.auditmanager.v1.AuditManager/GetResourceEnrollmentStatus", - request_serializer=auditmanager.GetResourceEnrollmentStatusRequest.serialize, - response_deserializer=auditmanager.ResourceEnrollmentStatus.deserialize, + self._stubs["get_resource_enrollment_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.auditmanager.v1.AuditManager/GetResourceEnrollmentStatus", + request_serializer=auditmanager.GetResourceEnrollmentStatusRequest.serialize, + response_deserializer=auditmanager.ResourceEnrollmentStatus.deserialize, + ) ) return self._stubs["get_resource_enrollment_status"] @@ -543,12 +543,12 @@ def list_resource_enrollment_statuses( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_resource_enrollment_statuses" not in self._stubs: - self._stubs[ - "list_resource_enrollment_statuses" - ] = self._logged_channel.unary_unary( - "/google.cloud.auditmanager.v1.AuditManager/ListResourceEnrollmentStatuses", - request_serializer=auditmanager.ListResourceEnrollmentStatusesRequest.serialize, - response_deserializer=auditmanager.ListResourceEnrollmentStatusesResponse.deserialize, + self._stubs["list_resource_enrollment_statuses"] = ( + self._logged_channel.unary_unary( + "/google.cloud.auditmanager.v1.AuditManager/ListResourceEnrollmentStatuses", + request_serializer=auditmanager.ListResourceEnrollmentStatusesRequest.serialize, + response_deserializer=auditmanager.ListResourceEnrollmentStatusesResponse.deserialize, + ) ) return self._stubs["list_resource_enrollment_statuses"] diff --git a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/grpc_asyncio.py b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/grpc_asyncio.py index b07f06f128c5..ef4d79603dda 100644 --- a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.auditmanager_v1.types import auditmanager @@ -408,12 +408,12 @@ def generate_audit_scope_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_audit_scope_report" not in self._stubs: - self._stubs[ - "generate_audit_scope_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.auditmanager.v1.AuditManager/GenerateAuditScopeReport", - request_serializer=auditmanager.GenerateAuditScopeReportRequest.serialize, - response_deserializer=auditmanager.AuditScopeReport.deserialize, + self._stubs["generate_audit_scope_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.auditmanager.v1.AuditManager/GenerateAuditScopeReport", + request_serializer=auditmanager.GenerateAuditScopeReportRequest.serialize, + response_deserializer=auditmanager.AuditScopeReport.deserialize, + ) ) return self._stubs["generate_audit_scope_report"] @@ -526,12 +526,12 @@ def get_resource_enrollment_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_resource_enrollment_status" not in self._stubs: - self._stubs[ - "get_resource_enrollment_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.auditmanager.v1.AuditManager/GetResourceEnrollmentStatus", - request_serializer=auditmanager.GetResourceEnrollmentStatusRequest.serialize, - response_deserializer=auditmanager.ResourceEnrollmentStatus.deserialize, + self._stubs["get_resource_enrollment_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.auditmanager.v1.AuditManager/GetResourceEnrollmentStatus", + request_serializer=auditmanager.GetResourceEnrollmentStatusRequest.serialize, + response_deserializer=auditmanager.ResourceEnrollmentStatus.deserialize, + ) ) return self._stubs["get_resource_enrollment_status"] @@ -559,12 +559,12 @@ def list_resource_enrollment_statuses( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_resource_enrollment_statuses" not in self._stubs: - self._stubs[ - "list_resource_enrollment_statuses" - ] = self._logged_channel.unary_unary( - "/google.cloud.auditmanager.v1.AuditManager/ListResourceEnrollmentStatuses", - request_serializer=auditmanager.ListResourceEnrollmentStatusesRequest.serialize, - response_deserializer=auditmanager.ListResourceEnrollmentStatusesResponse.deserialize, + self._stubs["list_resource_enrollment_statuses"] = ( + self._logged_channel.unary_unary( + "/google.cloud.auditmanager.v1.AuditManager/ListResourceEnrollmentStatuses", + request_serializer=auditmanager.ListResourceEnrollmentStatusesRequest.serialize, + response_deserializer=auditmanager.ListResourceEnrollmentStatusesResponse.deserialize, + ) ) return self._stubs["list_resource_enrollment_statuses"] diff --git a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/rest.py b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/rest.py index cbc4f2cbd3f4..a1b39574358c 100644 --- a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/rest.py +++ b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/services/audit_manager/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1056,9 +1056,7 @@ def __call__( """ - http_options = ( - _BaseAuditManagerRestTransport._BaseGenerateAuditReport._get_http_options() - ) + http_options = _BaseAuditManagerRestTransport._BaseGenerateAuditReport._get_http_options() request, metadata = self._interceptor.pre_generate_audit_report( request, metadata @@ -1209,9 +1207,7 @@ def __call__( The audit scope report. """ - http_options = ( - _BaseAuditManagerRestTransport._BaseGenerateAuditScopeReport._get_http_options() - ) + http_options = _BaseAuditManagerRestTransport._BaseGenerateAuditScopeReport._get_http_options() request, metadata = self._interceptor.pre_generate_audit_scope_report( request, metadata @@ -1514,9 +1510,7 @@ def __call__( """ - http_options = ( - _BaseAuditManagerRestTransport._BaseGetResourceEnrollmentStatus._get_http_options() - ) + http_options = _BaseAuditManagerRestTransport._BaseGetResourceEnrollmentStatus._get_http_options() request, metadata = self._interceptor.pre_get_resource_enrollment_status( request, metadata @@ -1582,11 +1576,10 @@ def __call__( resp = self._interceptor.post_get_resource_enrollment_status(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_resource_enrollment_status_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_resource_enrollment_status_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1975,9 +1968,7 @@ def __call__( """ - http_options = ( - _BaseAuditManagerRestTransport._BaseListResourceEnrollmentStatuses._get_http_options() - ) + http_options = _BaseAuditManagerRestTransport._BaseListResourceEnrollmentStatuses._get_http_options() request, metadata = self._interceptor.pre_list_resource_enrollment_statuses( request, metadata @@ -2043,11 +2034,10 @@ def __call__( resp = self._interceptor.post_list_resource_enrollment_statuses(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_resource_enrollment_statuses_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_resource_enrollment_statuses_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2100,7 +2090,9 @@ def generate_audit_scope_report( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateAuditScopeReport(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateAuditScopeReport( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_audit_report( @@ -2119,7 +2111,9 @@ def get_resource_enrollment_status( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetResourceEnrollmentStatus(self._session, self._host, self._interceptor) # type: ignore + return self._GetResourceEnrollmentStatus( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_audit_reports( @@ -2150,7 +2144,9 @@ def list_resource_enrollment_statuses( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListResourceEnrollmentStatuses(self._session, self._host, self._interceptor) # type: ignore + return self._ListResourceEnrollmentStatuses( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/types/auditmanager.py b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/types/auditmanager.py index 54a2efa36d07..fbf2a7cd265a 100644 --- a/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/types/auditmanager.py +++ b/packages/google-cloud-auditmanager/google/cloud/auditmanager_v1/types/auditmanager.py @@ -81,6 +81,7 @@ class OperationState(proto.Enum): OPERATION_STATE_FAILED (60): Audit report generation process has failed. """ + OPERATION_STATE_UNSPECIFIED = 0 OPERATION_STATE_NOT_STARTED = 10 OPERATION_STATE_EVALUATION_IN_PROGRESS = 20 @@ -109,6 +110,7 @@ class ComplianceState(proto.Enum): AUDIT_NOT_SUPPORTED (5): Cannot be audited """ + COMPLIANCE_STATE_UNSPECIFIED = 0 COMPLIANT = 1 VIOLATION = 2 @@ -204,6 +206,7 @@ class AuditScopeReportFormat(proto.Enum): Audit Scope Report creation format is Open Document. """ + AUDIT_SCOPE_REPORT_FORMAT_UNSPECIFIED = 0 AUDIT_SCOPE_REPORT_FORMAT_ODF = 1 @@ -265,6 +268,7 @@ class AuditReportFormat(proto.Enum): Audit Report creation format is Open Document. """ + AUDIT_REPORT_FORMAT_UNSPECIFIED = 0 AUDIT_REPORT_FORMAT_ODF = 1 @@ -355,12 +359,12 @@ class ListResourceEnrollmentStatusesResponse(proto.Message): def raw_page(self): return self - resource_enrollment_statuses: MutableSequence[ - "ResourceEnrollmentStatus" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ResourceEnrollmentStatus", + resource_enrollment_statuses: MutableSequence["ResourceEnrollmentStatus"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ResourceEnrollmentStatus", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -714,6 +718,7 @@ class ResourceEnrollmentState(proto.Enum): ENROLLED (3): Enrolled. """ + RESOURCE_ENROLLMENT_STATE_UNSPECIFIED = 0 NOT_ENROLLED = 1 INHERITED = 2 @@ -800,6 +805,7 @@ class ReportGenerationState(proto.Enum): completed. But report summary is unknown. This is valid for older reports. """ + REPORT_GENERATION_STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 COMPLETED = 2 @@ -959,6 +965,7 @@ class Family(proto.Enum): SR (18): Supply Chain Risk Management """ + FAMILY_UNSPECIFIED = 0 AC = 1 AT = 2 diff --git a/packages/google-cloud-auditmanager/mypy.ini b/packages/google-cloud-auditmanager/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-auditmanager/mypy.ini +++ b/packages/google-cloud-auditmanager/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-auditmanager/noxfile.py b/packages/google-cloud-auditmanager/noxfile.py index 314494edaca1..ab70dcf2aa1c 100644 --- a/packages/google-cloud-auditmanager/noxfile.py +++ b/packages/google-cloud-auditmanager/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-auditmanager/tests/unit/gapic/auditmanager_v1/test_audit_manager.py b/packages/google-cloud-auditmanager/tests/unit/gapic/auditmanager_v1/test_audit_manager.py index 022d089772cd..3989a99eba5e 100644 --- a/packages/google-cloud-auditmanager/tests/unit/gapic/auditmanager_v1/test_audit_manager.py +++ b/packages/google-cloud-auditmanager/tests/unit/gapic/auditmanager_v1/test_audit_manager.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.auditmanager_v1.services.audit_manager import ( AuditManagerAsyncClient, @@ -938,10 +938,9 @@ def test_audit_manager_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +985,9 @@ def test_audit_manager_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1023,9 @@ def test_audit_manager_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1271,9 +1268,7 @@ def test_audit_manager_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1944,9 +1939,7 @@ def test_generate_audit_scope_report_flattened(): mock_val = "compliance_standard_value" assert arg == mock_val arg = args[0].report_format - mock_val = ( - auditmanager.GenerateAuditScopeReportRequest.AuditScopeReportFormat.AUDIT_SCOPE_REPORT_FORMAT_ODF - ) + mock_val = auditmanager.GenerateAuditScopeReportRequest.AuditScopeReportFormat.AUDIT_SCOPE_REPORT_FORMAT_ODF assert arg == mock_val @@ -2001,9 +1994,7 @@ async def test_generate_audit_scope_report_flattened_async(): mock_val = "compliance_standard_value" assert arg == mock_val arg = args[0].report_format - mock_val = ( - auditmanager.GenerateAuditScopeReportRequest.AuditScopeReportFormat.AUDIT_SCOPE_REPORT_FORMAT_ODF - ) + mock_val = auditmanager.GenerateAuditScopeReportRequest.AuditScopeReportFormat.AUDIT_SCOPE_REPORT_FORMAT_ODF assert arg == mock_val @@ -2119,9 +2110,9 @@ def test_generate_audit_report_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_audit_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_audit_report] = ( + mock_rpc + ) request = {} client.generate_audit_report(request) @@ -2322,9 +2313,7 @@ def test_generate_audit_report_flattened(): mock_val = "compliance_standard_value" assert arg == mock_val arg = args[0].report_format - mock_val = ( - auditmanager.GenerateAuditReportRequest.AuditReportFormat.AUDIT_REPORT_FORMAT_ODF - ) + mock_val = auditmanager.GenerateAuditReportRequest.AuditReportFormat.AUDIT_REPORT_FORMAT_ODF assert arg == mock_val assert args[0].gcs_uri == "gcs_uri_value" @@ -2382,9 +2371,7 @@ async def test_generate_audit_report_flattened_async(): mock_val = "compliance_standard_value" assert arg == mock_val arg = args[0].report_format - mock_val = ( - auditmanager.GenerateAuditReportRequest.AuditReportFormat.AUDIT_REPORT_FORMAT_ODF - ) + mock_val = auditmanager.GenerateAuditReportRequest.AuditReportFormat.AUDIT_REPORT_FORMAT_ODF assert arg == mock_val assert args[0].gcs_uri == "gcs_uri_value" @@ -2500,9 +2487,9 @@ def test_list_audit_reports_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_audit_reports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_audit_reports] = ( + mock_rpc + ) request = {} client.list_audit_reports(request) @@ -3052,9 +3039,9 @@ def test_get_audit_report_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_audit_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_audit_report] = ( + mock_rpc + ) request = {} client.get_audit_report(request) @@ -5167,9 +5154,9 @@ def test_generate_audit_report_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_audit_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_audit_report] = ( + mock_rpc + ) request = {} client.generate_audit_report(request) @@ -5372,9 +5359,9 @@ def test_list_audit_reports_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_audit_reports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_audit_reports] = ( + mock_rpc + ) request = {} client.list_audit_reports(request) @@ -5630,9 +5617,9 @@ def test_get_audit_report_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_audit_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_audit_report] = ( + mock_rpc + ) request = {} client.get_audit_report(request) diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/__init__.py b/packages/google-cloud-automl/google/cloud/automl_v1/__init__.py index 57c856c7c4a8..2968bc863430 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/__init__.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.auto_ml import AutoMlAsyncClient, AutoMlClient from .services.prediction_service import ( PredictionServiceAsyncClient, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/async_client.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/async_client.py index b7be6241f88a..49fb7e0d75bf 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/async_client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1 import gapic_version as package_version @@ -52,6 +52,13 @@ from google.cloud.automl_v1.services.auto_ml import pagers from google.cloud.automl_v1.types import ( + annotation_spec, + classification, + dataset, + detection, + image, + io, + model, model_evaluation, operations, service, @@ -60,11 +67,7 @@ text_sentiment, translation, ) -from google.cloud.automl_v1.types import annotation_spec, classification -from google.cloud.automl_v1.types import dataset from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import detection, image, io -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model from .client import AutoMlClient @@ -144,7 +147,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AutoMlAsyncClient: The constructed client. """ - return AutoMlClient.from_service_account_info.__func__(AutoMlAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AutoMlClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AutoMlAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -160,7 +166,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AutoMlAsyncClient: The constructed client. """ - return AutoMlClient.from_service_account_file.__func__(AutoMlAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AutoMlClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AutoMlAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/client.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/client.py index e955723fb187..677fe4964d6c 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1 import gapic_version as package_version @@ -69,6 +69,13 @@ from google.cloud.automl_v1.services.auto_ml import pagers from google.cloud.automl_v1.types import ( + annotation_spec, + classification, + dataset, + detection, + image, + io, + model, model_evaluation, operations, service, @@ -77,11 +84,7 @@ text_sentiment, translation, ) -from google.cloud.automl_v1.types import annotation_spec, classification -from google.cloud.automl_v1.types import dataset from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import detection, image, io -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model from .transports.base import DEFAULT_CLIENT_INFO, AutoMlTransport @@ -723,11 +726,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutoMlClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutoMlClient._read_environment_variables() + ) self._client_cert_source = AutoMlClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -762,8 +763,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutoMlTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/pagers.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/pagers.py index 7e48afa91db6..03820cb15976 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/pagers.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/base.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/base.py index e8117c91b946..c9cb3efd7b4b 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/base.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/base.py @@ -17,22 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1 import gapic_version as package_version -from google.cloud.automl_v1.types import annotation_spec -from google.cloud.automl_v1.types import dataset +from google.cloud.automl_v1.types import ( + annotation_spec, + dataset, + model, + model_evaluation, + service, +) from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model -from google.cloud.automl_v1.types import model_evaluation, service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc.py index 01b4eb298572..519e3d429798 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc.py @@ -16,25 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.automl_v1.types import annotation_spec -from google.cloud.automl_v1.types import dataset +from google.cloud.automl_v1.types import ( + annotation_spec, + dataset, + model, + model_evaluation, + service, +) from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model -from google.cloud.automl_v1.types import model_evaluation, service from .base import DEFAULT_CLIENT_INFO, AutoMlTransport diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc_asyncio.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc_asyncio.py index fcd4add741e9..7906f12fbd92 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc_asyncio.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,17 +30,17 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.automl_v1.types import annotation_spec -from google.cloud.automl_v1.types import dataset +from google.cloud.automl_v1.types import ( + annotation_spec, + dataset, + model, + model_evaluation, + service, +) from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model -from google.cloud.automl_v1.types import model_evaluation, service from .base import DEFAULT_CLIENT_INFO, AutoMlTransport from .grpc import AutoMlGrpcTransport diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest.py index 0cadcf477c01..f8d997ef53a6 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest.py @@ -16,25 +16,28 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.automl_v1.types import annotation_spec -from google.cloud.automl_v1.types import dataset +from google.cloud.automl_v1.types import ( + annotation_spec, + dataset, + model, + model_evaluation, + service, +) from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model -from google.cloud.automl_v1.types import model_evaluation, service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAutoMlRestTransport diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest_base.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest_base.py index 3e9349175a0f..1cdc8723b1ab 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest_base.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest_base.py @@ -21,12 +21,15 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.automl_v1.types import annotation_spec -from google.cloud.automl_v1.types import dataset +from google.cloud.automl_v1.types import ( + annotation_spec, + dataset, + model, + model_evaluation, + service, +) from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model -from google.cloud.automl_v1.types import model_evaluation, service from .base import DEFAULT_CLIENT_INFO, AutoMlTransport diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/async_client.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/async_client.py index f7916afb3e8a..d1d6ff118f02 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/async_client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1 import gapic_version as package_version @@ -125,7 +125,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_info.__func__(PredictionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PredictionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PredictionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +144,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_file.__func__(PredictionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PredictionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PredictionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/client.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/client.py index b5af882e91ff..91a1ba11e732 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1 import gapic_version as package_version @@ -86,9 +86,7 @@ class PredictionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PredictionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PredictionServiceTransport]] _transport_registry["grpc"] = PredictionServiceGrpcTransport _transport_registry["grpc_asyncio"] = PredictionServiceGrpcAsyncIOTransport _transport_registry["rest"] = PredictionServiceRestTransport @@ -636,11 +634,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PredictionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PredictionServiceClient._read_environment_variables() + ) self._client_cert_source = PredictionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -675,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PredictionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/base.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/base.py index d23b40692ac1..f1741e52ab9e 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/base.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1 import gapic_version as package_version from google.cloud.automl_v1.types import prediction_service diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc.py index 7e66b8ae9211..bba1dea2a238 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.automl_v1.types import prediction_service diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc_asyncio.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc_asyncio.py index 1c29d7ebdd23..82117c69796d 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.automl_v1.types import prediction_service diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/rest.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/rest.py index 2956f97e633d..d70eb1dc1422 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/rest.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -404,9 +404,7 @@ def __call__( """ - http_options = ( - _BasePredictionServiceRestTransport._BaseBatchPredict._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseBatchPredict._get_http_options() request, metadata = self._interceptor.pre_batch_predict(request, metadata) transcoded_request = _BasePredictionServiceRestTransport._BaseBatchPredict._get_transcoded_request( diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/__init__.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/__init__.py index 9018fc8624c1..c31e3d248b4a 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/__init__.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/__init__.py @@ -13,21 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .annotation_payload import AnnotationPayload -from .annotation_spec import AnnotationSpec +from .annotation_payload import ( + AnnotationPayload, +) +from .annotation_spec import ( + AnnotationSpec, +) from .classification import ( ClassificationAnnotation, ClassificationEvaluationMetrics, ClassificationType, ) -from .data_items import Document, DocumentDimensions, ExamplePayload, Image, TextSnippet -from .dataset import Dataset +from .data_items import ( + Document, + DocumentDimensions, + ExamplePayload, + Image, + TextSnippet, +) +from .dataset import ( + Dataset, +) from .detection import ( BoundingBoxMetricsEntry, ImageObjectDetectionAnnotation, ImageObjectDetectionEvaluationMetrics, ) -from .geometry import BoundingPoly, NormalizedVertex +from .geometry import ( + BoundingPoly, + NormalizedVertex, +) from .image import ( ImageClassificationDatasetMetadata, ImageClassificationModelDeploymentMetadata, @@ -46,8 +61,12 @@ ModelExportOutputConfig, OutputConfig, ) -from .model import Model -from .model_evaluation import ModelEvaluation +from .model import ( + Model, +) +from .model_evaluation import ( + ModelEvaluation, +) from .operations import ( BatchPredictOperationMetadata, CreateDatasetOperationMetadata, @@ -97,9 +116,17 @@ TextSentimentDatasetMetadata, TextSentimentModelMetadata, ) -from .text_extraction import TextExtractionAnnotation, TextExtractionEvaluationMetrics -from .text_segment import TextSegment -from .text_sentiment import TextSentimentAnnotation, TextSentimentEvaluationMetrics +from .text_extraction import ( + TextExtractionAnnotation, + TextExtractionEvaluationMetrics, +) +from .text_segment import ( + TextSegment, +) +from .text_sentiment import ( + TextSentimentAnnotation, + TextSentimentEvaluationMetrics, +) from .translation import ( TranslationAnnotation, TranslationDatasetMetadata, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/classification.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/classification.py index 942465a80803..f477960e5d16 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/classification.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/classification.py @@ -40,6 +40,7 @@ class ClassificationType(proto.Enum): MULTILABEL (2): Multiple labels are allowed for one example. """ + CLASSIFICATION_TYPE_UNSPECIFIED = 0 MULTICLASS = 1 MULTILABEL = 2 @@ -272,12 +273,12 @@ class Row(proto.Message): proto.STRING, number=3, ) - row: MutableSequence[ - "ClassificationEvaluationMetrics.ConfusionMatrix.Row" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ClassificationEvaluationMetrics.ConfusionMatrix.Row", + row: MutableSequence["ClassificationEvaluationMetrics.ConfusionMatrix.Row"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ClassificationEvaluationMetrics.ConfusionMatrix.Row", + ) ) au_prc: float = proto.Field( @@ -292,12 +293,12 @@ class Row(proto.Message): proto.FLOAT, number=7, ) - confidence_metrics_entry: MutableSequence[ - ConfidenceMetricsEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ConfidenceMetricsEntry, + confidence_metrics_entry: MutableSequence[ConfidenceMetricsEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ConfidenceMetricsEntry, + ) ) confusion_matrix: ConfusionMatrix = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/data_items.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/data_items.py index d21db733f1ae..ce813e5041b3 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/data_items.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/data_items.py @@ -125,6 +125,7 @@ class DocumentDimensionUnit(proto.Enum): Document dimension is measured in points. 72 points = 1 inch. """ + DOCUMENT_DIMENSION_UNIT_UNSPECIFIED = 0 INCH = 1 CENTIMETER = 2 @@ -232,6 +233,7 @@ class TextSegmentType(proto.Enum): child of another TABLE_ROW TextSegment if its span is subspan of another TextSegment with type TABLE_ROW. """ + TEXT_SEGMENT_TYPE_UNSPECIFIED = 0 TOKEN = 1 PARAGRAPH = 2 diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/detection.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/detection.py index 5140cd3a784e..b77505eb103b 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/detection.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/detection.py @@ -118,12 +118,12 @@ class ConfidenceMetricsEntry(proto.Message): proto.FLOAT, number=2, ) - confidence_metrics_entries: MutableSequence[ - ConfidenceMetricsEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ConfidenceMetricsEntry, + confidence_metrics_entries: MutableSequence[ConfidenceMetricsEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ConfidenceMetricsEntry, + ) ) @@ -152,12 +152,12 @@ class ImageObjectDetectionEvaluationMetrics(proto.Message): proto.INT32, number=1, ) - bounding_box_metrics_entries: MutableSequence[ - "BoundingBoxMetricsEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="BoundingBoxMetricsEntry", + bounding_box_metrics_entries: MutableSequence["BoundingBoxMetricsEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="BoundingBoxMetricsEntry", + ) ) bounding_box_mean_average_precision: float = proto.Field( proto.FLOAT, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/model.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/model.py index 8a04d0c97d19..0f8e93021956 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/model.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/model.py @@ -118,6 +118,7 @@ class DeploymentState(proto.Enum): UNDEPLOYED (2): Model is not deployed. """ + DEPLOYMENT_STATE_UNSPECIFIED = 0 DEPLOYED = 1 UNDEPLOYED = 2 diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/prediction_service.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/prediction_service.py index 0ffdf44e0807..89291c0a6c43 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/prediction_service.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/prediction_service.py @@ -131,12 +131,12 @@ class PredictResponse(proto.Message): API. """ - payload: MutableSequence[ - annotation_payload.AnnotationPayload - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=annotation_payload.AnnotationPayload, + payload: MutableSequence[annotation_payload.AnnotationPayload] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=annotation_payload.AnnotationPayload, + ) ) preprocessed_input: data_items.ExamplePayload = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/service.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/service.py index ef90c2869885..45b6480446af 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/service.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/service.py @@ -20,10 +20,10 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.automl_v1.types import model_evaluation as gca_model_evaluation from google.cloud.automl_v1.types import dataset as gca_dataset from google.cloud.automl_v1.types import image, io from google.cloud.automl_v1.types import model as gca_model +from google.cloud.automl_v1.types import model_evaluation as gca_model_evaluation __protobuf__ = proto.module( package="google.cloud.automl.v1", @@ -605,12 +605,12 @@ class ListModelEvaluationsResponse(proto.Message): def raw_page(self): return self - model_evaluation: MutableSequence[ - gca_model_evaluation.ModelEvaluation - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gca_model_evaluation.ModelEvaluation, + model_evaluation: MutableSequence[gca_model_evaluation.ModelEvaluation] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gca_model_evaluation.ModelEvaluation, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/text_extraction.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/text_extraction.py index ae082887b724..b857211c009e 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/text_extraction.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/text_extraction.py @@ -114,12 +114,12 @@ class ConfidenceMetricsEntry(proto.Message): proto.FLOAT, number=1, ) - confidence_metrics_entries: MutableSequence[ - ConfidenceMetricsEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=ConfidenceMetricsEntry, + confidence_metrics_entries: MutableSequence[ConfidenceMetricsEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=ConfidenceMetricsEntry, + ) ) diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/__init__.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/__init__.py index a1f1fc15f50e..310edefc5778 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/__init__.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.auto_ml import AutoMlAsyncClient, AutoMlClient from .services.prediction_service import ( PredictionServiceAsyncClient, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/async_client.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/async_client.py index 8a3a3ec4fa30..d9ea016c12d1 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/async_client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1beta1 import gapic_version as package_version @@ -51,12 +51,21 @@ from google.cloud.automl_v1beta1.services.auto_ml import pagers from google.cloud.automl_v1beta1.types import ( + annotation_spec, + classification, + column_spec, + data_stats, + data_types, + dataset, + detection, + image, + io, + model, model_evaluation, operations, regression, service, -) -from google.cloud.automl_v1beta1.types import ( + table_spec, tables, text, text_extraction, @@ -64,16 +73,9 @@ translation, video, ) -from google.cloud.automl_v1beta1.types import annotation_spec, classification -from google.cloud.automl_v1beta1.types import column_spec from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import data_stats, data_types -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import detection, image, io -from google.cloud.automl_v1beta1.types import model from google.cloud.automl_v1beta1.types import model as gca_model -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec from .client import AutoMlClient @@ -157,7 +159,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AutoMlAsyncClient: The constructed client. """ - return AutoMlClient.from_service_account_info.__func__(AutoMlAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AutoMlClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AutoMlAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -173,7 +178,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AutoMlAsyncClient: The constructed client. """ - return AutoMlClient.from_service_account_file.__func__(AutoMlAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AutoMlClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AutoMlAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/client.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/client.py index 5c92ef6856e5..a5369ac90190 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1beta1 import gapic_version as package_version @@ -68,12 +68,21 @@ from google.cloud.automl_v1beta1.services.auto_ml import pagers from google.cloud.automl_v1beta1.types import ( + annotation_spec, + classification, + column_spec, + data_stats, + data_types, + dataset, + detection, + image, + io, + model, model_evaluation, operations, regression, service, -) -from google.cloud.automl_v1beta1.types import ( + table_spec, tables, text, text_extraction, @@ -81,16 +90,9 @@ translation, video, ) -from google.cloud.automl_v1beta1.types import annotation_spec, classification -from google.cloud.automl_v1beta1.types import column_spec from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import data_stats, data_types -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import detection, image, io -from google.cloud.automl_v1beta1.types import model from google.cloud.automl_v1beta1.types import model as gca_model -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec from .transports.base import DEFAULT_CLIENT_INFO, AutoMlTransport @@ -782,11 +784,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutoMlClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutoMlClient._read_environment_variables() + ) self._client_cert_source = AutoMlClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -821,8 +821,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutoMlTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/pagers.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/pagers.py index 0504688a952a..749e21f28c22 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/pagers.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/pagers.py @@ -74,7 +74,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -150,7 +150,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -230,7 +230,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -306,7 +306,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -386,7 +386,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -462,7 +462,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -542,7 +542,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -618,7 +618,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -698,7 +698,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -774,7 +774,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/base.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/base.py index 98ee2fb98ca3..ce1c05664a4e 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/base.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/base.py @@ -17,23 +17,27 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1beta1 import gapic_version as package_version -from google.cloud.automl_v1beta1.types import annotation_spec -from google.cloud.automl_v1beta1.types import column_spec +from google.cloud.automl_v1beta1.types import ( + annotation_spec, + column_spec, + dataset, + model, + model_evaluation, + service, + table_spec, +) from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import model, model_evaluation, service -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc.py index d064f40be786..565f764ca60d 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc.py @@ -16,26 +16,30 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.automl_v1beta1.types import annotation_spec -from google.cloud.automl_v1beta1.types import column_spec +from google.cloud.automl_v1beta1.types import ( + annotation_spec, + column_spec, + dataset, + model, + model_evaluation, + service, + table_spec, +) from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import model, model_evaluation, service -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec from .base import DEFAULT_CLIENT_INFO, AutoMlTransport diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc_asyncio.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc_asyncio.py index 9fd7a322b7f5..67e2e92ddced 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc_asyncio.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,18 +30,19 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.automl_v1beta1.types import annotation_spec -from google.cloud.automl_v1beta1.types import column_spec +from google.cloud.automl_v1beta1.types import ( + annotation_spec, + column_spec, + dataset, + model, + model_evaluation, + service, + table_spec, +) from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import model, model_evaluation, service -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec from .base import DEFAULT_CLIENT_INFO, AutoMlTransport diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest.py index 47fd95748e82..75408d107828 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest.py @@ -16,26 +16,30 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.automl_v1beta1.types import annotation_spec -from google.cloud.automl_v1beta1.types import column_spec +from google.cloud.automl_v1beta1.types import ( + annotation_spec, + column_spec, + dataset, + model, + model_evaluation, + service, + table_spec, +) from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import model, model_evaluation, service -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -2517,9 +2521,7 @@ def __call__( """ - http_options = ( - _BaseAutoMlRestTransport._BaseExportEvaluatedExamples._get_http_options() - ) + http_options = _BaseAutoMlRestTransport._BaseExportEvaluatedExamples._get_http_options() request, metadata = self._interceptor.pre_export_evaluated_examples( request, metadata @@ -5274,7 +5276,9 @@ def export_evaluated_examples( ) -> Callable[[service.ExportEvaluatedExamplesRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ExportEvaluatedExamples(self._session, self._host, self._interceptor) # type: ignore + return self._ExportEvaluatedExamples( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_model( diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest_base.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest_base.py index 80110baefaee..e32c7a58fb3e 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest_base.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest_base.py @@ -21,13 +21,17 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.automl_v1beta1.types import annotation_spec -from google.cloud.automl_v1beta1.types import column_spec +from google.cloud.automl_v1beta1.types import ( + annotation_spec, + column_spec, + dataset, + model, + model_evaluation, + service, + table_spec, +) from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import model, model_evaluation, service -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec from .base import DEFAULT_CLIENT_INFO, AutoMlTransport diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/async_client.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/async_client.py index e96558271991..7cae58f6a893 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/async_client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1beta1 import gapic_version as package_version @@ -125,7 +125,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_info.__func__(PredictionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PredictionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PredictionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +144,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_file.__func__(PredictionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PredictionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PredictionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/client.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/client.py index f0063f47e2d7..9d1a32f09425 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1beta1 import gapic_version as package_version @@ -86,9 +86,7 @@ class PredictionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PredictionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PredictionServiceTransport]] _transport_registry["grpc"] = PredictionServiceGrpcTransport _transport_registry["grpc_asyncio"] = PredictionServiceGrpcAsyncIOTransport _transport_registry["rest"] = PredictionServiceRestTransport @@ -636,11 +634,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PredictionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PredictionServiceClient._read_environment_variables() + ) self._client_cert_source = PredictionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -675,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PredictionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/base.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/base.py index 17a39871be51..eeea7c02063b 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/base.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1beta1 import gapic_version as package_version from google.cloud.automl_v1beta1.types import prediction_service diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc.py index 734269bc50dc..fad7578f4d01 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.automl_v1beta1.types import prediction_service diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc_asyncio.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc_asyncio.py index a87be5ac055d..6ba6e3e1c425 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.automl_v1beta1.types import prediction_service diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/rest.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/rest.py index 025932d388e9..92d5dadad104 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/rest.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -404,9 +404,7 @@ def __call__( """ - http_options = ( - _BasePredictionServiceRestTransport._BaseBatchPredict._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseBatchPredict._get_http_options() request, metadata = self._interceptor.pre_batch_predict(request, metadata) transcoded_request = _BasePredictionServiceRestTransport._BaseBatchPredict._get_transcoded_request( diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/__init__.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/__init__.py index 41cef9e61fd2..7b1929f7e8cd 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/__init__.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/__init__.py @@ -13,15 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .annotation_payload import AnnotationPayload -from .annotation_spec import AnnotationSpec +from .annotation_payload import ( + AnnotationPayload, +) +from .annotation_spec import ( + AnnotationSpec, +) from .classification import ( ClassificationAnnotation, ClassificationEvaluationMetrics, ClassificationType, VideoClassificationAnnotation, ) -from .column_spec import ColumnSpec +from .column_spec import ( + ColumnSpec, +) from .data_items import ( Document, DocumentDimensions, @@ -40,8 +46,14 @@ StructStats, TimestampStats, ) -from .data_types import DataType, StructType, TypeCode -from .dataset import Dataset +from .data_types import ( + DataType, + StructType, + TypeCode, +) +from .dataset import ( + Dataset, +) from .detection import ( BoundingBoxMetricsEntry, ImageObjectDetectionAnnotation, @@ -49,7 +61,10 @@ VideoObjectTrackingAnnotation, VideoObjectTrackingEvaluationMetrics, ) -from .geometry import BoundingPoly, NormalizedVertex +from .geometry import ( + BoundingPoly, + NormalizedVertex, +) from .image import ( ImageClassificationDatasetMetadata, ImageClassificationModelDeploymentMetadata, @@ -72,8 +87,12 @@ ModelExportOutputConfig, OutputConfig, ) -from .model import Model -from .model_evaluation import ModelEvaluation +from .model import ( + Model, +) +from .model_evaluation import ( + ModelEvaluation, +) from .operations import ( BatchPredictOperationMetadata, CreateModelOperationMetadata, @@ -92,8 +111,12 @@ PredictRequest, PredictResponse, ) -from .ranges import DoubleRange -from .regression import RegressionEvaluationMetrics +from .ranges import ( + DoubleRange, +) +from .regression import ( + RegressionEvaluationMetrics, +) from .service import ( CreateDatasetRequest, CreateModelRequest, @@ -125,14 +148,18 @@ UpdateDatasetRequest, UpdateTableSpecRequest, ) -from .table_spec import TableSpec +from .table_spec import ( + TableSpec, +) from .tables import ( TablesAnnotation, TablesDatasetMetadata, TablesModelColumnInfo, TablesModelMetadata, ) -from .temporal import TimeSegment +from .temporal import ( + TimeSegment, +) from .text import ( TextClassificationDatasetMetadata, TextClassificationModelMetadata, @@ -141,9 +168,17 @@ TextSentimentDatasetMetadata, TextSentimentModelMetadata, ) -from .text_extraction import TextExtractionAnnotation, TextExtractionEvaluationMetrics -from .text_segment import TextSegment -from .text_sentiment import TextSentimentAnnotation, TextSentimentEvaluationMetrics +from .text_extraction import ( + TextExtractionAnnotation, + TextExtractionEvaluationMetrics, +) +from .text_segment import ( + TextSegment, +) +from .text_sentiment import ( + TextSentimentAnnotation, + TextSentimentEvaluationMetrics, +) from .translation import ( TranslationAnnotation, TranslationDatasetMetadata, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/annotation_payload.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/annotation_payload.py index 6c7d71ec323e..3c6089cdd69e 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/annotation_payload.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/annotation_payload.py @@ -20,10 +20,10 @@ import proto # type: ignore from google.cloud.automl_v1beta1.types import classification as gca_classification -from google.cloud.automl_v1beta1.types import text_extraction as gca_text_extraction -from google.cloud.automl_v1beta1.types import text_sentiment as gca_text_sentiment from google.cloud.automl_v1beta1.types import detection from google.cloud.automl_v1beta1.types import tables as gca_tables +from google.cloud.automl_v1beta1.types import text_extraction as gca_text_extraction +from google.cloud.automl_v1beta1.types import text_sentiment as gca_text_sentiment from google.cloud.automl_v1beta1.types import translation as gca_translation __protobuf__ = proto.module( diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/classification.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/classification.py index da1ce6beacd8..a9f1cc1c609a 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/classification.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/classification.py @@ -43,6 +43,7 @@ class ClassificationType(proto.Enum): MULTILABEL (2): Multiple labels are allowed for one example. """ + CLASSIFICATION_TYPE_UNSPECIFIED = 0 MULTICLASS = 1 MULTILABEL = 2 @@ -337,12 +338,12 @@ class Row(proto.Message): proto.STRING, number=3, ) - row: MutableSequence[ - "ClassificationEvaluationMetrics.ConfusionMatrix.Row" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ClassificationEvaluationMetrics.ConfusionMatrix.Row", + row: MutableSequence["ClassificationEvaluationMetrics.ConfusionMatrix.Row"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ClassificationEvaluationMetrics.ConfusionMatrix.Row", + ) ) au_prc: float = proto.Field( @@ -361,12 +362,12 @@ class Row(proto.Message): proto.FLOAT, number=7, ) - confidence_metrics_entry: MutableSequence[ - ConfidenceMetricsEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ConfidenceMetricsEntry, + confidence_metrics_entry: MutableSequence[ConfidenceMetricsEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ConfidenceMetricsEntry, + ) ) confusion_matrix: ConfusionMatrix = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_items.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_items.py index 94ac36ef81d6..05cb49aacc9c 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_items.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_items.py @@ -142,6 +142,7 @@ class DocumentDimensionUnit(proto.Enum): Document dimension is measured in points. 72 points = 1 inch. """ + DOCUMENT_DIMENSION_UNIT_UNSPECIFIED = 0 INCH = 1 CENTIMETER = 2 @@ -250,6 +251,7 @@ class TextSegmentType(proto.Enum): child of another TABLE_ROW TextSegment if its span is subspan of another TextSegment with type TABLE_ROW. """ + TEXT_SEGMENT_TYPE_UNSPECIFIED = 0 TOKEN = 1 PARAGRAPH = 2 diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_types.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_types.py index 4d847e71967e..2f7430700972 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_types.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_types.py @@ -65,6 +65,7 @@ class TypeCode(proto.Enum): ``string`` (bytes should be base64-encoded, as described in RFC 4648, section 4). """ + TYPE_CODE_UNSPECIFIED = 0 FLOAT64 = 3 TIMESTAMP = 4 diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/detection.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/detection.py index 0e444420c6c2..ef8329bc073e 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/detection.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/detection.py @@ -172,12 +172,12 @@ class ConfidenceMetricsEntry(proto.Message): proto.FLOAT, number=2, ) - confidence_metrics_entries: MutableSequence[ - ConfidenceMetricsEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ConfidenceMetricsEntry, + confidence_metrics_entries: MutableSequence[ConfidenceMetricsEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ConfidenceMetricsEntry, + ) ) @@ -206,12 +206,12 @@ class ImageObjectDetectionEvaluationMetrics(proto.Message): proto.INT32, number=1, ) - bounding_box_metrics_entries: MutableSequence[ - "BoundingBoxMetricsEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="BoundingBoxMetricsEntry", + bounding_box_metrics_entries: MutableSequence["BoundingBoxMetricsEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="BoundingBoxMetricsEntry", + ) ) bounding_box_mean_average_precision: float = proto.Field( proto.FLOAT, @@ -253,12 +253,12 @@ class VideoObjectTrackingEvaluationMetrics(proto.Message): proto.INT32, number=2, ) - bounding_box_metrics_entries: MutableSequence[ - "BoundingBoxMetricsEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="BoundingBoxMetricsEntry", + bounding_box_metrics_entries: MutableSequence["BoundingBoxMetricsEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="BoundingBoxMetricsEntry", + ) ) bounding_box_mean_average_precision: float = proto.Field( proto.FLOAT, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/model.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/model.py index 2b1cdbb6c8a7..aa4fd6d7a25b 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/model.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/model.py @@ -114,6 +114,7 @@ class DeploymentState(proto.Enum): UNDEPLOYED (2): Model is not deployed. """ + DEPLOYMENT_STATE_UNSPECIFIED = 0 DEPLOYED = 1 UNDEPLOYED = 2 diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/prediction_service.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/prediction_service.py index 49c70e9a4966..375da0fa955f 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/prediction_service.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/prediction_service.py @@ -121,12 +121,12 @@ class PredictResponse(proto.Message): Analysis API. """ - payload: MutableSequence[ - annotation_payload.AnnotationPayload - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=annotation_payload.AnnotationPayload, + payload: MutableSequence[annotation_payload.AnnotationPayload] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=annotation_payload.AnnotationPayload, + ) ) preprocessed_input: data_items.ExamplePayload = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/service.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/service.py index 9a728e9882d2..eb905fd7f780 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/service.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/service.py @@ -20,11 +20,11 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.automl_v1beta1.types import model_evaluation as gca_model_evaluation from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec from google.cloud.automl_v1beta1.types import dataset as gca_dataset from google.cloud.automl_v1beta1.types import image, io from google.cloud.automl_v1beta1.types import model as gca_model +from google.cloud.automl_v1beta1.types import model_evaluation as gca_model_evaluation from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec __protobuf__ = proto.module( @@ -858,12 +858,12 @@ class ListModelEvaluationsResponse(proto.Message): def raw_page(self): return self - model_evaluation: MutableSequence[ - gca_model_evaluation.ModelEvaluation - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gca_model_evaluation.ModelEvaluation, + model_evaluation: MutableSequence[gca_model_evaluation.ModelEvaluation] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gca_model_evaluation.ModelEvaluation, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/tables.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/tables.py index 524d9f17e45f..836fd3a27646 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/tables.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/tables.py @@ -119,13 +119,13 @@ class TablesDatasetMetadata(proto.Message): proto.STRING, number=4, ) - target_column_correlations: MutableMapping[ - str, data_stats.CorrelationStats - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=6, - message=data_stats.CorrelationStats, + target_column_correlations: MutableMapping[str, data_stats.CorrelationStats] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=6, + message=data_stats.CorrelationStats, + ) ) stats_update_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, @@ -268,23 +268,23 @@ class TablesModelMetadata(proto.Message): number=2, message=column_spec.ColumnSpec, ) - input_feature_column_specs: MutableSequence[ - column_spec.ColumnSpec - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=column_spec.ColumnSpec, + input_feature_column_specs: MutableSequence[column_spec.ColumnSpec] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=column_spec.ColumnSpec, + ) ) optimization_objective: str = proto.Field( proto.STRING, number=4, ) - tables_model_column_info: MutableSequence[ - "TablesModelColumnInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="TablesModelColumnInfo", + tables_model_column_info: MutableSequence["TablesModelColumnInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="TablesModelColumnInfo", + ) ) train_budget_milli_node_hours: int = proto.Field( proto.INT64, @@ -368,12 +368,12 @@ class TablesAnnotation(proto.Message): number=2, message=struct_pb2.Value, ) - tables_model_column_info: MutableSequence[ - "TablesModelColumnInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="TablesModelColumnInfo", + tables_model_column_info: MutableSequence["TablesModelColumnInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="TablesModelColumnInfo", + ) ) baseline_score: float = proto.Field( proto.FLOAT, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/text_extraction.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/text_extraction.py index e1765705c957..036cde48de90 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/text_extraction.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/text_extraction.py @@ -114,12 +114,12 @@ class ConfidenceMetricsEntry(proto.Message): proto.FLOAT, number=1, ) - confidence_metrics_entries: MutableSequence[ - ConfidenceMetricsEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=ConfidenceMetricsEntry, + confidence_metrics_entries: MutableSequence[ConfidenceMetricsEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=ConfidenceMetricsEntry, + ) ) diff --git a/packages/google-cloud-automl/mypy.ini b/packages/google-cloud-automl/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-automl/mypy.ini +++ b/packages/google-cloud-automl/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-automl/noxfile.py b/packages/google-cloud-automl/noxfile.py index 4a482fbfa495..cb306577dd29 100644 --- a/packages/google-cloud-automl/noxfile.py +++ b/packages/google-cloud-automl/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -150,10 +149,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -162,10 +166,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -173,19 +185,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_auto_ml.py b/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_auto_ml.py index 74d5f3b58aac..9cd5581d4379 100644 --- a/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_auto_ml.py +++ b/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_auto_ml.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.automl_v1.services.auto_ml import ( AutoMlAsyncClient, @@ -72,6 +72,13 @@ transports, ) from google.cloud.automl_v1.types import ( + annotation_spec, + classification, + dataset, + detection, + image, + io, + model, model_evaluation, operations, service, @@ -80,11 +87,7 @@ text_sentiment, translation, ) -from google.cloud.automl_v1.types import annotation_spec, classification -from google.cloud.automl_v1.types import dataset from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import detection, image, io -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model CRED_INFO_JSON = { @@ -922,10 +925,9 @@ def test_auto_ml_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -970,10 +972,9 @@ def test_auto_ml_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1009,10 +1010,9 @@ def test_auto_ml_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1241,9 +1241,7 @@ def test_auto_ml_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3979,9 +3977,9 @@ def test_get_annotation_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_annotation_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_annotation_spec] = ( + mock_rpc + ) request = {} client.get_annotation_spec(request) @@ -7252,9 +7250,9 @@ def test_get_model_evaluation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_model_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_model_evaluation] = ( + mock_rpc + ) request = {} client.get_model_evaluation(request) @@ -7604,9 +7602,9 @@ def test_list_model_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_model_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_model_evaluations] = ( + mock_rpc + ) request = {} client.list_model_evaluations(request) @@ -9462,9 +9460,9 @@ def test_get_annotation_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_annotation_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_annotation_spec] = ( + mock_rpc + ) request = {} client.get_annotation_spec(request) @@ -11181,9 +11179,9 @@ def test_get_model_evaluation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_model_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_model_evaluation] = ( + mock_rpc + ) request = {} client.get_model_evaluation(request) @@ -11366,9 +11364,9 @@ def test_list_model_evaluations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_model_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_model_evaluations] = ( + mock_rpc + ) request = {} client.list_model_evaluations(request) diff --git a/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_prediction_service.py b/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_prediction_service.py index 123e7a2263db..1c40af9c7363 100644 --- a/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_prediction_service.py +++ b/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_prediction_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -995,10 +995,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1042,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1080,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1337,9 +1334,7 @@ def test_prediction_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_auto_ml.py b/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_auto_ml.py index 5ac2102572bc..2bdf970e04fd 100644 --- a/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_auto_ml.py +++ b/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_auto_ml.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.automl_v1beta1.services.auto_ml import ( AutoMlAsyncClient, @@ -72,12 +72,21 @@ transports, ) from google.cloud.automl_v1beta1.types import ( + annotation_spec, + classification, + column_spec, + data_stats, + data_types, + dataset, + detection, + image, + io, + model, model_evaluation, operations, regression, service, -) -from google.cloud.automl_v1beta1.types import ( + table_spec, tables, text, text_extraction, @@ -85,16 +94,9 @@ translation, video, ) -from google.cloud.automl_v1beta1.types import annotation_spec, classification -from google.cloud.automl_v1beta1.types import column_spec from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import data_stats, data_types -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import detection, image, io -from google.cloud.automl_v1beta1.types import model from google.cloud.automl_v1beta1.types import model as gca_model -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec CRED_INFO_JSON = { @@ -932,10 +934,9 @@ def test_auto_ml_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -980,10 +981,9 @@ def test_auto_ml_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1019,9 @@ def test_auto_ml_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1251,9 +1250,7 @@ def test_auto_ml_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3987,9 +3984,9 @@ def test_get_annotation_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_annotation_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_annotation_spec] = ( + mock_rpc + ) request = {} client.get_annotation_spec(request) @@ -4673,9 +4670,9 @@ def test_list_table_specs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_table_specs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_table_specs] = ( + mock_rpc + ) request = {} client.list_table_specs(request) @@ -5202,9 +5199,9 @@ def test_update_table_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_table_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_table_spec] = ( + mock_rpc + ) request = {} client.update_table_spec(request) @@ -5886,9 +5883,9 @@ def test_list_column_specs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_column_specs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_column_specs] = ( + mock_rpc + ) request = {} client.list_column_specs(request) @@ -6429,9 +6426,9 @@ def test_update_column_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_column_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_column_spec] = ( + mock_rpc + ) request = {} client.update_column_spec(request) @@ -9709,9 +9706,9 @@ def test_get_model_evaluation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_model_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_model_evaluation] = ( + mock_rpc + ) request = {} client.get_model_evaluation(request) @@ -10061,9 +10058,9 @@ def test_list_model_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_model_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_model_evaluations] = ( + mock_rpc + ) request = {} client.list_model_evaluations(request) @@ -11904,9 +11901,9 @@ def test_get_annotation_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_annotation_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_annotation_spec] = ( + mock_rpc + ) request = {} client.get_annotation_spec(request) @@ -12266,9 +12263,9 @@ def test_list_table_specs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_table_specs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_table_specs] = ( + mock_rpc + ) request = {} client.list_table_specs(request) @@ -12530,9 +12527,9 @@ def test_update_table_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_table_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_table_spec] = ( + mock_rpc + ) request = {} client.update_table_spec(request) @@ -12894,9 +12891,9 @@ def test_list_column_specs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_column_specs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_column_specs] = ( + mock_rpc + ) request = {} client.list_column_specs(request) @@ -13160,9 +13157,9 @@ def test_update_column_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_column_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_column_spec] = ( + mock_rpc + ) request = {} client.update_column_spec(request) @@ -14890,9 +14887,9 @@ def test_get_model_evaluation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_model_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_model_evaluation] = ( + mock_rpc + ) request = {} client.get_model_evaluation(request) @@ -15075,9 +15072,9 @@ def test_list_model_evaluations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_model_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_model_evaluations] = ( + mock_rpc + ) request = {} client.list_model_evaluations(request) diff --git a/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_prediction_service.py b/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_prediction_service.py index c0dfbb5db6df..f6b4f614702d 100644 --- a/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_prediction_service.py +++ b/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_prediction_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,16 +56,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.automl_v1beta1.services.prediction_service import ( PredictionServiceAsyncClient, @@ -996,10 +996,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1043,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1083,10 +1081,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1338,9 +1335,7 @@ def test_prediction_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/__init__.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/__init__.py index a1cf60fcc390..2ba4fc284c69 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/__init__.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.backup_dr import BackupDRAsyncClient, BackupDRClient from .services.backup_dr_protection_summary import ( BackupDrProtectionSummaryAsyncClient, diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/async_client.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/async_client.py index a84d334b5e89..99ad992f38f3 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/async_client.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.backupdr_v1 import gapic_version as package_version @@ -46,15 +46,17 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.backupdr_v1.services.backup_dr import pagers from google.cloud.backupdr_v1.types import ( @@ -164,7 +166,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BackupDRAsyncClient: The constructed client. """ - return BackupDRClient.from_service_account_info.__func__(BackupDRAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BackupDRClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(BackupDRAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -180,7 +185,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BackupDRAsyncClient: The constructed client. """ - return BackupDRClient.from_service_account_file.__func__(BackupDRAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BackupDRClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(BackupDRAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/client.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/client.py index 63c5da6a5602..f42c939c1c81 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/client.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.backupdr_v1 import gapic_version as package_version @@ -63,15 +63,17 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.backupdr_v1.services.backup_dr import pagers from google.cloud.backupdr_v1.types import ( @@ -918,11 +920,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BackupDRClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BackupDRClient._read_environment_variables() + ) self._client_cert_source = BackupDRClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -957,8 +957,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BackupDRTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/pagers.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/pagers.py index 47ed1bcd23c2..da9050ae8711 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/pagers.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/pagers.py @@ -73,7 +73,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -149,7 +149,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -305,7 +305,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -385,7 +385,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -461,7 +461,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -541,7 +541,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -617,7 +617,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -697,7 +697,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -773,7 +773,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -853,7 +853,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -931,7 +931,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1013,7 +1013,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1089,7 +1089,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1169,7 +1169,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1245,7 +1245,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1325,7 +1325,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1405,7 +1405,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1490,7 +1490,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1579,7 +1579,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1667,7 +1667,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1745,7 +1745,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1829,7 +1829,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1914,7 +1914,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/base.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/base.py index bbf3385198a7..5c9e5c0a0fc9 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/base.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.backupdr_v1 import gapic_version as package_version from google.cloud.backupdr_v1.types import ( @@ -902,13 +904,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc.py index ae742db7fe47..df4cf7cfd250 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.backupdr_v1.types import ( backupdr, @@ -535,12 +537,12 @@ def fetch_usable_backup_vaults( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_usable_backup_vaults" not in self._stubs: - self._stubs[ - "fetch_usable_backup_vaults" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchUsableBackupVaults", - request_serializer=backupvault.FetchUsableBackupVaultsRequest.serialize, - response_deserializer=backupvault.FetchUsableBackupVaultsResponse.deserialize, + self._stubs["fetch_usable_backup_vaults"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchUsableBackupVaults", + request_serializer=backupvault.FetchUsableBackupVaultsRequest.serialize, + response_deserializer=backupvault.FetchUsableBackupVaultsResponse.deserialize, + ) ) return self._stubs["fetch_usable_backup_vaults"] @@ -751,12 +753,12 @@ def fetch_backups_for_resource_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_backups_for_resource_type" not in self._stubs: - self._stubs[ - "fetch_backups_for_resource_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchBackupsForResourceType", - request_serializer=backupvault.FetchBackupsForResourceTypeRequest.serialize, - response_deserializer=backupvault.FetchBackupsForResourceTypeResponse.deserialize, + self._stubs["fetch_backups_for_resource_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchBackupsForResourceType", + request_serializer=backupvault.FetchBackupsForResourceTypeRequest.serialize, + response_deserializer=backupvault.FetchBackupsForResourceTypeResponse.deserialize, + ) ) return self._stubs["fetch_backups_for_resource_type"] @@ -1047,12 +1049,12 @@ def list_backup_plan_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_backup_plan_revisions" not in self._stubs: - self._stubs[ - "list_backup_plan_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanRevisions", - request_serializer=backupplan.ListBackupPlanRevisionsRequest.serialize, - response_deserializer=backupplan.ListBackupPlanRevisionsResponse.deserialize, + self._stubs["list_backup_plan_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanRevisions", + request_serializer=backupplan.ListBackupPlanRevisionsRequest.serialize, + response_deserializer=backupplan.ListBackupPlanRevisionsResponse.deserialize, + ) ) return self._stubs["list_backup_plan_revisions"] @@ -1078,12 +1080,12 @@ def create_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_backup_plan_association" not in self._stubs: - self._stubs[ - "create_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/CreateBackupPlanAssociation", - request_serializer=backupplanassociation.CreateBackupPlanAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/CreateBackupPlanAssociation", + request_serializer=backupplanassociation.CreateBackupPlanAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_backup_plan_association"] @@ -1109,12 +1111,12 @@ def update_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_backup_plan_association" not in self._stubs: - self._stubs[ - "update_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/UpdateBackupPlanAssociation", - request_serializer=backupplanassociation.UpdateBackupPlanAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/UpdateBackupPlanAssociation", + request_serializer=backupplanassociation.UpdateBackupPlanAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_backup_plan_association"] @@ -1140,12 +1142,12 @@ def get_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_backup_plan_association" not in self._stubs: - self._stubs[ - "get_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/GetBackupPlanAssociation", - request_serializer=backupplanassociation.GetBackupPlanAssociationRequest.serialize, - response_deserializer=backupplanassociation.BackupPlanAssociation.deserialize, + self._stubs["get_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/GetBackupPlanAssociation", + request_serializer=backupplanassociation.GetBackupPlanAssociationRequest.serialize, + response_deserializer=backupplanassociation.BackupPlanAssociation.deserialize, + ) ) return self._stubs["get_backup_plan_association"] @@ -1172,12 +1174,12 @@ def list_backup_plan_associations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_backup_plan_associations" not in self._stubs: - self._stubs[ - "list_backup_plan_associations" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanAssociations", - request_serializer=backupplanassociation.ListBackupPlanAssociationsRequest.serialize, - response_deserializer=backupplanassociation.ListBackupPlanAssociationsResponse.deserialize, + self._stubs["list_backup_plan_associations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanAssociations", + request_serializer=backupplanassociation.ListBackupPlanAssociationsRequest.serialize, + response_deserializer=backupplanassociation.ListBackupPlanAssociationsResponse.deserialize, + ) ) return self._stubs["list_backup_plan_associations"] @@ -1205,12 +1207,12 @@ def fetch_backup_plan_associations_for_resource_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_backup_plan_associations_for_resource_type" not in self._stubs: - self._stubs[ - "fetch_backup_plan_associations_for_resource_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchBackupPlanAssociationsForResourceType", - request_serializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeRequest.serialize, - response_deserializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeResponse.deserialize, + self._stubs["fetch_backup_plan_associations_for_resource_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchBackupPlanAssociationsForResourceType", + request_serializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeRequest.serialize, + response_deserializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeResponse.deserialize, + ) ) return self._stubs["fetch_backup_plan_associations_for_resource_type"] @@ -1236,12 +1238,12 @@ def delete_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_backup_plan_association" not in self._stubs: - self._stubs[ - "delete_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/DeleteBackupPlanAssociation", - request_serializer=backupplanassociation.DeleteBackupPlanAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/DeleteBackupPlanAssociation", + request_serializer=backupplanassociation.DeleteBackupPlanAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_backup_plan_association"] @@ -1325,12 +1327,12 @@ def list_data_source_references( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_data_source_references" not in self._stubs: - self._stubs[ - "list_data_source_references" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/ListDataSourceReferences", - request_serializer=datasourcereference.ListDataSourceReferencesRequest.serialize, - response_deserializer=datasourcereference.ListDataSourceReferencesResponse.deserialize, + self._stubs["list_data_source_references"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/ListDataSourceReferences", + request_serializer=datasourcereference.ListDataSourceReferencesRequest.serialize, + response_deserializer=datasourcereference.ListDataSourceReferencesResponse.deserialize, + ) ) return self._stubs["list_data_source_references"] @@ -1358,12 +1360,12 @@ def fetch_data_source_references_for_resource_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_data_source_references_for_resource_type" not in self._stubs: - self._stubs[ - "fetch_data_source_references_for_resource_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchDataSourceReferencesForResourceType", - request_serializer=datasourcereference.FetchDataSourceReferencesForResourceTypeRequest.serialize, - response_deserializer=datasourcereference.FetchDataSourceReferencesForResourceTypeResponse.deserialize, + self._stubs["fetch_data_source_references_for_resource_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchDataSourceReferencesForResourceType", + request_serializer=datasourcereference.FetchDataSourceReferencesForResourceTypeRequest.serialize, + response_deserializer=datasourcereference.FetchDataSourceReferencesForResourceTypeResponse.deserialize, + ) ) return self._stubs["fetch_data_source_references_for_resource_type"] diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc_asyncio.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc_asyncio.py index 1ea85b16888f..3c9f1d0ff52e 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc_asyncio.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.backupdr_v1.types import ( backupdr, @@ -553,12 +555,12 @@ def fetch_usable_backup_vaults( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_usable_backup_vaults" not in self._stubs: - self._stubs[ - "fetch_usable_backup_vaults" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchUsableBackupVaults", - request_serializer=backupvault.FetchUsableBackupVaultsRequest.serialize, - response_deserializer=backupvault.FetchUsableBackupVaultsResponse.deserialize, + self._stubs["fetch_usable_backup_vaults"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchUsableBackupVaults", + request_serializer=backupvault.FetchUsableBackupVaultsRequest.serialize, + response_deserializer=backupvault.FetchUsableBackupVaultsResponse.deserialize, + ) ) return self._stubs["fetch_usable_backup_vaults"] @@ -782,12 +784,12 @@ def fetch_backups_for_resource_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_backups_for_resource_type" not in self._stubs: - self._stubs[ - "fetch_backups_for_resource_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchBackupsForResourceType", - request_serializer=backupvault.FetchBackupsForResourceTypeRequest.serialize, - response_deserializer=backupvault.FetchBackupsForResourceTypeResponse.deserialize, + self._stubs["fetch_backups_for_resource_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchBackupsForResourceType", + request_serializer=backupvault.FetchBackupsForResourceTypeRequest.serialize, + response_deserializer=backupvault.FetchBackupsForResourceTypeResponse.deserialize, + ) ) return self._stubs["fetch_backups_for_resource_type"] @@ -1092,12 +1094,12 @@ def list_backup_plan_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_backup_plan_revisions" not in self._stubs: - self._stubs[ - "list_backup_plan_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanRevisions", - request_serializer=backupplan.ListBackupPlanRevisionsRequest.serialize, - response_deserializer=backupplan.ListBackupPlanRevisionsResponse.deserialize, + self._stubs["list_backup_plan_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanRevisions", + request_serializer=backupplan.ListBackupPlanRevisionsRequest.serialize, + response_deserializer=backupplan.ListBackupPlanRevisionsResponse.deserialize, + ) ) return self._stubs["list_backup_plan_revisions"] @@ -1123,12 +1125,12 @@ def create_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_backup_plan_association" not in self._stubs: - self._stubs[ - "create_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/CreateBackupPlanAssociation", - request_serializer=backupplanassociation.CreateBackupPlanAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/CreateBackupPlanAssociation", + request_serializer=backupplanassociation.CreateBackupPlanAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_backup_plan_association"] @@ -1154,12 +1156,12 @@ def update_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_backup_plan_association" not in self._stubs: - self._stubs[ - "update_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/UpdateBackupPlanAssociation", - request_serializer=backupplanassociation.UpdateBackupPlanAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/UpdateBackupPlanAssociation", + request_serializer=backupplanassociation.UpdateBackupPlanAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_backup_plan_association"] @@ -1185,12 +1187,12 @@ def get_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_backup_plan_association" not in self._stubs: - self._stubs[ - "get_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/GetBackupPlanAssociation", - request_serializer=backupplanassociation.GetBackupPlanAssociationRequest.serialize, - response_deserializer=backupplanassociation.BackupPlanAssociation.deserialize, + self._stubs["get_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/GetBackupPlanAssociation", + request_serializer=backupplanassociation.GetBackupPlanAssociationRequest.serialize, + response_deserializer=backupplanassociation.BackupPlanAssociation.deserialize, + ) ) return self._stubs["get_backup_plan_association"] @@ -1217,12 +1219,12 @@ def list_backup_plan_associations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_backup_plan_associations" not in self._stubs: - self._stubs[ - "list_backup_plan_associations" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanAssociations", - request_serializer=backupplanassociation.ListBackupPlanAssociationsRequest.serialize, - response_deserializer=backupplanassociation.ListBackupPlanAssociationsResponse.deserialize, + self._stubs["list_backup_plan_associations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanAssociations", + request_serializer=backupplanassociation.ListBackupPlanAssociationsRequest.serialize, + response_deserializer=backupplanassociation.ListBackupPlanAssociationsResponse.deserialize, + ) ) return self._stubs["list_backup_plan_associations"] @@ -1252,12 +1254,12 @@ def fetch_backup_plan_associations_for_resource_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_backup_plan_associations_for_resource_type" not in self._stubs: - self._stubs[ - "fetch_backup_plan_associations_for_resource_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchBackupPlanAssociationsForResourceType", - request_serializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeRequest.serialize, - response_deserializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeResponse.deserialize, + self._stubs["fetch_backup_plan_associations_for_resource_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchBackupPlanAssociationsForResourceType", + request_serializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeRequest.serialize, + response_deserializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeResponse.deserialize, + ) ) return self._stubs["fetch_backup_plan_associations_for_resource_type"] @@ -1283,12 +1285,12 @@ def delete_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_backup_plan_association" not in self._stubs: - self._stubs[ - "delete_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/DeleteBackupPlanAssociation", - request_serializer=backupplanassociation.DeleteBackupPlanAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/DeleteBackupPlanAssociation", + request_serializer=backupplanassociation.DeleteBackupPlanAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_backup_plan_association"] @@ -1373,12 +1375,12 @@ def list_data_source_references( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_data_source_references" not in self._stubs: - self._stubs[ - "list_data_source_references" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/ListDataSourceReferences", - request_serializer=datasourcereference.ListDataSourceReferencesRequest.serialize, - response_deserializer=datasourcereference.ListDataSourceReferencesResponse.deserialize, + self._stubs["list_data_source_references"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/ListDataSourceReferences", + request_serializer=datasourcereference.ListDataSourceReferencesRequest.serialize, + response_deserializer=datasourcereference.ListDataSourceReferencesResponse.deserialize, + ) ) return self._stubs["list_data_source_references"] @@ -1406,12 +1408,12 @@ def fetch_data_source_references_for_resource_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_data_source_references_for_resource_type" not in self._stubs: - self._stubs[ - "fetch_data_source_references_for_resource_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchDataSourceReferencesForResourceType", - request_serializer=datasourcereference.FetchDataSourceReferencesForResourceTypeRequest.serialize, - response_deserializer=datasourcereference.FetchDataSourceReferencesForResourceTypeResponse.deserialize, + self._stubs["fetch_data_source_references_for_resource_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchDataSourceReferencesForResourceType", + request_serializer=datasourcereference.FetchDataSourceReferencesForResourceTypeRequest.serialize, + response_deserializer=datasourcereference.FetchDataSourceReferencesForResourceTypeResponse.deserialize, + ) ) return self._stubs["fetch_data_source_references_for_resource_type"] diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest.py index dfdd98988f1a..2d8802ec5030 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2782,9 +2784,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseCreateBackupPlanAssociation._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseCreateBackupPlanAssociation._get_http_options() request, metadata = self._interceptor.pre_create_backup_plan_association( request, metadata @@ -2851,11 +2851,10 @@ def __call__( resp = self._interceptor.post_create_backup_plan_association(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_backup_plan_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_backup_plan_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3092,9 +3091,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseCreateManagementServer._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseCreateManagementServer._get_http_options() request, metadata = self._interceptor.pre_create_management_server( request, metadata @@ -3542,9 +3539,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseDeleteBackupPlanAssociation._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseDeleteBackupPlanAssociation._get_http_options() request, metadata = self._interceptor.pre_delete_backup_plan_association( request, metadata @@ -3606,11 +3601,10 @@ def __call__( resp = self._interceptor.post_delete_backup_plan_association(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_backup_plan_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_backup_plan_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3840,9 +3834,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseDeleteManagementServer._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseDeleteManagementServer._get_http_options() request, metadata = self._interceptor.pre_delete_management_server( request, metadata @@ -3993,15 +3985,12 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseFetchBackupPlanAssociationsForResourceType._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseFetchBackupPlanAssociationsForResourceType._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_fetch_backup_plan_associations_for_resource_type( - request, metadata + request, metadata = ( + self._interceptor.pre_fetch_backup_plan_associations_for_resource_type( + request, metadata + ) ) transcoded_request = _BaseBackupDRRestTransport._BaseFetchBackupPlanAssociationsForResourceType._get_transcoded_request( http_options, request @@ -4055,9 +4044,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - backupplanassociation.FetchBackupPlanAssociationsForResourceTypeResponse() - ) + resp = backupplanassociation.FetchBackupPlanAssociationsForResourceTypeResponse() pb_resp = backupplanassociation.FetchBackupPlanAssociationsForResourceTypeResponse.pb( resp ) @@ -4070,11 +4057,10 @@ def __call__( ) ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_backup_plan_associations_for_resource_type_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_backup_plan_associations_for_resource_type_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4159,9 +4145,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseFetchBackupsForResourceType._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseFetchBackupsForResourceType._get_http_options() request, metadata = self._interceptor.pre_fetch_backups_for_resource_type( request, metadata @@ -4225,11 +4209,10 @@ def __call__( resp = self._interceptor.post_fetch_backups_for_resource_type(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_backups_for_resource_type_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_backups_for_resource_type_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4321,15 +4304,12 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseFetchDataSourceReferencesForResourceType._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseFetchDataSourceReferencesForResourceType._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_fetch_data_source_references_for_resource_type( - request, metadata + request, metadata = ( + self._interceptor.pre_fetch_data_source_references_for_resource_type( + request, metadata + ) ) transcoded_request = _BaseBackupDRRestTransport._BaseFetchDataSourceReferencesForResourceType._get_transcoded_request( http_options, request @@ -4400,11 +4380,10 @@ def __call__( ) ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_data_source_references_for_resource_type_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_data_source_references_for_resource_type_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4489,9 +4468,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseFetchUsableBackupVaults._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseFetchUsableBackupVaults._get_http_options() request, metadata = self._interceptor.pre_fetch_usable_backup_vaults( request, metadata @@ -4940,9 +4917,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseGetBackupPlanAssociation._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseGetBackupPlanAssociation._get_http_options() request, metadata = self._interceptor.pre_get_backup_plan_association( request, metadata @@ -5091,9 +5066,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseGetBackupPlanRevision._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseGetBackupPlanRevision._get_http_options() request, metadata = self._interceptor.pre_get_backup_plan_revision( request, metadata @@ -5546,9 +5519,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseGetDataSourceReference._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseGetDataSourceReference._get_http_options() request, metadata = self._interceptor.pre_get_data_source_reference( request, metadata @@ -6001,9 +5972,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseListBackupPlanAssociations._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseListBackupPlanAssociations._get_http_options() request, metadata = self._interceptor.pre_list_backup_plan_associations( request, metadata @@ -6067,11 +6036,10 @@ def __call__( resp = self._interceptor.post_list_backup_plan_associations(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_backup_plan_associations_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_backup_plan_associations_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6156,9 +6124,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseListBackupPlanRevisions._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseListBackupPlanRevisions._get_http_options() request, metadata = self._interceptor.pre_list_backup_plan_revisions( request, metadata @@ -6761,9 +6727,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseListDataSourceReferences._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseListDataSourceReferences._get_http_options() request, metadata = self._interceptor.pre_list_data_source_references( request, metadata @@ -7069,9 +7033,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseListManagementServers._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseListManagementServers._get_http_options() request, metadata = self._interceptor.pre_list_management_servers( request, metadata @@ -7847,9 +7809,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseUpdateBackupPlanAssociation._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseUpdateBackupPlanAssociation._get_http_options() request, metadata = self._interceptor.pre_update_backup_plan_association( request, metadata @@ -7916,11 +7876,10 @@ def __call__( resp = self._interceptor.post_update_backup_plan_association(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_backup_plan_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_backup_plan_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8274,7 +8233,9 @@ def create_backup_plan_association( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateBackupPlanAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateBackupPlanAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_backup_vault( @@ -8290,7 +8251,9 @@ def create_management_server( ) -> Callable[[backupdr.CreateManagementServerRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateManagementServer(self._session, self._host, self._interceptor) # type: ignore + return self._CreateManagementServer( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_backup( @@ -8317,7 +8280,9 @@ def delete_backup_plan_association( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteBackupPlanAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteBackupPlanAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_backup_vault( @@ -8333,7 +8298,9 @@ def delete_management_server( ) -> Callable[[backupdr.DeleteManagementServerRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteManagementServer(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteManagementServer( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_backup_plan_associations_for_resource_type( @@ -8344,7 +8311,9 @@ def fetch_backup_plan_associations_for_resource_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchBackupPlanAssociationsForResourceType(self._session, self._host, self._interceptor) # type: ignore + return self._FetchBackupPlanAssociationsForResourceType( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_backups_for_resource_type( @@ -8355,7 +8324,9 @@ def fetch_backups_for_resource_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchBackupsForResourceType(self._session, self._host, self._interceptor) # type: ignore + return self._FetchBackupsForResourceType( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_data_source_references_for_resource_type( @@ -8366,7 +8337,9 @@ def fetch_data_source_references_for_resource_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchDataSourceReferencesForResourceType(self._session, self._host, self._interceptor) # type: ignore + return self._FetchDataSourceReferencesForResourceType( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_usable_backup_vaults( @@ -8377,7 +8350,9 @@ def fetch_usable_backup_vaults( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchUsableBackupVaults(self._session, self._host, self._interceptor) # type: ignore + return self._FetchUsableBackupVaults( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_backup( @@ -8404,7 +8379,9 @@ def get_backup_plan_association( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetBackupPlanAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._GetBackupPlanAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_backup_plan_revision( @@ -8441,7 +8418,9 @@ def get_data_source_reference( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetDataSourceReference(self._session, self._host, self._interceptor) # type: ignore + return self._GetDataSourceReference( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_management_server( @@ -8468,7 +8447,9 @@ def list_backup_plan_associations( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListBackupPlanAssociations(self._session, self._host, self._interceptor) # type: ignore + return self._ListBackupPlanAssociations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_backup_plan_revisions( @@ -8479,7 +8460,9 @@ def list_backup_plan_revisions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListBackupPlanRevisions(self._session, self._host, self._interceptor) # type: ignore + return self._ListBackupPlanRevisions( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_backup_plans( @@ -8518,7 +8501,9 @@ def list_data_source_references( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListDataSourceReferences(self._session, self._host, self._interceptor) # type: ignore + return self._ListDataSourceReferences( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_data_sources( @@ -8583,7 +8568,9 @@ def update_backup_plan_association( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateBackupPlanAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateBackupPlanAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_backup_vault( diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest_base.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest_base.py index 8d686adec184..c2c4bc1e49e8 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest_base.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/async_client.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/async_client.py index 1725d3b6b4b4..2f1c2898c82f 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/async_client.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.backupdr_v1 import gapic_version as package_version @@ -45,8 +45,10 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.backupdr_v1.services.backup_dr_protection_summary import pagers @@ -130,7 +132,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BackupDrProtectionSummaryAsyncClient: The constructed client. """ - return BackupDrProtectionSummaryClient.from_service_account_info.__func__(BackupDrProtectionSummaryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BackupDrProtectionSummaryClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(BackupDrProtectionSummaryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +151,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BackupDrProtectionSummaryAsyncClient: The constructed client. """ - return BackupDrProtectionSummaryClient.from_service_account_file.__func__(BackupDrProtectionSummaryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BackupDrProtectionSummaryClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + BackupDrProtectionSummaryAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -184,7 +194,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return BackupDrProtectionSummaryClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return BackupDrProtectionSummaryClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> BackupDrProtectionSummaryTransport: diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/client.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/client.py index 0181cd69131e..064a8487af0d 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/client.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.backupdr_v1 import gapic_version as package_version @@ -62,8 +62,10 @@ _LOGGER = std_logging.getLogger(__name__) from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.backupdr_v1.services.backup_dr_protection_summary import pagers @@ -83,9 +85,7 @@ class BackupDrProtectionSummaryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BackupDrProtectionSummaryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BackupDrProtectionSummaryTransport]] _transport_registry["grpc"] = BackupDrProtectionSummaryGrpcTransport _transport_registry["grpc_asyncio"] = BackupDrProtectionSummaryGrpcAsyncIOTransport _transport_registry["rest"] = BackupDrProtectionSummaryRestTransport @@ -631,11 +631,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BackupDrProtectionSummaryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BackupDrProtectionSummaryClient._read_environment_variables() + ) self._client_cert_source = ( BackupDrProtectionSummaryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -672,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BackupDrProtectionSummaryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/pagers.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/pagers.py index ce119ada6e5e..3e405b3c239b 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/pagers.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/__init__.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/__init__.py index 103fc6a34295..5c5e36c2e32e 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/__init__.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[BackupDrProtectionSummaryTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[BackupDrProtectionSummaryTransport]] _transport_registry["grpc"] = BackupDrProtectionSummaryGrpcTransport _transport_registry["grpc_asyncio"] = BackupDrProtectionSummaryGrpcAsyncIOTransport _transport_registry["rest"] = BackupDrProtectionSummaryRestTransport diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/base.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/base.py index 01231fa6965c..c6b3a6493f84 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/base.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.backupdr_v1 import gapic_version as package_version from google.cloud.backupdr_v1.types import protection_summary @@ -246,13 +248,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc.py index f51a998d9a33..517ebfe9ec32 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.backupdr_v1.types import protection_summary @@ -347,12 +349,12 @@ def list_resource_backup_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_resource_backup_configs" not in self._stubs: - self._stubs[ - "list_resource_backup_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDrProtectionSummary/ListResourceBackupConfigs", - request_serializer=protection_summary.ListResourceBackupConfigsRequest.serialize, - response_deserializer=protection_summary.ListResourceBackupConfigsResponse.deserialize, + self._stubs["list_resource_backup_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDrProtectionSummary/ListResourceBackupConfigs", + request_serializer=protection_summary.ListResourceBackupConfigsRequest.serialize, + response_deserializer=protection_summary.ListResourceBackupConfigsResponse.deserialize, + ) ) return self._stubs["list_resource_backup_configs"] diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc_asyncio.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc_asyncio.py index 1895493143cb..803f4b9ad8b5 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc_asyncio.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.backupdr_v1.types import protection_summary @@ -355,12 +357,12 @@ def list_resource_backup_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_resource_backup_configs" not in self._stubs: - self._stubs[ - "list_resource_backup_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDrProtectionSummary/ListResourceBackupConfigs", - request_serializer=protection_summary.ListResourceBackupConfigsRequest.serialize, - response_deserializer=protection_summary.ListResourceBackupConfigsResponse.deserialize, + self._stubs["list_resource_backup_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDrProtectionSummary/ListResourceBackupConfigs", + request_serializer=protection_summary.ListResourceBackupConfigsRequest.serialize, + response_deserializer=protection_summary.ListResourceBackupConfigsResponse.deserialize, + ) ) return self._stubs["list_resource_backup_configs"] diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest.py index 0230d3ef62c5..f3c0a6984b67 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -511,9 +513,7 @@ def __call__( """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseListResourceBackupConfigs._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseListResourceBackupConfigs._get_http_options() request, metadata = self._interceptor.pre_list_resource_backup_configs( request, metadata @@ -616,7 +616,9 @@ def list_resource_backup_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListResourceBackupConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListResourceBackupConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -676,9 +678,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseBackupDrProtectionSummaryRestTransport._BaseGetLocation._get_transcoded_request( @@ -819,9 +819,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseBackupDrProtectionSummaryRestTransport._BaseListLocations._get_transcoded_request( @@ -962,9 +960,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseBackupDrProtectionSummaryRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1106,9 +1102,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseBackupDrProtectionSummaryRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1255,9 +1249,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1401,9 +1393,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1523,9 +1513,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1643,9 +1631,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseBackupDrProtectionSummaryRestTransport._BaseGetOperation._get_transcoded_request( @@ -1786,9 +1772,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseBackupDrProtectionSummaryRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest_base.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest_base.py index 9652ff7ba879..95c19a66ebce 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest_base.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/__init__.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/__init__.py index 3fc2a7f4b72c..47a99d901b21 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/__init__.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/__init__.py @@ -102,7 +102,9 @@ AlloyDbClusterBackupProperties, AlloyDBClusterDataSourceProperties, ) -from .backupvault_ba import BackupApplianceBackupProperties +from .backupvault_ba import ( + BackupApplianceBackupProperties, +) from .backupvault_cloudsql import ( CloudSqlInstanceBackupPlanAssociationProperties, CloudSqlInstanceBackupProperties, diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupdr.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupdr.py index 7358fe0d90aa..6badb9df307f 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupdr.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupdr.py @@ -69,6 +69,7 @@ class PeeringMode(proto.Enum): provides an IP address range for multiple Google Cloud services, including Cloud BackupDR. """ + PEERING_MODE_UNSPECIFIED = 0 PRIVATE_SERVICE_ACCESS = 1 @@ -227,6 +228,7 @@ class InstanceType(proto.Enum): Instance for backup and restore management (i.e., AGM). """ + INSTANCE_TYPE_UNSPECIFIED = 0 BACKUP_RESTORE = 1 @@ -260,6 +262,7 @@ class InstanceState(proto.Enum): from the statusMessage field of Instance resource. """ + INSTANCE_STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplan.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplan.py index 3310515f7576..9aa944e2994c 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplan.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplan.py @@ -142,6 +142,7 @@ class State(proto.Enum): UPDATING (5): The resource is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -351,6 +352,7 @@ class RecurrenceType(proto.Enum): YEARLY (5): The ``BackupRule`` is to be applied yearly. """ + RECURRENCE_TYPE_UNSPECIFIED = 0 HOURLY = 1 DAILY = 2 @@ -459,6 +461,7 @@ class WeekOfMonth(proto.Enum): LAST (5): The last week of the month. """ + WEEK_OF_MONTH_UNSPECIFIED = 0 FIRST = 1 SECOND = 2 @@ -790,6 +793,7 @@ class State(proto.Enum): The resource has been created but is not usable. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplanassociation.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplanassociation.py index 4199fcab7035..8ba8f5dffeef 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplanassociation.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplanassociation.py @@ -127,6 +127,7 @@ class State(proto.Enum): UPDATING (5): The resource is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -223,6 +224,7 @@ class LastBackupState(proto.Enum): FAILED (4): The last backup operation failed. """ + LAST_BACKUP_STATE_UNSPECIFIED = 0 FIRST_BACKUP_PENDING = 1 PERMISSION_DENIED = 2 @@ -373,12 +375,12 @@ class ListBackupPlanAssociationsResponse(proto.Message): def raw_page(self): return self - backup_plan_associations: MutableSequence[ - "BackupPlanAssociation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="BackupPlanAssociation", + backup_plan_associations: MutableSequence["BackupPlanAssociation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="BackupPlanAssociation", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -481,12 +483,12 @@ class FetchBackupPlanAssociationsForResourceTypeResponse(proto.Message): def raw_page(self): return self - backup_plan_associations: MutableSequence[ - "BackupPlanAssociation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="BackupPlanAssociation", + backup_plan_associations: MutableSequence["BackupPlanAssociation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="BackupPlanAssociation", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault.py index 01cbc9938449..ac9ae7a2de74 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault.py @@ -92,6 +92,7 @@ class BackupConfigState(proto.Enum): The data source is no longer protected (but may have backups under it) """ + BACKUP_CONFIG_STATE_UNSPECIFIED = 0 ACTIVE = 1 PASSIVE = 2 @@ -112,6 +113,7 @@ class BackupView(proto.Enum): This is the default value (for both ListBackups and GetBackup). """ + BACKUP_VIEW_UNSPECIFIED = 0 BACKUP_VIEW_BASIC = 1 BACKUP_VIEW_FULL = 2 @@ -133,6 +135,7 @@ class BackupVaultView(proto.Enum): This is the default value (for both ListBackupVaults and GetBackupVault). """ + BACKUP_VAULT_VIEW_UNSPECIFIED = 0 BACKUP_VAULT_VIEW_BASIC = 1 BACKUP_VAULT_VIEW_FULL = 2 @@ -256,6 +259,7 @@ class BackupRetentionInheritance(proto.Enum): together and have the same value. Invalid update requests will be rejected by the server. """ + BACKUP_RETENTION_INHERITANCE_UNSPECIFIED = 0 INHERIT_VAULT_RETENTION = 1 MATCH_BACKUP_EXPIRE_TIME = 2 @@ -279,6 +283,7 @@ class State(proto.Enum): UPDATING (5): The backup vault is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -307,6 +312,7 @@ class AccessRestriction(proto.Enum): current organization will be denied except for backup appliance. """ + ACCESS_RESTRICTION_UNSPECIFIED = 0 WITHIN_PROJECT = 1 WITHIN_ORGANIZATION = 2 @@ -523,6 +529,7 @@ class State(proto.Enum): The data source is experiencing an issue and might be unusable. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -651,6 +658,7 @@ class LastBackupState(proto.Enum): The most recent backup could not be run/failed because of the lack of permissions """ + LAST_BACKUP_STATE_UNSPECIFIED = 0 FIRST_BACKUP_PENDING = 1 SUCCEEDED = 2 @@ -1211,6 +1219,7 @@ class State(proto.Enum): UPLOADING (5): The backup is being uploaded. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -1231,6 +1240,7 @@ class BackupType(proto.Enum): ON_DEMAND_OPERATIONAL (3): Operational backup. """ + BACKUP_TYPE_UNSPECIFIED = 0 SCHEDULED = 1 ON_DEMAND = 2 diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_cloudsql.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_cloudsql.py index c4e200ac2892..2ffa329e79df 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_cloudsql.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_cloudsql.py @@ -188,6 +188,7 @@ class Edition(proto.Enum): ENTERPRISE_PLUS (2): Enterprise Plus edition. """ + EDITION_UNSPECIFIED = 0 ENTERPRISE = 1 ENTERPRISE_PLUS = 2 diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_disk.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_disk.py index 02c7ab10a04a..90704e09550c 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_disk.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_disk.py @@ -195,6 +195,7 @@ class AccessMode(proto.Enum): The AccessMode means the disk can be attached to multiple instances in RO mode. """ + READ_WRITE_SINGLE = 0 READ_WRITE_MANY = 1 READ_ONLY_MANY = 2 @@ -210,6 +211,7 @@ class Architecture(proto.Enum): ARM64 (2): Disks with architecture ARM64 """ + ARCHITECTURE_UNSPECIFIED = 0 X86_64 = 1 ARM64 = 2 @@ -233,12 +235,12 @@ class Architecture(proto.Enum): proto.STRING, number=4, ) - guest_os_feature: MutableSequence[ - backupvault_gce.GuestOsFeature - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=backupvault_gce.GuestOsFeature, + guest_os_feature: MutableSequence[backupvault_gce.GuestOsFeature] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=backupvault_gce.GuestOsFeature, + ) ) disk_encryption_key: backupvault_gce.CustomerEncryptionKey = proto.Field( proto.MESSAGE, @@ -367,6 +369,7 @@ class Architecture(proto.Enum): ARM64 (2): Disks with architecture ARM64 """ + ARCHITECTURE_UNSPECIFIED = 0 X86_64 = 1 ARM64 = 2 @@ -380,12 +383,12 @@ class Architecture(proto.Enum): proto.STRING, number=2, ) - guest_os_feature: MutableSequence[ - backupvault_gce.GuestOsFeature - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=backupvault_gce.GuestOsFeature, + guest_os_feature: MutableSequence[backupvault_gce.GuestOsFeature] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=backupvault_gce.GuestOsFeature, + ) ) architecture: Architecture = proto.Field( proto.ENUM, diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_gce.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_gce.py index 9c0a89e1bc34..85563eb8213d 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_gce.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_gce.py @@ -64,6 +64,7 @@ class KeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 0 NONE = 1 STOP = 2 @@ -413,6 +414,7 @@ class InstancePrivateIpv6GoogleAccess(proto.Enum): network interface will be assigned an internal IPv6 prefix if it doesn't have before. """ + INSTANCE_PRIVATE_IPV6_GOOGLE_ACCESS_UNSPECIFIED = 0 INHERIT_FROM_SUBNETWORK = 1 ENABLE_OUTBOUND_VM_ACCESS_TO_GOOGLE = 2 @@ -965,6 +967,7 @@ class StackType(proto.Enum): The network interface can have both IPv4 and IPv6 addresses. """ + STACK_TYPE_UNSPECIFIED = 0 IPV4_ONLY = 1 IPV4_IPV6 = 2 @@ -983,6 +986,7 @@ class Ipv6AccessType(proto.Enum): This network interface can have external IPv6. """ + UNSPECIFIED_IPV6_ACCESS_TYPE = 0 INTERNAL = 1 EXTERNAL = 2 @@ -998,6 +1002,7 @@ class NicType(proto.Enum): GVNIC (2): GVNIC """ + NIC_TYPE_UNSPECIFIED = 0 VIRTIO_NET = 1 GVNIC = 2 @@ -1101,6 +1106,7 @@ class Tier(proto.Enum): TIER_1 (2): Tier 1 network performance config. """ + TIER_UNSPECIFIED = 0 DEFAULT = 1 TIER_1 = 2 @@ -1177,6 +1183,7 @@ class AccessType(proto.Enum): DIRECT_IPV6 (2): Direct IPv6 access. """ + ACCESS_TYPE_UNSPECIFIED = 0 ONE_TO_ONE_NAT = 1 DIRECT_IPV6 = 2 @@ -1195,6 +1202,7 @@ class NetworkTier(proto.Enum): Public internet quality, only limited support for other networking products. """ + NETWORK_TIER_UNSPECIFIED = 0 PREMIUM = 1 STANDARD = 2 @@ -1331,6 +1339,7 @@ class Type(proto.Enum): Must specify key value fields for specifying the reservations. """ + TYPE_UNSPECIFIED = 0 NO_RESERVATION = 1 ANY_RESERVATION = 2 @@ -1421,6 +1430,7 @@ class OnHostMaintenance(proto.Enum): automatically migrate instances out of the way of maintenance events. """ + ON_HOST_MAINTENANCE_UNSPECIFIED = 0 TERMINATE = 1 MIGRATE = 1000 @@ -1437,6 +1447,7 @@ class ProvisioningModel(proto.Enum): SPOT (2): Heavily discounted, no guaranteed runtime. """ + PROVISIONING_MODEL_UNSPECIFIED = 0 STANDARD = 1 SPOT = 2 @@ -1453,6 +1464,7 @@ class InstanceTerminationAction(proto.Enum): Stop the VM without storing in-memory content. default action. """ + INSTANCE_TERMINATION_ACTION_UNSPECIFIED = 0 DELETE = 1 STOP = 2 @@ -1493,6 +1505,7 @@ class Operator(proto.Enum): Requires Compute Engine to avoid certain nodes. """ + OPERATOR_UNSPECIFIED = 0 IN = 1 NOT_IN = 2 @@ -1738,6 +1751,7 @@ class DiskType(proto.Enum): PERSISTENT (2): A persistent disk type. """ + DISK_TYPE_UNSPECIFIED = 0 SCRATCH = 1 PERSISTENT = 2 @@ -1763,6 +1777,7 @@ class DiskMode(proto.Enum): a disk to prevent mounting the disk while it is being snapshotted. """ + DISK_MODE_UNSPECIFIED = 0 READ_WRITE = 1 READ_ONLY = 2 @@ -1783,6 +1798,7 @@ class DiskInterface(proto.Enum): ISCSI (4): ISCSI Disk Interface. """ + DISK_INTERFACE_UNSPECIFIED = 0 SCSI = 1 NVME = 2 @@ -1798,6 +1814,7 @@ class DiskSavedState(proto.Enum): PRESERVED (1): Disk state has been preserved. """ + DISK_SAVED_STATE_UNSPECIFIED = 0 PRESERVED = 1 @@ -1969,6 +1986,7 @@ class FeatureType(proto.Enum): SEV_LIVE_MIGRATABLE_V2 (14): SEV_LIVE_MIGRATABLE_V2 feature type. """ + FEATURE_TYPE_UNSPECIFIED = 0 VIRTIO_SCSI_MULTIQUEUE = 1 WINDOWS = 2 diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/datasourcereference.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/datasourcereference.py index ada8714a930e..a4d5afa672ef 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/datasourcereference.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/datasourcereference.py @@ -283,12 +283,12 @@ class ListDataSourceReferencesResponse(proto.Message): def raw_page(self): return self - data_source_references: MutableSequence[ - "DataSourceReference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="DataSourceReference", + data_source_references: MutableSequence["DataSourceReference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="DataSourceReference", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -395,12 +395,12 @@ class FetchDataSourceReferencesForResourceTypeResponse(proto.Message): def raw_page(self): return self - data_source_references: MutableSequence[ - "DataSourceReference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="DataSourceReference", + data_source_references: MutableSequence["DataSourceReference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="DataSourceReference", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/protection_summary.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/protection_summary.py index 1c90020e84b6..ffd46ebfcd3c 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/protection_summary.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/protection_summary.py @@ -99,12 +99,12 @@ class ListResourceBackupConfigsResponse(proto.Message): def raw_page(self): return self - resource_backup_configs: MutableSequence[ - "ResourceBackupConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ResourceBackupConfig", + resource_backup_configs: MutableSequence["ResourceBackupConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ResourceBackupConfig", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -174,6 +174,7 @@ class ResourceType(proto.Enum): COMPUTE_ENGINE_REGIONAL_DISK (4): Compute Engine Regional Disk. """ + RESOURCE_TYPE_UNSPECIFIED = 0 CLOUD_SQL_INSTANCE = 1 COMPUTE_ENGINE_VM = 2 @@ -206,12 +207,12 @@ class ResourceType(proto.Enum): proto.STRING, number=6, ) - backup_configs_details: MutableSequence[ - "BackupConfigDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message="BackupConfigDetails", + backup_configs_details: MutableSequence["BackupConfigDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message="BackupConfigDetails", + ) ) backup_configured: bool = proto.Field( proto.BOOL, @@ -305,6 +306,7 @@ class Type(proto.Enum): Backup config is Google Cloud Backup and DR's Template. """ + TYPE_UNSPECIFIED = 0 CLOUD_SQL_INSTANCE_BACKUP_CONFIG = 1 COMPUTE_ENGINE_RESOURCE_POLICY = 2 @@ -331,6 +333,7 @@ class State(proto.Enum): Like the source project is deleted. For eg. PlanAssociation, BackupPlan is deleted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 @@ -494,6 +497,7 @@ class Type(proto.Enum): MULTI_REGIONAL (3): Location type is multi regional. """ + TYPE_UNSPECIFIED = 0 ZONAL = 1 REGIONAL = 2 diff --git a/packages/google-cloud-backupdr/mypy.ini b/packages/google-cloud-backupdr/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-backupdr/mypy.ini +++ b/packages/google-cloud-backupdr/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-backupdr/noxfile.py b/packages/google-cloud-backupdr/noxfile.py index 534835ace6aa..e8e65c9f8202 100644 --- a/packages/google-cloud-backupdr/noxfile.py +++ b/packages/google-cloud-backupdr/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr.py b/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr.py index ae2dfdc4c830..2a9e0aa992fc 100644 --- a/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr.py +++ b/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,19 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.month_pb2 as month_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,28 +64,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore -import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore -import google.type.month_pb2 as month_pb2 # type: ignore from google.cloud.backupdr_v1.services.backup_dr import ( BackupDRAsyncClient, @@ -941,10 +943,9 @@ def test_backup_dr_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +990,9 @@ def test_backup_dr_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1028,9 @@ def test_backup_dr_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1260,9 +1259,7 @@ def test_backup_dr_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1944,9 +1941,9 @@ def test_get_management_server_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_management_server - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_management_server] = ( + mock_rpc + ) request = {} client.get_management_server(request) @@ -3016,9 +3013,9 @@ def test_create_backup_vault_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_vault] = ( + mock_rpc + ) request = {} client.create_backup_vault(request) @@ -3392,9 +3389,9 @@ def test_list_backup_vaults_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_vaults - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_vaults] = ( + mock_rpc + ) request = {} client.list_backup_vaults(request) @@ -4514,9 +4511,9 @@ def test_get_backup_vault_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backup_vault] = ( + mock_rpc + ) request = {} client.get_backup_vault(request) @@ -4864,9 +4861,9 @@ def test_update_backup_vault_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_vault] = ( + mock_rpc + ) request = {} client.update_backup_vault(request) @@ -5221,9 +5218,9 @@ def test_delete_backup_vault_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_vault] = ( + mock_rpc + ) request = {} client.delete_backup_vault(request) @@ -5575,9 +5572,9 @@ def test_list_data_sources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_sources] = ( + mock_rpc + ) request = {} client.list_data_sources(request) @@ -6460,9 +6457,9 @@ def test_update_data_source_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_source - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_source] = ( + mock_rpc + ) request = {} client.update_data_source(request) @@ -9255,9 +9252,9 @@ def test_create_backup_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_plan] = ( + mock_rpc + ) request = {} client.create_backup_plan(request) @@ -9616,9 +9613,9 @@ def test_update_backup_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_plan] = ( + mock_rpc + ) request = {} client.update_backup_plan(request) @@ -10343,9 +10340,9 @@ def test_list_backup_plans_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_plans - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_plans] = ( + mock_rpc + ) request = {} client.list_backup_plans(request) @@ -10885,9 +10882,9 @@ def test_delete_backup_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_plan] = ( + mock_rpc + ) request = {} client.delete_backup_plan(request) @@ -16619,9 +16616,9 @@ def test_initialize_service_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.initialize_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.initialize_service] = ( + mock_rpc + ) request = {} client.initialize_service(request) @@ -17079,9 +17076,9 @@ def test_get_management_server_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_management_server - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_management_server] = ( + mock_rpc + ) request = {} client.get_management_server(request) @@ -17672,9 +17669,9 @@ def test_create_backup_vault_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_vault] = ( + mock_rpc + ) request = {} client.create_backup_vault(request) @@ -17894,9 +17891,9 @@ def test_list_backup_vaults_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_vaults - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_vaults] = ( + mock_rpc + ) request = {} client.list_backup_vaults(request) @@ -18423,9 +18420,9 @@ def test_get_backup_vault_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backup_vault] = ( + mock_rpc + ) request = {} client.get_backup_vault(request) @@ -18609,9 +18606,9 @@ def test_update_backup_vault_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_vault] = ( + mock_rpc + ) request = {} client.update_backup_vault(request) @@ -18818,9 +18815,9 @@ def test_delete_backup_vault_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_vault] = ( + mock_rpc + ) request = {} client.delete_backup_vault(request) @@ -19022,9 +19019,9 @@ def test_list_data_sources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_sources] = ( + mock_rpc + ) request = {} client.list_data_sources(request) @@ -19470,9 +19467,9 @@ def test_update_data_source_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_source - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_source] = ( + mock_rpc + ) request = {} client.update_data_source(request) @@ -20976,9 +20973,9 @@ def test_create_backup_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_plan] = ( + mock_rpc + ) request = {} client.create_backup_plan(request) @@ -21196,9 +21193,9 @@ def test_update_backup_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_plan] = ( + mock_rpc + ) request = {} client.update_backup_plan(request) @@ -21577,9 +21574,9 @@ def test_list_backup_plans_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_plans - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_plans] = ( + mock_rpc + ) request = {} client.list_backup_plans(request) @@ -21841,9 +21838,9 @@ def test_delete_backup_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_plan] = ( + mock_rpc + ) request = {} client.delete_backup_plan(request) @@ -24853,9 +24850,9 @@ def test_initialize_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.initialize_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.initialize_service] = ( + mock_rpc + ) request = {} client.initialize_service(request) diff --git a/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr_protection_summary.py b/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr_protection_summary.py index 004b3ae35fc2..cad216b14248 100644 --- a/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr_protection_summary.py +++ b/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr_protection_summary.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -1013,10 +1020,9 @@ def test_backup_dr_protection_summary_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1067,9 @@ def test_backup_dr_protection_summary_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1105,9 @@ def test_backup_dr_protection_summary_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1366,9 +1370,7 @@ def test_backup_dr_protection_summary_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/__init__.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/__init__.py index 93289bed9b5c..7a83511f942a 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/__init__.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.bare_metal_solution import ( BareMetalSolutionAsyncClient, BareMetalSolutionClient, diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/async_client.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/async_client.py index 196c646cd3b3..0abd612cb99b 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/async_client.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bare_metal_solution_v2 import gapic_version as package_version @@ -46,32 +46,38 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.bare_metal_solution_v2.services.bare_metal_solution import pagers -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + baremetalsolution, + common, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import baremetalsolution, common -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) from .client import BareMetalSolutionClient from .transports.base import DEFAULT_CLIENT_INFO, BareMetalSolutionTransport @@ -204,7 +210,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BareMetalSolutionAsyncClient: The constructed client. """ - return BareMetalSolutionClient.from_service_account_info.__func__(BareMetalSolutionAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BareMetalSolutionClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(BareMetalSolutionAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -220,7 +229,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BareMetalSolutionAsyncClient: The constructed client. """ - return BareMetalSolutionClient.from_service_account_file.__func__(BareMetalSolutionAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BareMetalSolutionClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(BareMetalSolutionAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/client.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/client.py index d4e0a093d494..8d4db1088095 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/client.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bare_metal_solution_v2 import gapic_version as package_version @@ -63,32 +63,38 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.bare_metal_solution_v2.services.bare_metal_solution import pagers -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + baremetalsolution, + common, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import baremetalsolution, common -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) from .transports.base import DEFAULT_CLIENT_INFO, BareMetalSolutionTransport from .transports.grpc import BareMetalSolutionGrpcTransport @@ -104,9 +110,7 @@ class BareMetalSolutionClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BareMetalSolutionTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BareMetalSolutionTransport]] _transport_registry["grpc"] = BareMetalSolutionGrpcTransport _transport_registry["grpc_asyncio"] = BareMetalSolutionGrpcAsyncIOTransport _transport_registry["rest"] = BareMetalSolutionRestTransport @@ -993,11 +997,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BareMetalSolutionClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BareMetalSolutionClient._read_environment_variables() + ) self._client_cert_source = BareMetalSolutionClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1032,8 +1034,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BareMetalSolutionTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/pagers.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/pagers.py index c8121b7773b2..37bd8ece0f77 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/pagers.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/pagers.py @@ -77,7 +77,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -153,7 +153,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -233,7 +233,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -309,7 +309,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -389,7 +389,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -465,7 +465,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -545,7 +545,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -621,7 +621,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -701,7 +701,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -777,7 +777,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -857,7 +857,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -933,7 +933,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1013,7 +1013,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1089,7 +1089,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1169,7 +1169,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1245,7 +1245,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1325,7 +1325,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1401,7 +1401,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/base.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/base.py index b56aca45c25d..9a6dc18d16c9 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/base.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/base.py @@ -17,36 +17,41 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.bare_metal_solution_v2 import gapic_version as package_version -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc.py index 1b63f7dfd94e..c06656bd6543 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc.py @@ -16,39 +16,44 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 -import proto # type: ignore -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) from .base import DEFAULT_CLIENT_INFO, BareMetalSolutionTransport @@ -575,12 +580,12 @@ def enable_interactive_serial_console( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_interactive_serial_console" not in self._stubs: - self._stubs[ - "enable_interactive_serial_console" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/EnableInteractiveSerialConsole", - request_serializer=instance.EnableInteractiveSerialConsoleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_interactive_serial_console"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/EnableInteractiveSerialConsole", + request_serializer=instance.EnableInteractiveSerialConsoleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_interactive_serial_console"] @@ -607,12 +612,12 @@ def disable_interactive_serial_console( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_interactive_serial_console" not in self._stubs: - self._stubs[ - "disable_interactive_serial_console" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/DisableInteractiveSerialConsole", - request_serializer=instance.DisableInteractiveSerialConsoleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_interactive_serial_console"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/DisableInteractiveSerialConsole", + request_serializer=instance.DisableInteractiveSerialConsoleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_interactive_serial_console"] @@ -1415,12 +1420,12 @@ def submit_provisioning_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "submit_provisioning_config" not in self._stubs: - self._stubs[ - "submit_provisioning_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/SubmitProvisioningConfig", - request_serializer=provisioning.SubmitProvisioningConfigRequest.serialize, - response_deserializer=provisioning.SubmitProvisioningConfigResponse.deserialize, + self._stubs["submit_provisioning_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/SubmitProvisioningConfig", + request_serializer=provisioning.SubmitProvisioningConfigRequest.serialize, + response_deserializer=provisioning.SubmitProvisioningConfigResponse.deserialize, + ) ) return self._stubs["submit_provisioning_config"] @@ -1473,12 +1478,12 @@ def create_provisioning_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_provisioning_config" not in self._stubs: - self._stubs[ - "create_provisioning_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/CreateProvisioningConfig", - request_serializer=provisioning.CreateProvisioningConfigRequest.serialize, - response_deserializer=provisioning.ProvisioningConfig.deserialize, + self._stubs["create_provisioning_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/CreateProvisioningConfig", + request_serializer=provisioning.CreateProvisioningConfigRequest.serialize, + response_deserializer=provisioning.ProvisioningConfig.deserialize, + ) ) return self._stubs["create_provisioning_config"] @@ -1503,12 +1508,12 @@ def update_provisioning_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_provisioning_config" not in self._stubs: - self._stubs[ - "update_provisioning_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/UpdateProvisioningConfig", - request_serializer=provisioning.UpdateProvisioningConfigRequest.serialize, - response_deserializer=provisioning.ProvisioningConfig.deserialize, + self._stubs["update_provisioning_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/UpdateProvisioningConfig", + request_serializer=provisioning.UpdateProvisioningConfigRequest.serialize, + response_deserializer=provisioning.ProvisioningConfig.deserialize, + ) ) return self._stubs["update_provisioning_config"] diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc_asyncio.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc_asyncio.py index 2c6250617b7c..bdbf31bf9182 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc_asyncio.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc_asyncio.py @@ -17,41 +17,46 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) from .base import DEFAULT_CLIENT_INFO, BareMetalSolutionTransport from .grpc import BareMetalSolutionGrpcTransport @@ -588,12 +593,12 @@ def enable_interactive_serial_console( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_interactive_serial_console" not in self._stubs: - self._stubs[ - "enable_interactive_serial_console" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/EnableInteractiveSerialConsole", - request_serializer=instance.EnableInteractiveSerialConsoleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_interactive_serial_console"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/EnableInteractiveSerialConsole", + request_serializer=instance.EnableInteractiveSerialConsoleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_interactive_serial_console"] @@ -621,12 +626,12 @@ def disable_interactive_serial_console( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_interactive_serial_console" not in self._stubs: - self._stubs[ - "disable_interactive_serial_console" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/DisableInteractiveSerialConsole", - request_serializer=instance.DisableInteractiveSerialConsoleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_interactive_serial_console"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/DisableInteractiveSerialConsole", + request_serializer=instance.DisableInteractiveSerialConsoleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_interactive_serial_console"] @@ -1461,12 +1466,12 @@ def submit_provisioning_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "submit_provisioning_config" not in self._stubs: - self._stubs[ - "submit_provisioning_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/SubmitProvisioningConfig", - request_serializer=provisioning.SubmitProvisioningConfigRequest.serialize, - response_deserializer=provisioning.SubmitProvisioningConfigResponse.deserialize, + self._stubs["submit_provisioning_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/SubmitProvisioningConfig", + request_serializer=provisioning.SubmitProvisioningConfigRequest.serialize, + response_deserializer=provisioning.SubmitProvisioningConfigResponse.deserialize, + ) ) return self._stubs["submit_provisioning_config"] @@ -1521,12 +1526,12 @@ def create_provisioning_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_provisioning_config" not in self._stubs: - self._stubs[ - "create_provisioning_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/CreateProvisioningConfig", - request_serializer=provisioning.CreateProvisioningConfigRequest.serialize, - response_deserializer=provisioning.ProvisioningConfig.deserialize, + self._stubs["create_provisioning_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/CreateProvisioningConfig", + request_serializer=provisioning.CreateProvisioningConfigRequest.serialize, + response_deserializer=provisioning.ProvisioningConfig.deserialize, + ) ) return self._stubs["create_provisioning_config"] @@ -1552,12 +1557,12 @@ def update_provisioning_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_provisioning_config" not in self._stubs: - self._stubs[ - "update_provisioning_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/UpdateProvisioningConfig", - request_serializer=provisioning.UpdateProvisioningConfigRequest.serialize, - response_deserializer=provisioning.ProvisioningConfig.deserialize, + self._stubs["update_provisioning_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/UpdateProvisioningConfig", + request_serializer=provisioning.UpdateProvisioningConfigRequest.serialize, + response_deserializer=provisioning.ProvisioningConfig.deserialize, + ) ) return self._stubs["update_provisioning_config"] diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest.py index da336ee94825..4f4016ccdc63 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest.py @@ -16,39 +16,44 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseBareMetalSolutionRestTransport @@ -2676,9 +2681,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseCreateNfsShare._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseCreateNfsShare._get_http_options() request, metadata = self._interceptor.pre_create_nfs_share( request, metadata @@ -2828,9 +2831,7 @@ def __call__( A provisioning configuration. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseCreateProvisioningConfig._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseCreateProvisioningConfig._get_http_options() request, metadata = self._interceptor.pre_create_provisioning_config( request, metadata @@ -2985,9 +2986,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseCreateSSHKey._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseCreateSSHKey._get_http_options() request, metadata = self._interceptor.pre_create_ssh_key(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseCreateSSHKey._get_transcoded_request( @@ -3139,9 +3138,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseCreateVolumeSnapshot._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseCreateVolumeSnapshot._get_http_options() request, metadata = self._interceptor.pre_create_volume_snapshot( request, metadata @@ -3298,9 +3295,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseDeleteNfsShare._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseDeleteNfsShare._get_http_options() request, metadata = self._interceptor.pre_delete_nfs_share( request, metadata @@ -3439,9 +3434,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseDeleteSSHKey._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseDeleteSSHKey._get_http_options() request, metadata = self._interceptor.pre_delete_ssh_key(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseDeleteSSHKey._get_transcoded_request( @@ -3547,9 +3540,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseDeleteVolumeSnapshot._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseDeleteVolumeSnapshot._get_http_options() request, metadata = self._interceptor.pre_delete_volume_snapshot( request, metadata @@ -3822,15 +3813,12 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseDisableInteractiveSerialConsole._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseDisableInteractiveSerialConsole._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_disable_interactive_serial_console( - request, metadata + request, metadata = ( + self._interceptor.pre_disable_interactive_serial_console( + request, metadata + ) ) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseDisableInteractiveSerialConsole._get_transcoded_request( http_options, request @@ -3894,11 +3882,10 @@ def __call__( resp = self._interceptor.post_disable_interactive_serial_console(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_disable_interactive_serial_console_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_disable_interactive_serial_console_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3984,9 +3971,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseEnableInteractiveSerialConsole._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseEnableInteractiveSerialConsole._get_http_options() request, metadata = self._interceptor.pre_enable_interactive_serial_console( request, metadata @@ -4053,11 +4038,10 @@ def __call__( resp = self._interceptor.post_enable_interactive_serial_console(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_enable_interactive_serial_console_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_enable_interactive_serial_console_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5027,9 +5011,7 @@ def __call__( A provisioning configuration. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseGetProvisioningConfig._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseGetProvisioningConfig._get_http_options() request, metadata = self._interceptor.pre_get_provisioning_config( request, metadata @@ -5324,9 +5306,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseGetVolumeSnapshot._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseGetVolumeSnapshot._get_http_options() request, metadata = self._interceptor.pre_get_volume_snapshot( request, metadata @@ -5474,9 +5454,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListInstances._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListInstances._get_http_options() request, metadata = self._interceptor.pre_list_instances(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseListInstances._get_transcoded_request( @@ -5768,9 +5746,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListNetworks._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListNetworks._get_http_options() request, metadata = self._interceptor.pre_list_networks(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseListNetworks._get_transcoded_request( @@ -5913,9 +5889,7 @@ def __call__( Response with Networks with IPs """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListNetworkUsage._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListNetworkUsage._get_http_options() request, metadata = self._interceptor.pre_list_network_usage( request, metadata @@ -6065,9 +6039,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListNfsShares._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListNfsShares._get_http_options() request, metadata = self._interceptor.pre_list_nfs_shares(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseListNfsShares._get_transcoded_request( @@ -6212,9 +6184,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListOSImages._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListOSImages._get_http_options() request, metadata = self._interceptor.pre_list_os_images(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseListOSImages._get_transcoded_request( @@ -6360,9 +6330,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListProvisioningQuotas._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListProvisioningQuotas._get_http_options() request, metadata = self._interceptor.pre_list_provisioning_quotas( request, metadata @@ -6806,9 +6774,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListVolumeSnapshots._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListVolumeSnapshots._get_http_options() request, metadata = self._interceptor.pre_list_volume_snapshots( request, metadata @@ -6959,9 +6925,7 @@ def __call__( A server. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseRenameInstance._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseRenameInstance._get_http_options() request, metadata = self._interceptor.pre_rename_instance(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseRenameInstance._get_transcoded_request( @@ -7111,9 +7075,7 @@ def __call__( A Network. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseRenameNetwork._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseRenameNetwork._get_http_options() request, metadata = self._interceptor.pre_rename_network(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseRenameNetwork._get_transcoded_request( @@ -7263,9 +7225,7 @@ def __call__( An NFS share. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseRenameNfsShare._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseRenameNfsShare._get_http_options() request, metadata = self._interceptor.pre_rename_nfs_share( request, metadata @@ -7416,9 +7376,7 @@ def __call__( A storage volume. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseRenameVolume._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseRenameVolume._get_http_options() request, metadata = self._interceptor.pre_rename_volume(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseRenameVolume._get_transcoded_request( @@ -7570,9 +7528,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseResetInstance._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseResetInstance._get_http_options() request, metadata = self._interceptor.pre_reset_instance(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseResetInstance._get_transcoded_request( @@ -7721,9 +7677,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseResizeVolume._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseResizeVolume._get_http_options() request, metadata = self._interceptor.pre_resize_volume(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseResizeVolume._get_transcoded_request( @@ -7874,9 +7828,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseRestoreVolumeSnapshot._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseRestoreVolumeSnapshot._get_http_options() request, metadata = self._interceptor.pre_restore_volume_snapshot( request, metadata @@ -8030,9 +7982,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseStartInstance._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseStartInstance._get_http_options() request, metadata = self._interceptor.pre_start_instance(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseStartInstance._get_transcoded_request( @@ -8181,9 +8131,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseStopInstance._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseStopInstance._get_http_options() request, metadata = self._interceptor.pre_stop_instance(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseStopInstance._get_transcoded_request( @@ -8333,9 +8281,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseSubmitProvisioningConfig._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseSubmitProvisioningConfig._get_http_options() request, metadata = self._interceptor.pre_submit_provisioning_config( request, metadata @@ -8494,9 +8440,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseUpdateInstance._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseUpdateInstance._get_http_options() request, metadata = self._interceptor.pre_update_instance(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseUpdateInstance._get_transcoded_request( @@ -8647,9 +8591,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseUpdateNetwork._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseUpdateNetwork._get_http_options() request, metadata = self._interceptor.pre_update_network(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseUpdateNetwork._get_transcoded_request( @@ -8800,9 +8742,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseUpdateNfsShare._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseUpdateNfsShare._get_http_options() request, metadata = self._interceptor.pre_update_nfs_share( request, metadata @@ -8953,9 +8893,7 @@ def __call__( A provisioning configuration. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseUpdateProvisioningConfig._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseUpdateProvisioningConfig._get_http_options() request, metadata = self._interceptor.pre_update_provisioning_config( request, metadata @@ -9110,9 +9048,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseUpdateVolume._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseUpdateVolume._get_http_options() request, metadata = self._interceptor.pre_update_volume(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseUpdateVolume._get_transcoded_request( @@ -9219,7 +9155,9 @@ def create_provisioning_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateProvisioningConfig(self._session, self._host, self._interceptor) # type: ignore + return self._CreateProvisioningConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_ssh_key( @@ -9280,7 +9218,9 @@ def disable_interactive_serial_console( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DisableInteractiveSerialConsole(self._session, self._host, self._interceptor) # type: ignore + return self._DisableInteractiveSerialConsole( + self._session, self._host, self._interceptor + ) # type: ignore @property def enable_interactive_serial_console( @@ -9290,7 +9230,9 @@ def enable_interactive_serial_console( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._EnableInteractiveSerialConsole(self._session, self._host, self._interceptor) # type: ignore + return self._EnableInteractiveSerialConsole( + self._session, self._host, self._interceptor + ) # type: ignore @property def evict_lun(self) -> Callable[[lun.EvictLunRequest], operations_pb2.Operation]: @@ -9415,7 +9357,9 @@ def list_provisioning_quotas( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListProvisioningQuotas(self._session, self._host, self._interceptor) # type: ignore + return self._ListProvisioningQuotas( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_ssh_keys( @@ -9525,7 +9469,9 @@ def submit_provisioning_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SubmitProvisioningConfig(self._session, self._host, self._interceptor) # type: ignore + return self._SubmitProvisioningConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_instance( @@ -9559,7 +9505,9 @@ def update_provisioning_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateProvisioningConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateProvisioningConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_volume( @@ -9767,9 +9715,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseListLocations._get_transcoded_request( diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest_base.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest_base.py index d6499b6aa3e5..a09bb13e1520 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest_base.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest_base.py @@ -17,30 +17,35 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) from .base import DEFAULT_CLIENT_INFO, BareMetalSolutionTransport diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/__init__.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/__init__.py index c387cd97a15b..15f8c9a95387 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/__init__.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/__init__.py @@ -13,8 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .baremetalsolution import OperationMetadata, ResetInstanceResponse -from .common import VolumePerformanceTier, WorkloadProfile +from .baremetalsolution import ( + OperationMetadata, + ResetInstanceResponse, +) +from .common import ( + VolumePerformanceTier, + WorkloadProfile, +) from .instance import ( DetachLunRequest, DisableInteractiveSerialConsoleRequest, @@ -34,7 +40,13 @@ StopInstanceResponse, UpdateInstanceRequest, ) -from .lun import EvictLunRequest, GetLunRequest, ListLunsRequest, ListLunsResponse, Lun +from .lun import ( + EvictLunRequest, + GetLunRequest, + ListLunsRequest, + ListLunsResponse, + Lun, +) from .network import ( VRF, GetNetworkRequest, @@ -60,7 +72,11 @@ RenameNfsShareRequest, UpdateNfsShareRequest, ) -from .osimage import ListOSImagesRequest, ListOSImagesResponse, OSImage +from .osimage import ( + ListOSImagesRequest, + ListOSImagesResponse, + OSImage, +) from .provisioning import ( CreateProvisioningConfigRequest, GetProvisioningConfigRequest, diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/common.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/common.py index bf028e008f28..a19580811169 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/common.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/common.py @@ -41,6 +41,7 @@ class VolumePerformanceTier(proto.Enum): VOLUME_PERFORMANCE_TIER_HT (3): High throughput aggregates. """ + VOLUME_PERFORMANCE_TIER_UNSPECIFIED = 0 VOLUME_PERFORMANCE_TIER_SHARED = 1 VOLUME_PERFORMANCE_TIER_ASSIGNED = 2 @@ -58,6 +59,7 @@ class WorkloadProfile(proto.Enum): WORKLOAD_PROFILE_HANA (2): The workload profile is hana. """ + WORKLOAD_PROFILE_UNSPECIFIED = 0 WORKLOAD_PROFILE_GENERIC = 1 WORKLOAD_PROFILE_HANA = 2 diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/instance.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/instance.py index aeefee7bf45c..30ebabe79aff 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/instance.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/instance.py @@ -21,9 +21,8 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore -from google.cloud.bare_metal_solution_v2.types import common +from google.cloud.bare_metal_solution_v2.types import common, network, volume from google.cloud.bare_metal_solution_v2.types import lun as gcb_lun -from google.cloud.bare_metal_solution_v2.types import network, volume __protobuf__ = proto.module( package="google.cloud.baremetalsolution.v2", @@ -144,6 +143,7 @@ class State(proto.Enum): SHUTDOWN (7): The server is shutdown. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -532,6 +532,7 @@ class InterfaceType(proto.Enum): NIC (2): NIC interface type. """ + INTERFACE_TYPE_UNSPECIFIED = 0 BOND = 1 NIC = 2 diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/lun.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/lun.py index ea1e07cdd358..1215792ba512 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/lun.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/lun.py @@ -86,6 +86,7 @@ class State(proto.Enum): The LUN is in cool off state. It will be deleted after ``expire_time``. """ + STATE_UNSPECIFIED = 0 CREATING = 1 UPDATING = 2 @@ -103,6 +104,7 @@ class MultiprotocolType(proto.Enum): LINUX (1): Server with Linux OS. """ + MULTIPROTOCOL_TYPE_UNSPECIFIED = 0 LINUX = 1 @@ -117,6 +119,7 @@ class StorageType(proto.Enum): HDD (2): This storage type for this LUN is HDD. """ + STORAGE_TYPE_UNSPECIFIED = 0 SSD = 1 HDD = 2 diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/network.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/network.py index 7a600eeb32fc..f394d1f9eac3 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/network.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/network.py @@ -101,6 +101,7 @@ class Type(proto.Enum): Private network, a network local to the Bare Metal Solution environment. """ + TYPE_UNSPECIFIED = 0 CLIENT = 1 PRIVATE = 2 @@ -120,6 +121,7 @@ class State(proto.Enum): UPDATING (4): The Network is being updated. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 PROVISIONED = 2 @@ -260,6 +262,7 @@ class State(proto.Enum): PROVISIONED (2): The vrf is provisioned. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 PROVISIONED = 2 @@ -416,12 +419,12 @@ class LogicalNetworkInterface(proto.Message): number=5, ) - logical_network_interfaces: MutableSequence[ - LogicalNetworkInterface - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=LogicalNetworkInterface, + logical_network_interfaces: MutableSequence[LogicalNetworkInterface] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=LogicalNetworkInterface, + ) ) name: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/nfs_share.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/nfs_share.py index 2db309588a38..2aabc11c1af2 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/nfs_share.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/nfs_share.py @@ -82,6 +82,7 @@ class State(proto.Enum): The NFS Share has been requested to be deleted. """ + STATE_UNSPECIFIED = 0 PROVISIONED = 1 CREATING = 2 @@ -101,6 +102,7 @@ class MountPermissions(proto.Enum): NFS share can be mount with read-write permissions. """ + MOUNT_PERMISSIONS_UNSPECIFIED = 0 READ = 1 READ_WRITE = 2 @@ -116,6 +118,7 @@ class StorageType(proto.Enum): HDD (2): This storage type for this volume is HDD. """ + STORAGE_TYPE_UNSPECIFIED = 0 SSD = 1 HDD = 2 diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/provisioning.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/provisioning.py index 462bb97d4319..d5675b55fc3b 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/provisioning.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/provisioning.py @@ -118,6 +118,7 @@ class State(proto.Enum): The request is submitted for provisioning, with error return. """ + STATE_UNSPECIFIED = 0 DRAFT = 1 SUBMITTED = 2 @@ -289,6 +290,7 @@ class AssetType(proto.Enum): ASSET_TYPE_NETWORK (3): The network asset type. """ + ASSET_TYPE_UNSPECIFIED = 0 ASSET_TYPE_SERVER = 1 ASSET_TYPE_STORAGE = 2 @@ -458,6 +460,7 @@ class NetworkConfig(proto.Enum): Instance part of multiple (or single) client networks and private networks. """ + NETWORKCONFIG_UNSPECIFIED = 0 SINGLE_VLAN = 1 MULTI_VLAN = 2 @@ -595,6 +598,7 @@ class Type(proto.Enum): DISK (2): This Volume is on disk. """ + TYPE_UNSPECIFIED = 0 FLASH = 1 DISK = 2 @@ -610,6 +614,7 @@ class Protocol(proto.Enum): PROTOCOL_NFS (2): Network file system. """ + PROTOCOL_UNSPECIFIED = 0 PROTOCOL_FC = 1 PROTOCOL_NFS = 2 @@ -680,6 +685,7 @@ class Permissions(proto.Enum): READ_WRITE (2): Read-write permission. """ + PERMISSIONS_UNSPECIFIED = 0 READ_ONLY = 1 READ_WRITE = 2 @@ -822,6 +828,7 @@ class Type(proto.Enum): Private network, that is a network local to the BMS POD. """ + TYPE_UNSPECIFIED = 0 CLIENT = 1 PRIVATE = 2 @@ -841,6 +848,7 @@ class Bandwidth(proto.Enum): BW_10_GBPS (4): 10 Gbps. """ + BANDWIDTH_UNSPECIFIED = 0 BW_1_GBPS = 1 BW_2_GBPS = 2 @@ -865,6 +873,7 @@ class ServiceCidr(proto.Enum): Use the highest /28 block of the network to host services. """ + SERVICE_CIDR_UNSPECIFIED = 0 DISABLED = 1 HIGH_26 = 2 diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume.py index 8f8b711ac7e5..fcc1fb9462a8 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume.py @@ -130,6 +130,7 @@ class StorageType(proto.Enum): HDD (2): This storage type for this volume is HDD. """ + STORAGE_TYPE_UNSPECIFIED = 0 SSD = 1 HDD = 2 @@ -153,6 +154,7 @@ class State(proto.Enum): The storage volume is in cool off state. It will be deleted after ``expire_time``. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -176,6 +178,7 @@ class SnapshotAutoDeleteBehavior(proto.Enum): NEWEST_FIRST (3): Delete the newest snapshots first. """ + SNAPSHOT_AUTO_DELETE_BEHAVIOR_UNSPECIFIED = 0 DISABLED = 1 OLDEST_FIRST = 2 @@ -194,6 +197,7 @@ class Protocol(proto.Enum): volume. Such volumes cannot be manipulated via Volumes API. """ + PROTOCOL_UNSPECIFIED = 0 FIBRE_CHANNEL = 1 NFS = 2 @@ -209,6 +213,7 @@ class WorkloadProfile(proto.Enum): HANA (2): The workload profile is hana. """ + WORKLOAD_PROFILE_UNSPECIFIED = 0 GENERIC = 1 HANA = 2 diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume_snapshot.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume_snapshot.py index 3c7795a4c1c2..05b015bdca33 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume_snapshot.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume_snapshot.py @@ -69,6 +69,7 @@ class SnapshotType(proto.Enum): Snapshot was taken automatically as a part of a snapshot schedule. """ + SNAPSHOT_TYPE_UNSPECIFIED = 0 AD_HOC = 1 SCHEDULED = 2 diff --git a/packages/google-cloud-bare-metal-solution/mypy.ini b/packages/google-cloud-bare-metal-solution/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-bare-metal-solution/mypy.ini +++ b/packages/google-cloud-bare-metal-solution/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-bare-metal-solution/noxfile.py b/packages/google-cloud-bare-metal-solution/noxfile.py index 4e8077b8ed61..a752e417fde5 100644 --- a/packages/google-cloud-bare-metal-solution/noxfile.py +++ b/packages/google-cloud-bare-metal-solution/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bare-metal-solution/tests/unit/gapic/bare_metal_solution_v2/test_bare_metal_solution.py b/packages/google-cloud-bare-metal-solution/tests/unit/gapic/bare_metal_solution_v2/test_bare_metal_solution.py index c76d4edadca9..928e8c443e7f 100644 --- a/packages/google-cloud-bare-metal-solution/tests/unit/gapic/bare_metal_solution_v2/test_bare_metal_solution.py +++ b/packages/google-cloud-bare-metal-solution/tests/unit/gapic/bare_metal_solution_v2/test_bare_metal_solution.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.bare_metal_solution_v2.services.bare_metal_solution import ( BareMetalSolutionAsyncClient, @@ -75,23 +77,27 @@ pagers, transports, ) -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + baremetalsolution, + common, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import baremetalsolution, common -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1011,10 +1017,9 @@ def test_bare_metal_solution_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1064,9 @@ def test_bare_metal_solution_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1102,9 @@ def test_bare_metal_solution_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1353,9 +1356,7 @@ def test_bare_metal_solution_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -9127,9 +9128,9 @@ def test_list_network_usage_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_usage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_usage] = ( + mock_rpc + ) request = {} client.list_network_usage(request) @@ -10170,9 +10171,9 @@ def test_create_volume_snapshot_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_volume_snapshot - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_volume_snapshot] = ( + mock_rpc + ) request = {} client.create_volume_snapshot(request) @@ -10875,9 +10876,9 @@ def test_delete_volume_snapshot_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_volume_snapshot - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_volume_snapshot] = ( + mock_rpc + ) request = {} client.delete_volume_snapshot(request) @@ -11216,9 +11217,9 @@ def test_get_volume_snapshot_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_volume_snapshot - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_volume_snapshot] = ( + mock_rpc + ) request = {} client.get_volume_snapshot(request) @@ -11571,9 +11572,9 @@ def test_list_volume_snapshots_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_volume_snapshots - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_volume_snapshots] = ( + mock_rpc + ) request = {} client.list_volume_snapshots(request) @@ -14175,9 +14176,9 @@ def test_update_nfs_share_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_nfs_share] = ( + mock_rpc + ) request = {} client.update_nfs_share(request) @@ -14514,9 +14515,9 @@ def test_create_nfs_share_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_nfs_share] = ( + mock_rpc + ) request = {} client.create_nfs_share(request) @@ -14870,9 +14871,9 @@ def test_rename_nfs_share_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.rename_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.rename_nfs_share] = ( + mock_rpc + ) request = {} client.rename_nfs_share(request) @@ -15210,9 +15211,9 @@ def test_delete_nfs_share_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_nfs_share] = ( + mock_rpc + ) request = {} client.delete_nfs_share(request) @@ -22381,9 +22382,9 @@ def test_list_network_usage_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_usage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_usage] = ( + mock_rpc + ) request = {} client.list_network_usage(request) @@ -22918,9 +22919,9 @@ def test_create_volume_snapshot_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_volume_snapshot - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_volume_snapshot] = ( + mock_rpc + ) request = {} client.create_volume_snapshot(request) @@ -23299,9 +23300,9 @@ def test_delete_volume_snapshot_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_volume_snapshot - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_volume_snapshot] = ( + mock_rpc + ) request = {} client.delete_volume_snapshot(request) @@ -23478,9 +23479,9 @@ def test_get_volume_snapshot_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_volume_snapshot - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_volume_snapshot] = ( + mock_rpc + ) request = {} client.get_volume_snapshot(request) @@ -23663,9 +23664,9 @@ def test_list_volume_snapshots_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_volume_snapshots - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_volume_snapshots] = ( + mock_rpc + ) request = {} client.list_volume_snapshots(request) @@ -24969,9 +24970,9 @@ def test_update_nfs_share_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_nfs_share] = ( + mock_rpc + ) request = {} client.update_nfs_share(request) @@ -25152,9 +25153,9 @@ def test_create_nfs_share_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_nfs_share] = ( + mock_rpc + ) request = {} client.create_nfs_share(request) @@ -25341,9 +25342,9 @@ def test_rename_nfs_share_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.rename_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.rename_nfs_share] = ( + mock_rpc + ) request = {} client.rename_nfs_share(request) @@ -25538,9 +25539,9 @@ def test_delete_nfs_share_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_nfs_share] = ( + mock_rpc + ) request = {} client.delete_nfs_share(request) diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/__init__.py b/packages/google-cloud-batch/google/cloud/batch_v1/__init__.py index 2159404d7bce..6500c1193ac4 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/__init__.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.batch_service import BatchServiceAsyncClient, BatchServiceClient from .types.batch import ( CancelJobRequest, diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/async_client.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/async_client.py index b273c0de8078..e010dbbf7d6d 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/async_client.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.batch_v1 import gapic_version as package_version @@ -46,16 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.batch_v1.services.batch_service import pagers -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task from .client import BatchServiceClient from .transports.base import DEFAULT_CLIENT_INFO, BatchServiceTransport @@ -126,7 +124,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BatchServiceAsyncClient: The constructed client. """ - return BatchServiceClient.from_service_account_info.__func__(BatchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BatchServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(BatchServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BatchServiceAsyncClient: The constructed client. """ - return BatchServiceClient.from_service_account_file.__func__(BatchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BatchServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(BatchServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/client.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/client.py index 5c7cd338023c..5e7e2e959e9a 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/client.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.batch_v1 import gapic_version as package_version @@ -63,16 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.batch_v1.services.batch_service import pagers -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task from .transports.base import DEFAULT_CLIENT_INFO, BatchServiceTransport from .transports.grpc import BatchServiceGrpcTransport @@ -681,11 +679,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BatchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BatchServiceClient._read_environment_variables() + ) self._client_cert_source = BatchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -720,8 +716,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BatchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/pagers.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/pagers.py index e8efad43bdea..1618ac99e9a3 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/pagers.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/base.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/base.py index 1f90bcb10762..84287f55cb27 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/base.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/base.py @@ -17,21 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.batch_v1 import gapic_version as package_version -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -336,13 +334,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc.py index d3f65e0cf65b..8f13e650bac7 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc.py @@ -16,24 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task from .base import DEFAULT_CLIENT_INFO, BatchServiceTransport diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc_asyncio.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc_asyncio.py index 2bcc720524a6..92ec9ba09f7b 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,15 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task from .base import DEFAULT_CLIENT_INFO, BatchServiceTransport from .grpc import BatchServiceGrpcTransport diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest.py index 0f6a9a3c6bb4..ffbf6c5e86ac 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest.py @@ -16,24 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseBatchServiceRestTransport diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest_base.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest_base.py index ba6e9047a57a..9e37244ce597 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest_base.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest_base.py @@ -22,10 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task from .base import DEFAULT_CLIENT_INFO, BatchServiceTransport diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/types/__init__.py b/packages/google-cloud-batch/google/cloud/batch_v1/types/__init__.py index 67bcf0f8b04b..cd2884a9359e 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/types/__init__.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/types/__init__.py @@ -46,7 +46,11 @@ TaskSpec, TaskStatus, ) -from .volume import GCS, NFS, Volume +from .volume import ( + GCS, + NFS, + Volume, +) __all__ = ( "CancelJobRequest", diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/types/job.py b/packages/google-cloud-batch/google/cloud/batch_v1/types/job.py index c8053fd3605b..09b7bd35af99 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/types/job.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/types/job.py @@ -180,6 +180,7 @@ class Destination(proto.Enum): Logs are saved to the file path specified in the ``logsPath`` field. """ + DESTINATION_UNSPECIFIED = 0 CLOUD_LOGGING = 1 PATH = 2 @@ -272,6 +273,7 @@ class State(proto.Enum): executions were stopped and the resources were cleaned up. """ + STATE_UNSPECIFIED = 0 QUEUED = 1 SCHEDULED = 2 @@ -397,6 +399,7 @@ class Type(proto.Enum): TASK_STATE_CHANGED (2): Notify users that the task state has changed. """ + TYPE_UNSPECIFIED = 0 JOB_STATE_CHANGED = 1 TASK_STATE_CHANGED = 2 @@ -526,6 +529,7 @@ class ProvisioningModel(proto.Enum): Instance is provisioned with DWS Flex Start and has limited max run duration. """ + PROVISIONING_MODEL_UNSPECIFIED = 0 STANDARD = 1 SPOT = 2 @@ -786,12 +790,12 @@ class InstancePolicy(proto.Message): number=4, enum="AllocationPolicy.ProvisioningModel", ) - accelerators: MutableSequence[ - "AllocationPolicy.Accelerator" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="AllocationPolicy.Accelerator", + accelerators: MutableSequence["AllocationPolicy.Accelerator"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="AllocationPolicy.Accelerator", + ) ) boot_disk: "AllocationPolicy.Disk" = proto.Field( proto.MESSAGE, @@ -954,12 +958,12 @@ class NetworkPolicy(proto.Message): Network configurations. """ - network_interfaces: MutableSequence[ - "AllocationPolicy.NetworkInterface" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AllocationPolicy.NetworkInterface", + network_interfaces: MutableSequence["AllocationPolicy.NetworkInterface"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AllocationPolicy.NetworkInterface", + ) ) class PlacementPolicy(proto.Message): @@ -1106,6 +1110,7 @@ class SchedulingPolicy(proto.Enum): Run Tasks sequentially with increased task index. """ + SCHEDULING_POLICY_UNSPECIFIED = 0 AS_SOON_AS_POSSIBLE = 1 IN_ORDER = 2 diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/types/task.py b/packages/google-cloud-batch/google/cloud/batch_v1/types/task.py index 4fa8e3a19969..b13d309a63bd 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/types/task.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/types/task.py @@ -213,6 +213,7 @@ class State(proto.Enum): The Task has not been executed when the Job finishes. """ + STATE_UNSPECIFIED = 0 PENDING = 1 ASSIGNED = 2 @@ -692,6 +693,7 @@ class Action(proto.Enum): Action that tasks in the group will be stopped immediately. """ + ACTION_UNSPECIFIED = 0 RETRY_TASK = 1 FAIL_TASK = 2 diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/__init__.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/__init__.py index 6bdca485ae0a..fb14a6536194 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/__init__.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.batch_service import BatchServiceAsyncClient, BatchServiceClient from .types.batch import ( CancelJobRequest, diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/async_client.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/async_client.py index d42218d3a271..73c9fe543e94 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/async_client.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.batch_v1alpha import gapic_version as package_version @@ -46,22 +46,24 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.batch_v1alpha.services.batch_service import pagers from google.cloud.batch_v1alpha.types import ( - resource_allowance as gcb_resource_allowance, + batch, + job, + notification, + resource_allowance, + task, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import notification -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task +from google.cloud.batch_v1alpha.types import ( + resource_allowance as gcb_resource_allowance, +) from .client import BatchServiceClient from .transports.base import DEFAULT_CLIENT_INFO, BatchServiceTransport @@ -136,7 +138,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BatchServiceAsyncClient: The constructed client. """ - return BatchServiceClient.from_service_account_info.__func__(BatchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BatchServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(BatchServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -152,7 +157,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BatchServiceAsyncClient: The constructed client. """ - return BatchServiceClient.from_service_account_file.__func__(BatchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BatchServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(BatchServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/client.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/client.py index be60d48a8236..5623d76e1fa2 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/client.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.batch_v1alpha import gapic_version as package_version @@ -63,22 +63,24 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.batch_v1alpha.services.batch_service import pagers from google.cloud.batch_v1alpha.types import ( - resource_allowance as gcb_resource_allowance, + batch, + job, + notification, + resource_allowance, + task, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import notification -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task +from google.cloud.batch_v1alpha.types import ( + resource_allowance as gcb_resource_allowance, +) from .transports.base import DEFAULT_CLIENT_INFO, BatchServiceTransport from .transports.grpc import BatchServiceGrpcTransport @@ -709,11 +711,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BatchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BatchServiceClient._read_environment_variables() + ) self._client_cert_source = BatchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -748,8 +748,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BatchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/pagers.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/pagers.py index ceae4b50843b..1c92706651cd 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/pagers.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/base.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/base.py index 8232b1aa66cf..f2fa07d23472 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/base.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/base.py @@ -17,25 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.batch_v1alpha import gapic_version as package_version +from google.cloud.batch_v1alpha.types import batch, job, resource_allowance, task +from google.cloud.batch_v1alpha.types import job as gcb_job from google.cloud.batch_v1alpha.types import ( resource_allowance as gcb_resource_allowance, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job -from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -451,13 +448,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc.py index 0437d99862ac..595616f40a50 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc.py @@ -16,28 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.batch_v1alpha.types import batch, job, resource_allowance, task +from google.cloud.batch_v1alpha.types import job as gcb_job from google.cloud.batch_v1alpha.types import ( resource_allowance as gcb_resource_allowance, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job -from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task from .base import DEFAULT_CLIENT_INFO, BatchServiceTransport diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc_asyncio.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc_asyncio.py index ca6b3fa64c87..05c5d268f4dd 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,19 +31,13 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.batch_v1alpha.types import batch, job, resource_allowance, task +from google.cloud.batch_v1alpha.types import job as gcb_job from google.cloud.batch_v1alpha.types import ( resource_allowance as gcb_resource_allowance, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job -from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task from .base import DEFAULT_CLIENT_INFO, BatchServiceTransport from .grpc import BatchServiceGrpcTransport diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest.py index d92ac7e2fd0b..222b275ed877 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest.py @@ -16,28 +16,25 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.batch_v1alpha.types import batch, job, resource_allowance, task +from google.cloud.batch_v1alpha.types import job as gcb_job from google.cloud.batch_v1alpha.types import ( resource_allowance as gcb_resource_allowance, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job -from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseBatchServiceRestTransport @@ -1452,9 +1449,7 @@ def __call__( """ - http_options = ( - _BaseBatchServiceRestTransport._BaseCreateResourceAllowance._get_http_options() - ) + http_options = _BaseBatchServiceRestTransport._BaseCreateResourceAllowance._get_http_options() request, metadata = self._interceptor.pre_create_resource_allowance( request, metadata @@ -1758,9 +1753,7 @@ def __call__( """ - http_options = ( - _BaseBatchServiceRestTransport._BaseDeleteResourceAllowance._get_http_options() - ) + http_options = _BaseBatchServiceRestTransport._BaseDeleteResourceAllowance._get_http_options() request, metadata = self._interceptor.pre_delete_resource_allowance( request, metadata @@ -2052,9 +2045,7 @@ def __call__( """ - http_options = ( - _BaseBatchServiceRestTransport._BaseGetResourceAllowance._get_http_options() - ) + http_options = _BaseBatchServiceRestTransport._BaseGetResourceAllowance._get_http_options() request, metadata = self._interceptor.pre_get_resource_allowance( request, metadata @@ -2492,9 +2483,7 @@ def __call__( ListResourceAllowances Response. """ - http_options = ( - _BaseBatchServiceRestTransport._BaseListResourceAllowances._get_http_options() - ) + http_options = _BaseBatchServiceRestTransport._BaseListResourceAllowances._get_http_options() request, metadata = self._interceptor.pre_list_resource_allowances( request, metadata @@ -2948,9 +2937,7 @@ def __call__( """ - http_options = ( - _BaseBatchServiceRestTransport._BaseUpdateResourceAllowance._get_http_options() - ) + http_options = _BaseBatchServiceRestTransport._BaseUpdateResourceAllowance._get_http_options() request, metadata = self._interceptor.pre_update_resource_allowance( request, metadata @@ -3069,7 +3056,9 @@ def create_resource_allowance( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateResourceAllowance(self._session, self._host, self._interceptor) # type: ignore + return self._CreateResourceAllowance( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_job( @@ -3085,7 +3074,9 @@ def delete_resource_allowance( ) -> Callable[[batch.DeleteResourceAllowanceRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteResourceAllowance(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteResourceAllowance( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_job(self) -> Callable[[batch.GetJobRequest], job.Job]: @@ -3123,7 +3114,9 @@ def list_resource_allowances( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListResourceAllowances(self._session, self._host, self._interceptor) # type: ignore + return self._ListResourceAllowances( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_tasks(self) -> Callable[[batch.ListTasksRequest], batch.ListTasksResponse]: @@ -3145,7 +3138,9 @@ def update_resource_allowance( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateResourceAllowance(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateResourceAllowance( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest_base.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest_base.py index 1a64306a21d0..32cc6621cdf0 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest_base.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest_base.py @@ -22,14 +22,11 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.batch_v1alpha.types import batch, job, resource_allowance, task +from google.cloud.batch_v1alpha.types import job as gcb_job from google.cloud.batch_v1alpha.types import ( resource_allowance as gcb_resource_allowance, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job -from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task from .base import DEFAULT_CLIENT_INFO, BatchServiceTransport diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/__init__.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/__init__.py index 6f8e7fadec80..6fac08015197 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/__init__.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/__init__.py @@ -44,7 +44,9 @@ ServiceAccount, TaskGroup, ) -from .notification import Notification +from .notification import ( + Notification, +) from .resource_allowance import ( CalendarPeriod, ResourceAllowance, @@ -65,7 +67,12 @@ TaskSpec, TaskStatus, ) -from .volume import GCS, NFS, PD, Volume +from .volume import ( + GCS, + NFS, + PD, + Volume, +) __all__ = ( "CancelJobRequest", diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/batch.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/batch.py index 7188da39c744..0fe2987c66c7 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/batch.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/batch.py @@ -21,10 +21,10 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.batch_v1alpha.types import job as gcb_job from google.cloud.batch_v1alpha.types import ( resource_allowance as gcb_resource_allowance, ) -from google.cloud.batch_v1alpha.types import job as gcb_job from google.cloud.batch_v1alpha.types import task __protobuf__ = proto.module( @@ -601,12 +601,12 @@ class ListResourceAllowancesResponse(proto.Message): def raw_page(self): return self - resource_allowances: MutableSequence[ - gcb_resource_allowance.ResourceAllowance - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcb_resource_allowance.ResourceAllowance, + resource_allowances: MutableSequence[gcb_resource_allowance.ResourceAllowance] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcb_resource_allowance.ResourceAllowance, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/job.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/job.py index 0169a7405c0c..eb9b9456db49 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/job.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/job.py @@ -108,6 +108,7 @@ class SchedulingPolicy(proto.Enum): AS_SOON_AS_POSSIBLE (1): Run all TaskGroups as soon as possible. """ + SCHEDULING_POLICY_UNSPECIFIED = 0 AS_SOON_AS_POSSIBLE = 1 @@ -220,6 +221,7 @@ class Destination(proto.Enum): Logs are saved to the file path specified in the ``logsPath`` field. """ + DESTINATION_UNSPECIFIED = 0 CLOUD_LOGGING = 1 PATH = 2 @@ -290,6 +292,7 @@ class Type(proto.Enum): FINISHED (3): SUCCEEDED or FAILED. """ + TYPE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -356,6 +359,7 @@ class State(proto.Enum): executions were stopped and the resources were cleaned up. """ + STATE_UNSPECIFIED = 0 QUEUED = 1 SCHEDULED = 2 @@ -500,6 +504,7 @@ class Type(proto.Enum): TASK_STATE_CHANGED (2): Notify users that the task state has changed. """ + TYPE_UNSPECIFIED = 0 JOB_STATE_CHANGED = 1 TASK_STATE_CHANGED = 2 @@ -638,6 +643,7 @@ class ProvisioningModel(proto.Enum): Instance is provisioned with DWS Flex Start and has limited max run duration. """ + PROVISIONING_MODEL_UNSPECIFIED = 0 STANDARD = 1 SPOT = 2 @@ -912,12 +918,12 @@ class InstancePolicy(proto.Message): number=4, enum="AllocationPolicy.ProvisioningModel", ) - accelerators: MutableSequence[ - "AllocationPolicy.Accelerator" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="AllocationPolicy.Accelerator", + accelerators: MutableSequence["AllocationPolicy.Accelerator"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="AllocationPolicy.Accelerator", + ) ) boot_disk: "AllocationPolicy.Disk" = proto.Field( proto.MESSAGE, @@ -1080,12 +1086,12 @@ class NetworkPolicy(proto.Message): Network configurations. """ - network_interfaces: MutableSequence[ - "AllocationPolicy.NetworkInterface" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AllocationPolicy.NetworkInterface", + network_interfaces: MutableSequence["AllocationPolicy.NetworkInterface"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AllocationPolicy.NetworkInterface", + ) ) class PlacementPolicy(proto.Message): @@ -1272,6 +1278,7 @@ class SchedulingPolicy(proto.Enum): Run Tasks sequentially with increased task index. """ + SCHEDULING_POLICY_UNSPECIFIED = 0 AS_SOON_AS_POSSIBLE = 1 IN_ORDER = 2 diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/resource_allowance.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/resource_allowance.py index ef0f4b812a25..173f1ffa4324 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/resource_allowance.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/resource_allowance.py @@ -60,6 +60,7 @@ class CalendarPeriod(proto.Enum): DAY (5): The day starts at 12:00am. """ + CALENDAR_PERIOD_UNSPECIFIED = 0 MONTH = 1 QUARTER = 2 @@ -79,6 +80,7 @@ class ResourceAllowanceState(proto.Enum): RESOURCE_ALLOWANCE_DEPLETED (2): ResourceAllowance limit is reached. """ + RESOURCE_ALLOWANCE_STATE_UNSPECIFIED = 0 RESOURCE_ALLOWANCE_ACTIVE = 1 RESOURCE_ALLOWANCE_DEPLETED = 2 diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/task.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/task.py index 72a0731eb52f..2dabc0c06b8f 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/task.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/task.py @@ -233,6 +233,7 @@ class State(proto.Enum): The Task has not been executed when the Job finishes. """ + STATE_UNSPECIFIED = 0 PENDING = 1 ASSIGNED = 2 @@ -732,6 +733,7 @@ class Action(proto.Enum): Action that tasks in the group will be stopped immediately. """ + ACTION_UNSPECIFIED = 0 RETRY_TASK = 1 FAIL_TASK = 2 diff --git a/packages/google-cloud-batch/mypy.ini b/packages/google-cloud-batch/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-batch/mypy.ini +++ b/packages/google-cloud-batch/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-batch/noxfile.py b/packages/google-cloud-batch/noxfile.py index d70e974c1e14..75f9f3f04477 100644 --- a/packages/google-cloud-batch/noxfile.py +++ b/packages/google-cloud-batch/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-batch/tests/unit/gapic/batch_v1/test_batch_service.py b/packages/google-cloud-batch/tests/unit/gapic/batch_v1/test_batch_service.py index 28ede91f3b50..f5291db13cc0 100644 --- a/packages/google-cloud-batch/tests/unit/gapic/batch_v1/test_batch_service.py +++ b/packages/google-cloud-batch/tests/unit/gapic/batch_v1/test_batch_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.batch_v1.services.batch_service import ( BatchServiceAsyncClient, @@ -72,10 +72,8 @@ pagers, transports, ) -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task, volume from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task, volume CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -943,10 +941,9 @@ def test_batch_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -991,10 +988,9 @@ def test_batch_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1026,9 @@ def test_batch_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1276,9 +1271,7 @@ def test_batch_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py b/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py index d61b40bb65d9..30aea12fd0fa 100644 --- a/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py +++ b/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.type.interval_pb2 as interval_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.type.interval_pb2 as interval_pb2 # type: ignore from google.cloud.batch_v1alpha.services.batch_service import ( BatchServiceAsyncClient, @@ -75,14 +75,17 @@ transports, ) from google.cloud.batch_v1alpha.types import ( - resource_allowance as gcb_resource_allowance, + batch, + job, + notification, + resource_allowance, + task, + volume, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import notification -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task, volume +from google.cloud.batch_v1alpha.types import ( + resource_allowance as gcb_resource_allowance, +) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -950,10 +953,9 @@ def test_batch_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +1000,9 @@ def test_batch_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1038,9 @@ def test_batch_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1283,9 +1283,7 @@ def test_batch_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4851,9 +4849,9 @@ def test_get_resource_allowance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_allowance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_allowance] = ( + mock_rpc + ) request = {} client.get_resource_allowance(request) @@ -8071,9 +8069,9 @@ def test_get_resource_allowance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_allowance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_allowance] = ( + mock_rpc + ) request = {} client.get_resource_allowance(request) diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/__init__.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/__init__.py index 123b1edcce52..85033ba07e6b 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/__init__.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.app_connections_service import ( AppConnectionsServiceAsyncClient, AppConnectionsServiceClient, diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/async_client.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/async_client.py index 8be332f74006..868376907a47 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/async_client.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appconnections_v1 import gapic_version as package_version @@ -46,13 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.beyondcorp_appconnections_v1.services.app_connections_service import ( pagers, @@ -151,7 +153,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AppConnectionsServiceAsyncClient: The constructed client. """ - return AppConnectionsServiceClient.from_service_account_info.__func__(AppConnectionsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AppConnectionsServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AppConnectionsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -167,7 +172,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AppConnectionsServiceAsyncClient: The constructed client. """ - return AppConnectionsServiceClient.from_service_account_file.__func__(AppConnectionsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AppConnectionsServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AppConnectionsServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -205,7 +213,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AppConnectionsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AppConnectionsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AppConnectionsServiceTransport: diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/client.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/client.py index 40ba6fab0f87..26eb8c6f6440 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/client.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appconnections_v1 import gapic_version as package_version @@ -63,13 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.beyondcorp_appconnections_v1.services.app_connections_service import ( pagers, @@ -90,9 +92,7 @@ class AppConnectionsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AppConnectionsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AppConnectionsServiceTransport]] _transport_registry["grpc"] = AppConnectionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AppConnectionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AppConnectionsServiceRestTransport @@ -698,11 +698,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AppConnectionsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AppConnectionsServiceClient._read_environment_variables() + ) self._client_cert_source = AppConnectionsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -737,8 +735,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AppConnectionsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/pagers.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/pagers.py index 4f2a184fcb30..9e8eca307d2a 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/pagers.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -309,7 +309,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/__init__.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/__init__.py index 2b3d709cb733..9c4930076768 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/__init__.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AppConnectionsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AppConnectionsServiceTransport]] _transport_registry["grpc"] = AppConnectionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AppConnectionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AppConnectionsServiceRestTransport diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/base.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/base.py index ebdd4e962d49..fb96e37a108b 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/base.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appconnections_v1 import gapic_version as package_version from google.cloud.beyondcorp_appconnections_v1.types import app_connections_service @@ -318,13 +320,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc.py index 5ab4e08a8fb8..961829ba523e 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_appconnections_v1.types import app_connections_service diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc_asyncio.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc_asyncio.py index 1e5e8827548e..2e5e0314b7b9 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_appconnections_v1.types import app_connections_service diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest.py index 11446fbd0735..a0082f4281cc 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -865,9 +867,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseCreateAppConnection._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseCreateAppConnection._get_http_options() request, metadata = self._interceptor.pre_create_app_connection( request, metadata @@ -1021,9 +1021,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseDeleteAppConnection._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseDeleteAppConnection._get_http_options() request, metadata = self._interceptor.pre_delete_app_connection( request, metadata @@ -1177,9 +1175,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseGetAppConnection._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseGetAppConnection._get_http_options() request, metadata = self._interceptor.pre_get_app_connection( request, metadata @@ -1331,9 +1327,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseListAppConnections._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseListAppConnections._get_http_options() request, metadata = self._interceptor.pre_list_app_connections( request, metadata @@ -1487,9 +1481,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseResolveAppConnections._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseResolveAppConnections._get_http_options() request, metadata = self._interceptor.pre_resolve_app_connections( request, metadata @@ -1645,9 +1637,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseUpdateAppConnection._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseUpdateAppConnection._get_http_options() request, metadata = self._interceptor.pre_update_app_connection( request, metadata @@ -1863,9 +1853,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseAppConnectionsServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -2004,9 +1992,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseAppConnectionsServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -2145,9 +2131,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseAppConnectionsServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2287,9 +2271,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseAppConnectionsServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2434,9 +2416,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2582,9 +2562,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2704,9 +2682,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2824,9 +2800,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAppConnectionsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2965,9 +2939,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAppConnectionsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest_base.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest_base.py index 2ebc81b00525..9b6cf6a66e56 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest_base.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/types/app_connections_service.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/types/app_connections_service.py index 45125d2bf0b6..4f9162f33eba 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/types/app_connections_service.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/types/app_connections_service.py @@ -477,6 +477,7 @@ class Type(proto.Enum): TCP Proxy based BeyondCorp AppConnection. API will default to this if unset. """ + TYPE_UNSPECIFIED = 0 TCP_PROXY = 1 @@ -500,6 +501,7 @@ class State(proto.Enum): the future. This happens when CCFE sends ProjectState = OFF. """ + STATE_UNSPECIFIED = 0 CREATING = 1 CREATED = 2 @@ -558,6 +560,7 @@ class Type(proto.Enum): Gateway hosted in a GCP regional managed instance group. """ + TYPE_UNSPECIFIED = 0 GCP_REGIONAL_MIG = 1 diff --git a/packages/google-cloud-beyondcorp-appconnections/mypy.ini b/packages/google-cloud-beyondcorp-appconnections/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-beyondcorp-appconnections/mypy.ini +++ b/packages/google-cloud-beyondcorp-appconnections/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-beyondcorp-appconnections/noxfile.py b/packages/google-cloud-beyondcorp-appconnections/noxfile.py index 63c00ada0c75..4f738b3d8ffa 100644 --- a/packages/google-cloud-beyondcorp-appconnections/noxfile.py +++ b/packages/google-cloud-beyondcorp-appconnections/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-beyondcorp-appconnections/tests/unit/gapic/beyondcorp_appconnections_v1/test_app_connections_service.py b/packages/google-cloud-beyondcorp-appconnections/tests/unit/gapic/beyondcorp_appconnections_v1/test_app_connections_service.py index 1301c50c1a9e..513ed99f8df8 100644 --- a/packages/google-cloud-beyondcorp-appconnections/tests/unit/gapic/beyondcorp_appconnections_v1/test_app_connections_service.py +++ b/packages/google-cloud-beyondcorp-appconnections/tests/unit/gapic/beyondcorp_appconnections_v1/test_app_connections_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.beyondcorp_appconnections_v1.services.app_connections_service import ( AppConnectionsServiceAsyncClient, @@ -1011,10 +1013,9 @@ def test_app_connections_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1060,9 @@ def test_app_connections_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1098,9 @@ def test_app_connections_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1361,9 +1360,7 @@ def test_app_connections_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1484,9 +1481,9 @@ def test_list_app_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_app_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_app_connections] = ( + mock_rpc + ) request = {} client.list_app_connections(request) @@ -2044,9 +2041,9 @@ def test_get_app_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_app_connection] = ( + mock_rpc + ) request = {} client.get_app_connection(request) @@ -2398,9 +2395,9 @@ def test_create_app_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_app_connection] = ( + mock_rpc + ) request = {} client.create_app_connection(request) @@ -2765,9 +2762,9 @@ def test_update_app_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_app_connection] = ( + mock_rpc + ) request = {} client.update_app_connection(request) @@ -3124,9 +3121,9 @@ def test_delete_app_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_app_connection] = ( + mock_rpc + ) request = {} client.delete_app_connection(request) @@ -3970,9 +3967,9 @@ def test_list_app_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_app_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_app_connections] = ( + mock_rpc + ) request = {} client.list_app_connections(request) @@ -4241,9 +4238,9 @@ def test_get_app_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_app_connection] = ( + mock_rpc + ) request = {} client.get_app_connection(request) @@ -4426,9 +4423,9 @@ def test_create_app_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_app_connection] = ( + mock_rpc + ) request = {} client.create_app_connection(request) @@ -4635,9 +4632,9 @@ def test_update_app_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_app_connection] = ( + mock_rpc + ) request = {} client.update_app_connection(request) @@ -4843,9 +4840,9 @@ def test_delete_app_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_app_connection] = ( + mock_rpc + ) request = {} client.delete_app_connection(request) diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/__init__.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/__init__.py index 9f1b8f8f9781..c5d4e3ed90c9 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/__init__.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.app_connectors_service import ( AppConnectorsServiceAsyncClient, AppConnectorsServiceClient, diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/async_client.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/async_client.py index fa70817028a7..f3643d6776ef 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/async_client.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appconnectors_v1 import gapic_version as package_version @@ -46,22 +46,26 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.beyondcorp_appconnectors_v1.services.app_connectors_service import ( pagers, ) -from google.cloud.beyondcorp_appconnectors_v1.types import app_connectors_service +from google.cloud.beyondcorp_appconnectors_v1.types import ( + app_connectors_service, + resource_info, +) from google.cloud.beyondcorp_appconnectors_v1.types import ( resource_info as gcba_resource_info, ) -from google.cloud.beyondcorp_appconnectors_v1.types import resource_info from .client import AppConnectorsServiceClient from .transports.base import DEFAULT_CLIENT_INFO, AppConnectorsServiceTransport @@ -145,7 +149,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AppConnectorsServiceAsyncClient: The constructed client. """ - return AppConnectorsServiceClient.from_service_account_info.__func__(AppConnectorsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AppConnectorsServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AppConnectorsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -161,7 +168,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AppConnectorsServiceAsyncClient: The constructed client. """ - return AppConnectorsServiceClient.from_service_account_file.__func__(AppConnectorsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AppConnectorsServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AppConnectorsServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -199,7 +209,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AppConnectorsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AppConnectorsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AppConnectorsServiceTransport: diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/client.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/client.py index da3921d60fc5..31af72863945 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/client.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appconnectors_v1 import gapic_version as package_version @@ -63,22 +63,26 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.beyondcorp_appconnectors_v1.services.app_connectors_service import ( pagers, ) -from google.cloud.beyondcorp_appconnectors_v1.types import app_connectors_service +from google.cloud.beyondcorp_appconnectors_v1.types import ( + app_connectors_service, + resource_info, +) from google.cloud.beyondcorp_appconnectors_v1.types import ( resource_info as gcba_resource_info, ) -from google.cloud.beyondcorp_appconnectors_v1.types import resource_info from .transports.base import DEFAULT_CLIENT_INFO, AppConnectorsServiceTransport from .transports.grpc import AppConnectorsServiceGrpcTransport @@ -94,9 +98,7 @@ class AppConnectorsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AppConnectorsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AppConnectorsServiceTransport]] _transport_registry["grpc"] = AppConnectorsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AppConnectorsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AppConnectorsServiceRestTransport @@ -654,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AppConnectorsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AppConnectorsServiceClient._read_environment_variables() + ) self._client_cert_source = AppConnectorsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -693,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AppConnectorsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/pagers.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/pagers.py index 95141db2b1ea..d0f3d2bb10ba 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/pagers.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/__init__.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/__init__.py index c1b790f02c5c..19cfcd8ae187 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/__init__.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import AppConnectorsServiceRestInterceptor, AppConnectorsServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AppConnectorsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AppConnectorsServiceTransport]] _transport_registry["grpc"] = AppConnectorsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AppConnectorsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AppConnectorsServiceRestTransport diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/base.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/base.py index 827ed4bd7a30..56f172b7d625 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/base.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appconnectors_v1 import gapic_version as package_version from google.cloud.beyondcorp_appconnectors_v1.types import app_connectors_service @@ -315,13 +317,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc.py index 9218a34bdea8..9113d86d1c2e 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_appconnectors_v1.types import app_connectors_service diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc_asyncio.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc_asyncio.py index 38a52235f46a..30403d375f84 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_appconnectors_v1.types import app_connectors_service diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest.py index a2bb7202afde..67c57658439d 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -862,9 +864,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseCreateAppConnector._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseCreateAppConnector._get_http_options() request, metadata = self._interceptor.pre_create_app_connector( request, metadata @@ -1018,9 +1018,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseDeleteAppConnector._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseDeleteAppConnector._get_http_options() request, metadata = self._interceptor.pre_delete_app_connector( request, metadata @@ -1176,9 +1174,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseGetAppConnector._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseGetAppConnector._get_http_options() request, metadata = self._interceptor.pre_get_app_connector( request, metadata @@ -1328,9 +1324,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseListAppConnectors._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseListAppConnectors._get_http_options() request, metadata = self._interceptor.pre_list_app_connectors( request, metadata @@ -1485,9 +1479,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseReportStatus._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseReportStatus._get_http_options() request, metadata = self._interceptor.pre_report_status(request, metadata) transcoded_request = _BaseAppConnectorsServiceRestTransport._BaseReportStatus._get_transcoded_request( @@ -1638,9 +1630,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseUpdateAppConnector._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseUpdateAppConnector._get_http_options() request, metadata = self._interceptor.pre_update_app_connector( request, metadata @@ -1855,9 +1845,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseAppConnectorsServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1996,9 +1984,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseAppConnectorsServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -2137,9 +2123,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseAppConnectorsServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2279,9 +2263,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseAppConnectorsServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2426,9 +2408,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2574,9 +2554,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2694,9 +2672,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2812,9 +2788,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAppConnectorsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2953,9 +2927,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAppConnectorsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest_base.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest_base.py index 53480cbaa245..3a3bb55d60ed 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest_base.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/__init__.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/__init__.py index 66f1f484bf1b..adefd9971c10 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/__init__.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/__init__.py @@ -29,7 +29,10 @@ ReportStatusRequest, UpdateAppConnectorRequest, ) -from .resource_info import HealthStatus, ResourceInfo +from .resource_info import ( + HealthStatus, + ResourceInfo, +) __all__ = ( "AppConnectorInstanceConfig", diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/app_connectors_service.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/app_connectors_service.py index beb453e3c340..5aa1c8d74b86 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/app_connectors_service.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/app_connectors_service.py @@ -427,6 +427,7 @@ class State(proto.Enum): the future. This happens when CCFE sends ProjectState = OFF. """ + STATE_UNSPECIFIED = 0 CREATING = 1 CREATED = 2 diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/resource_info.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/resource_info.py index 4cee559c8642..6023372f50e4 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/resource_info.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/resource_info.py @@ -46,6 +46,7 @@ class HealthStatus(proto.Enum): DEGRADED (4): Some sub-resources are UNHEALTHY. """ + HEALTH_STATUS_UNSPECIFIED = 0 HEALTHY = 1 UNHEALTHY = 2 diff --git a/packages/google-cloud-beyondcorp-appconnectors/mypy.ini b/packages/google-cloud-beyondcorp-appconnectors/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/mypy.ini +++ b/packages/google-cloud-beyondcorp-appconnectors/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-beyondcorp-appconnectors/noxfile.py b/packages/google-cloud-beyondcorp-appconnectors/noxfile.py index 1b0d5be15902..d2e3e8495baa 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/noxfile.py +++ b/packages/google-cloud-beyondcorp-appconnectors/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-beyondcorp-appconnectors/tests/unit/gapic/beyondcorp_appconnectors_v1/test_app_connectors_service.py b/packages/google-cloud-beyondcorp-appconnectors/tests/unit/gapic/beyondcorp_appconnectors_v1/test_app_connectors_service.py index cc79f3130050..995469b76f84 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/tests/unit/gapic/beyondcorp_appconnectors_v1/test_app_connectors_service.py +++ b/packages/google-cloud-beyondcorp-appconnectors/tests/unit/gapic/beyondcorp_appconnectors_v1/test_app_connectors_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,23 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.cloud.beyondcorp_appconnectors_v1.services.app_connectors_service import ( AppConnectorsServiceAsyncClient, @@ -76,11 +78,13 @@ pagers, transports, ) -from google.cloud.beyondcorp_appconnectors_v1.types import app_connectors_service +from google.cloud.beyondcorp_appconnectors_v1.types import ( + app_connectors_service, + resource_info, +) from google.cloud.beyondcorp_appconnectors_v1.types import ( resource_info as gcba_resource_info, ) -from google.cloud.beyondcorp_appconnectors_v1.types import resource_info CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1014,10 +1018,9 @@ def test_app_connectors_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1065,9 @@ def test_app_connectors_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1101,10 +1103,9 @@ def test_app_connectors_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1364,9 +1365,7 @@ def test_app_connectors_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1487,9 +1486,9 @@ def test_list_app_connectors_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_app_connectors - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_app_connectors] = ( + mock_rpc + ) request = {} client.list_app_connectors(request) @@ -2039,9 +2038,9 @@ def test_get_app_connector_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_app_connector] = ( + mock_rpc + ) request = {} client.get_app_connector(request) @@ -2388,9 +2387,9 @@ def test_create_app_connector_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_app_connector] = ( + mock_rpc + ) request = {} client.create_app_connector(request) @@ -2754,9 +2753,9 @@ def test_update_app_connector_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_app_connector] = ( + mock_rpc + ) request = {} client.update_app_connector(request) @@ -3112,9 +3111,9 @@ def test_delete_app_connector_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_app_connector] = ( + mock_rpc + ) request = {} client.delete_app_connector(request) @@ -3733,9 +3732,9 @@ def test_list_app_connectors_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_app_connectors - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_app_connectors] = ( + mock_rpc + ) request = {} client.list_app_connectors(request) @@ -3998,9 +3997,9 @@ def test_get_app_connector_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_app_connector] = ( + mock_rpc + ) request = {} client.get_app_connector(request) @@ -4182,9 +4181,9 @@ def test_create_app_connector_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_app_connector] = ( + mock_rpc + ) request = {} client.create_app_connector(request) @@ -4390,9 +4389,9 @@ def test_update_app_connector_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_app_connector] = ( + mock_rpc + ) request = {} client.update_app_connector(request) @@ -4595,9 +4594,9 @@ def test_delete_app_connector_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_app_connector] = ( + mock_rpc + ) request = {} client.delete_app_connector(request) diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/__init__.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/__init__.py index db9e6e9d6cd6..8af6c5cf3cbb 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/__init__.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.app_gateways_service import ( AppGatewaysServiceAsyncClient, AppGatewaysServiceClient, diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/async_client.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/async_client.py index fb7c3fd9d146..43c64a3e2411 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/async_client.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appgateways_v1 import gapic_version as package_version @@ -46,12 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.beyondcorp_appgateways_v1.services.app_gateways_service import pagers from google.cloud.beyondcorp_appgateways_v1.types import app_gateways_service @@ -138,7 +140,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AppGatewaysServiceAsyncClient: The constructed client. """ - return AppGatewaysServiceClient.from_service_account_info.__func__(AppGatewaysServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AppGatewaysServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AppGatewaysServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +159,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AppGatewaysServiceAsyncClient: The constructed client. """ - return AppGatewaysServiceClient.from_service_account_file.__func__(AppGatewaysServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AppGatewaysServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AppGatewaysServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -192,7 +200,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AppGatewaysServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AppGatewaysServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AppGatewaysServiceTransport: diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/client.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/client.py index 6bbeecaeb61c..cd6ac0dfd0cf 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/client.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appgateways_v1 import gapic_version as package_version @@ -63,12 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.beyondcorp_appgateways_v1.services.app_gateways_service import pagers from google.cloud.beyondcorp_appgateways_v1.types import app_gateways_service @@ -87,9 +89,7 @@ class AppGatewaysServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AppGatewaysServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AppGatewaysServiceTransport]] _transport_registry["grpc"] = AppGatewaysServiceGrpcTransport _transport_registry["grpc_asyncio"] = AppGatewaysServiceGrpcAsyncIOTransport _transport_registry["rest"] = AppGatewaysServiceRestTransport @@ -649,11 +649,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AppGatewaysServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AppGatewaysServiceClient._read_environment_variables() + ) self._client_cert_source = AppGatewaysServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -688,8 +686,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AppGatewaysServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/pagers.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/pagers.py index 89807f735394..6fd76b1ff1ad 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/pagers.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/__init__.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/__init__.py index 869b54bb5c5e..44a7edad7d3c 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/__init__.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import AppGatewaysServiceRestInterceptor, AppGatewaysServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AppGatewaysServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AppGatewaysServiceTransport]] _transport_registry["grpc"] = AppGatewaysServiceGrpcTransport _transport_registry["grpc_asyncio"] = AppGatewaysServiceGrpcAsyncIOTransport _transport_registry["rest"] = AppGatewaysServiceRestTransport diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/base.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/base.py index 79318da05210..ab6ffc49d786 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/base.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appgateways_v1 import gapic_version as package_version from google.cloud.beyondcorp_appgateways_v1.types import app_gateways_service @@ -286,13 +288,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc.py index 369d4123dac8..a390116601fc 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_appgateways_v1.types import app_gateways_service diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc_asyncio.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc_asyncio.py index e061e1e337fe..ed875c7936c8 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_appgateways_v1.types import app_gateways_service diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest.py index 5d8fb0e5f7d9..65b9367c8f2b 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -748,9 +750,7 @@ def __call__( """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseCreateAppGateway._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseCreateAppGateway._get_http_options() request, metadata = self._interceptor.pre_create_app_gateway( request, metadata @@ -902,9 +902,7 @@ def __call__( """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseDeleteAppGateway._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseDeleteAppGateway._get_http_options() request, metadata = self._interceptor.pre_delete_app_gateway( request, metadata @@ -1056,9 +1054,7 @@ def __call__( """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseGetAppGateway._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseGetAppGateway._get_http_options() request, metadata = self._interceptor.pre_get_app_gateway(request, metadata) transcoded_request = _BaseAppGatewaysServiceRestTransport._BaseGetAppGateway._get_transcoded_request( @@ -1204,9 +1200,7 @@ def __call__( """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseListAppGateways._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseListAppGateways._get_http_options() request, metadata = self._interceptor.pre_list_app_gateways( request, metadata @@ -1397,9 +1391,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseAppGatewaysServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1538,9 +1530,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseAppGatewaysServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1679,9 +1669,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseAppGatewaysServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1821,9 +1809,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseAppGatewaysServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1968,9 +1954,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2116,9 +2100,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2236,9 +2218,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2354,9 +2334,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAppGatewaysServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2495,9 +2473,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAppGatewaysServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest_base.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest_base.py index 0ed718873792..b3bb50a5202b 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest_base.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/types/app_gateways_service.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/types/app_gateways_service.py index aa53033bb571..43cb60cfe222 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/types/app_gateways_service.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/types/app_gateways_service.py @@ -301,6 +301,7 @@ class Type(proto.Enum): TCP Proxy based BeyondCorp Connection. API will default to this if unset. """ + TYPE_UNSPECIFIED = 0 TCP_PROXY = 1 @@ -323,6 +324,7 @@ class State(proto.Enum): future. This happens when CCFE sends ProjectState = OFF. """ + STATE_UNSPECIFIED = 0 CREATING = 1 CREATED = 2 @@ -341,6 +343,7 @@ class HostType(proto.Enum): AppGateway hosted in a GCP regional managed instance group. """ + HOST_TYPE_UNSPECIFIED = 0 GCP_REGIONAL_MIG = 1 diff --git a/packages/google-cloud-beyondcorp-appgateways/mypy.ini b/packages/google-cloud-beyondcorp-appgateways/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-beyondcorp-appgateways/mypy.ini +++ b/packages/google-cloud-beyondcorp-appgateways/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-beyondcorp-appgateways/noxfile.py b/packages/google-cloud-beyondcorp-appgateways/noxfile.py index f9fbba106994..1a429ae92ba6 100644 --- a/packages/google-cloud-beyondcorp-appgateways/noxfile.py +++ b/packages/google-cloud-beyondcorp-appgateways/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-beyondcorp-appgateways/tests/unit/gapic/beyondcorp_appgateways_v1/test_app_gateways_service.py b/packages/google-cloud-beyondcorp-appgateways/tests/unit/gapic/beyondcorp_appgateways_v1/test_app_gateways_service.py index 9b71f426bab5..1751f4095f9c 100644 --- a/packages/google-cloud-beyondcorp-appgateways/tests/unit/gapic/beyondcorp_appgateways_v1/test_app_gateways_service.py +++ b/packages/google-cloud-beyondcorp-appgateways/tests/unit/gapic/beyondcorp_appgateways_v1/test_app_gateways_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +57,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.beyondcorp_appgateways_v1.services.app_gateways_service import ( AppGatewaysServiceAsyncClient, @@ -998,10 +1000,9 @@ def test_app_gateways_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1047,9 @@ def test_app_gateways_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1085,9 @@ def test_app_gateways_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1340,9 +1339,7 @@ def test_app_gateways_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1461,9 +1458,9 @@ def test_list_app_gateways_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_app_gateways - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_app_gateways] = ( + mock_rpc + ) request = {} client.list_app_gateways(request) @@ -2360,9 +2357,9 @@ def test_create_app_gateway_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_app_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_app_gateway] = ( + mock_rpc + ) request = {} client.create_app_gateway(request) @@ -2728,9 +2725,9 @@ def test_delete_app_gateway_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_app_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_app_gateway] = ( + mock_rpc + ) request = {} client.delete_app_gateway(request) @@ -3007,9 +3004,9 @@ def test_list_app_gateways_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_app_gateways - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_app_gateways] = ( + mock_rpc + ) request = {} client.list_app_gateways(request) @@ -3451,9 +3448,9 @@ def test_create_app_gateway_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_app_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_app_gateway] = ( + mock_rpc + ) request = {} client.create_app_gateway(request) @@ -3659,9 +3656,9 @@ def test_delete_app_gateway_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_app_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_app_gateway] = ( + mock_rpc + ) request = {} client.delete_app_gateway(request) diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/__init__.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/__init__.py index bb7aaaaa4227..8cf8b104168d 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/__init__.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/__init__.py @@ -30,6 +30,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.client_connector_services_service import ( ClientConnectorServicesServiceAsyncClient, ClientConnectorServicesServiceClient, @@ -49,7 +50,9 @@ api_core, "check_dependency_versions" ): # pragma: NO COVER api_core.check_python_version("google.cloud.beyondcorp_clientconnectorservices_v1") # type: ignore - api_core.check_dependency_versions("google.cloud.beyondcorp_clientconnectorservices_v1") # type: ignore + api_core.check_dependency_versions( + "google.cloud.beyondcorp_clientconnectorservices_v1" + ) # type: ignore else: # pragma: NO COVER # An older version of api_core is installed which does not define the # functions above. We do equivalent checks manually. diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/async_client.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/async_client.py index 0da0011947fb..e8c25111bb5f 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/async_client.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_clientconnectorservices_v1 import ( gapic_version as package_version, @@ -48,13 +48,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.beyondcorp_clientconnectorservices_v1.services.client_connector_services_service import ( pagers, @@ -155,7 +157,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ClientConnectorServicesServiceAsyncClient: The constructed client. """ - return ClientConnectorServicesServiceClient.from_service_account_info.__func__(ClientConnectorServicesServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ClientConnectorServicesServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + ClientConnectorServicesServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -171,7 +178,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ClientConnectorServicesServiceAsyncClient: The constructed client. """ - return ClientConnectorServicesServiceClient.from_service_account_file.__func__(ClientConnectorServicesServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ClientConnectorServicesServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + ClientConnectorServicesServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -209,7 +221,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ClientConnectorServicesServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ClientConnectorServicesServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ClientConnectorServicesServiceTransport: diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/client.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/client.py index 56e504aeb6b9..35e7ff3d0563 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/client.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_clientconnectorservices_v1 import ( gapic_version as package_version, @@ -65,13 +65,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.beyondcorp_clientconnectorservices_v1.services.client_connector_services_service import ( pagers, @@ -97,13 +99,11 @@ class ClientConnectorServicesServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ClientConnectorServicesServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ClientConnectorServicesServiceTransport]] _transport_registry["grpc"] = ClientConnectorServicesServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = ClientConnectorServicesServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + ClientConnectorServicesServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = ClientConnectorServicesServiceRestTransport def get_transport_class( @@ -664,11 +664,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ClientConnectorServicesServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ClientConnectorServicesServiceClient._read_environment_variables() + ) self._client_cert_source = ( ClientConnectorServicesServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -709,8 +707,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ClientConnectorServicesServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/pagers.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/pagers.py index 8fac82bcd1fd..0c584b2755a9 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/pagers.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -162,7 +162,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/__init__.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/__init__.py index 54680d7b6d48..bc889729b942 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/__init__.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ClientConnectorServicesServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ClientConnectorServicesServiceTransport]] _transport_registry["grpc"] = ClientConnectorServicesServiceGrpcTransport _transport_registry["grpc_asyncio"] = ClientConnectorServicesServiceGrpcAsyncIOTransport _transport_registry["rest"] = ClientConnectorServicesServiceRestTransport diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/base.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/base.py index 5c713bb67e02..7e63adbf46c7 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/base.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_clientconnectorservices_v1 import ( gapic_version as package_version, @@ -307,13 +309,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc.py index 864cdce22361..763334953597 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_clientconnectorservices_v1.types import ( client_connector_services_service, @@ -379,12 +381,12 @@ def list_client_connector_services( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_client_connector_services" not in self._stubs: - self._stubs[ - "list_client_connector_services" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/ListClientConnectorServices", - request_serializer=client_connector_services_service.ListClientConnectorServicesRequest.serialize, - response_deserializer=client_connector_services_service.ListClientConnectorServicesResponse.deserialize, + self._stubs["list_client_connector_services"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/ListClientConnectorServices", + request_serializer=client_connector_services_service.ListClientConnectorServicesRequest.serialize, + response_deserializer=client_connector_services_service.ListClientConnectorServicesResponse.deserialize, + ) ) return self._stubs["list_client_connector_services"] @@ -410,12 +412,12 @@ def get_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_client_connector_service" not in self._stubs: - self._stubs[ - "get_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/GetClientConnectorService", - request_serializer=client_connector_services_service.GetClientConnectorServiceRequest.serialize, - response_deserializer=client_connector_services_service.ClientConnectorService.deserialize, + self._stubs["get_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/GetClientConnectorService", + request_serializer=client_connector_services_service.GetClientConnectorServiceRequest.serialize, + response_deserializer=client_connector_services_service.ClientConnectorService.deserialize, + ) ) return self._stubs["get_client_connector_service"] @@ -443,12 +445,12 @@ def create_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_client_connector_service" not in self._stubs: - self._stubs[ - "create_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/CreateClientConnectorService", - request_serializer=client_connector_services_service.CreateClientConnectorServiceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/CreateClientConnectorService", + request_serializer=client_connector_services_service.CreateClientConnectorServiceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_client_connector_service"] @@ -476,12 +478,12 @@ def update_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_client_connector_service" not in self._stubs: - self._stubs[ - "update_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/UpdateClientConnectorService", - request_serializer=client_connector_services_service.UpdateClientConnectorServiceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/UpdateClientConnectorService", + request_serializer=client_connector_services_service.UpdateClientConnectorServiceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_client_connector_service"] @@ -508,12 +510,12 @@ def delete_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_client_connector_service" not in self._stubs: - self._stubs[ - "delete_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/DeleteClientConnectorService", - request_serializer=client_connector_services_service.DeleteClientConnectorServiceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/DeleteClientConnectorService", + request_serializer=client_connector_services_service.DeleteClientConnectorServiceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_client_connector_service"] diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc_asyncio.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc_asyncio.py index 84a64970f7dc..c54e71824e48 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_clientconnectorservices_v1.types import ( client_connector_services_service, @@ -389,12 +391,12 @@ def list_client_connector_services( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_client_connector_services" not in self._stubs: - self._stubs[ - "list_client_connector_services" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/ListClientConnectorServices", - request_serializer=client_connector_services_service.ListClientConnectorServicesRequest.serialize, - response_deserializer=client_connector_services_service.ListClientConnectorServicesResponse.deserialize, + self._stubs["list_client_connector_services"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/ListClientConnectorServices", + request_serializer=client_connector_services_service.ListClientConnectorServicesRequest.serialize, + response_deserializer=client_connector_services_service.ListClientConnectorServicesResponse.deserialize, + ) ) return self._stubs["list_client_connector_services"] @@ -420,12 +422,12 @@ def get_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_client_connector_service" not in self._stubs: - self._stubs[ - "get_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/GetClientConnectorService", - request_serializer=client_connector_services_service.GetClientConnectorServiceRequest.serialize, - response_deserializer=client_connector_services_service.ClientConnectorService.deserialize, + self._stubs["get_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/GetClientConnectorService", + request_serializer=client_connector_services_service.GetClientConnectorServiceRequest.serialize, + response_deserializer=client_connector_services_service.ClientConnectorService.deserialize, + ) ) return self._stubs["get_client_connector_service"] @@ -453,12 +455,12 @@ def create_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_client_connector_service" not in self._stubs: - self._stubs[ - "create_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/CreateClientConnectorService", - request_serializer=client_connector_services_service.CreateClientConnectorServiceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/CreateClientConnectorService", + request_serializer=client_connector_services_service.CreateClientConnectorServiceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_client_connector_service"] @@ -486,12 +488,12 @@ def update_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_client_connector_service" not in self._stubs: - self._stubs[ - "update_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/UpdateClientConnectorService", - request_serializer=client_connector_services_service.UpdateClientConnectorServiceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/UpdateClientConnectorService", + request_serializer=client_connector_services_service.UpdateClientConnectorServiceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_client_connector_service"] @@ -518,12 +520,12 @@ def delete_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_client_connector_service" not in self._stubs: - self._stubs[ - "delete_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/DeleteClientConnectorService", - request_serializer=client_connector_services_service.DeleteClientConnectorServiceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/DeleteClientConnectorService", + request_serializer=client_connector_services_service.DeleteClientConnectorServiceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_client_connector_service"] diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest.py index be21136fcdae..f03117b3cf6e 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -813,9 +815,7 @@ def __call__( """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseCreateClientConnectorService._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseCreateClientConnectorService._get_http_options() request, metadata = self._interceptor.pre_create_client_connector_service( request, metadata @@ -882,11 +882,10 @@ def __call__( resp = self._interceptor.post_create_client_connector_service(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_client_connector_service_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_client_connector_service_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -973,9 +972,7 @@ def __call__( """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseDeleteClientConnectorService._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseDeleteClientConnectorService._get_http_options() request, metadata = self._interceptor.pre_delete_client_connector_service( request, metadata @@ -1037,11 +1034,10 @@ def __call__( resp = self._interceptor.post_delete_client_connector_service(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_client_connector_service_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_client_connector_service_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1127,9 +1123,7 @@ def __call__( """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseGetClientConnectorService._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseGetClientConnectorService._get_http_options() request, metadata = self._interceptor.pre_get_client_connector_service( request, metadata @@ -1282,9 +1276,7 @@ def __call__( """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseListClientConnectorServices._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseListClientConnectorServices._get_http_options() request, metadata = self._interceptor.pre_list_client_connector_services( request, metadata @@ -1352,11 +1344,10 @@ def __call__( resp = self._interceptor.post_list_client_connector_services(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_client_connector_services_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_client_connector_services_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1446,9 +1437,7 @@ def __call__( """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseUpdateClientConnectorService._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseUpdateClientConnectorService._get_http_options() request, metadata = self._interceptor.pre_update_client_connector_service( request, metadata @@ -1515,11 +1504,10 @@ def __call__( resp = self._interceptor.post_update_client_connector_service(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_client_connector_service_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_client_connector_service_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1553,7 +1541,9 @@ def create_client_connector_service( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateClientConnectorService(self._session, self._host, self._interceptor) # type: ignore + return self._CreateClientConnectorService( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_client_connector_service( @@ -1564,7 +1554,9 @@ def delete_client_connector_service( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteClientConnectorService(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteClientConnectorService( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_client_connector_service( @@ -1575,7 +1567,9 @@ def get_client_connector_service( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetClientConnectorService(self._session, self._host, self._interceptor) # type: ignore + return self._GetClientConnectorService( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_client_connector_services( @@ -1586,7 +1580,9 @@ def list_client_connector_services( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListClientConnectorServices(self._session, self._host, self._interceptor) # type: ignore + return self._ListClientConnectorServices( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_client_connector_service( @@ -1597,7 +1593,9 @@ def update_client_connector_service( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateClientConnectorService(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateClientConnectorService( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1657,9 +1655,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseClientConnectorServicesServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1800,9 +1796,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseClientConnectorServicesServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1941,9 +1935,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseClientConnectorServicesServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2085,9 +2077,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseClientConnectorServicesServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2236,9 +2226,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2382,9 +2370,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2502,9 +2488,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2620,9 +2604,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseClientConnectorServicesServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2763,9 +2745,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseClientConnectorServicesServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest_base.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest_base.py index 75c967aabb58..2c5feb46697a 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest_base.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/types/client_connector_services_service.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/types/client_connector_services_service.py index 2c18d40b172e..c3500a5f003c 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/types/client_connector_services_service.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/types/client_connector_services_service.py @@ -86,6 +86,7 @@ class State(proto.Enum): ClientConnectorService encountered an error and is in an indeterministic state. """ + STATE_UNSPECIFIED = 0 CREATING = 1 UPDATING = 2 @@ -129,6 +130,7 @@ class TransportProtocol(proto.Enum): TCP (1): TCP protocol. """ + TRANSPORT_PROTOCOL_UNSPECIFIED = 0 TCP = 1 @@ -307,12 +309,12 @@ class ListClientConnectorServicesResponse(proto.Message): def raw_page(self): return self - client_connector_services: MutableSequence[ - "ClientConnectorService" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ClientConnectorService", + client_connector_services: MutableSequence["ClientConnectorService"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ClientConnectorService", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/mypy.ini b/packages/google-cloud-beyondcorp-clientconnectorservices/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/mypy.ini +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/noxfile.py b/packages/google-cloud-beyondcorp-clientconnectorservices/noxfile.py index 43afa2888611..c01ed51c2c6c 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/noxfile.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_create_client_connector_service_async.py b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_create_client_connector_service_async.py index 396ed096f137..dc703c1475f5 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_create_client_connector_service_async.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_create_client_connector_service_async.py @@ -36,9 +36,7 @@ async def sample_create_client_connector_service(): # Create a client - client = ( - beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() - ) + client = beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() # Initialize request argument(s) client_connector_service = ( diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_delete_client_connector_service_async.py b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_delete_client_connector_service_async.py index 3978e679cf5b..ca4dbd80fe6b 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_delete_client_connector_service_async.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_delete_client_connector_service_async.py @@ -36,9 +36,7 @@ async def sample_delete_client_connector_service(): # Create a client - client = ( - beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() - ) + client = beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() # Initialize request argument(s) request = beyondcorp_clientconnectorservices_v1.DeleteClientConnectorServiceRequest( diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_get_client_connector_service_async.py b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_get_client_connector_service_async.py index 374eb28b4da4..8bd715c7af59 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_get_client_connector_service_async.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_get_client_connector_service_async.py @@ -36,9 +36,7 @@ async def sample_get_client_connector_service(): # Create a client - client = ( - beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() - ) + client = beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() # Initialize request argument(s) request = beyondcorp_clientconnectorservices_v1.GetClientConnectorServiceRequest( diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_list_client_connector_services_async.py b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_list_client_connector_services_async.py index 70dd3a53f7ee..4fac1c057f62 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_list_client_connector_services_async.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_list_client_connector_services_async.py @@ -36,9 +36,7 @@ async def sample_list_client_connector_services(): # Create a client - client = ( - beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() - ) + client = beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() # Initialize request argument(s) request = beyondcorp_clientconnectorservices_v1.ListClientConnectorServicesRequest( diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_update_client_connector_service_async.py b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_update_client_connector_service_async.py index 9da0f3b14c66..f7b7314377ad 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_update_client_connector_service_async.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_update_client_connector_service_async.py @@ -36,9 +36,7 @@ async def sample_update_client_connector_service(): # Create a client - client = ( - beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() - ) + client = beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() # Initialize request argument(s) client_connector_service = ( diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/tests/unit/gapic/beyondcorp_clientconnectorservices_v1/test_client_connector_services_service.py b/packages/google-cloud-beyondcorp-clientconnectorservices/tests/unit/gapic/beyondcorp_clientconnectorservices_v1/test_client_connector_services_service.py index 5150e5806f65..598c82d5ddec 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/tests/unit/gapic/beyondcorp_clientconnectorservices_v1/test_client_connector_services_service.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/tests/unit/gapic/beyondcorp_clientconnectorservices_v1/test_client_connector_services_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.beyondcorp_clientconnectorservices_v1.services.client_connector_services_service import ( ClientConnectorServicesServiceAsyncClient, @@ -1071,10 +1073,9 @@ def test_client_connector_services_service_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1119,10 +1120,9 @@ def test_client_connector_services_service_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1158,10 +1158,9 @@ def test_client_connector_services_service_client_get_mtls_endpoint_and_cert_sou "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1426,9 +1425,7 @@ def test_client_connector_services_service_client_create_channel_credentials_fil google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/__init__.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/__init__.py index 69950315b3a7..75040a147446 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/__init__.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.client_gateways_service import ( ClientGatewaysServiceAsyncClient, ClientGatewaysServiceClient, diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/async_client.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/async_client.py index a556fd54ad92..2aa632d0d95b 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/async_client.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_clientgateways_v1 import gapic_version as package_version @@ -46,12 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.beyondcorp_clientgateways_v1.services.client_gateways_service import ( pagers, @@ -139,7 +141,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ClientGatewaysServiceAsyncClient: The constructed client. """ - return ClientGatewaysServiceClient.from_service_account_info.__func__(ClientGatewaysServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ClientGatewaysServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ClientGatewaysServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +160,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ClientGatewaysServiceAsyncClient: The constructed client. """ - return ClientGatewaysServiceClient.from_service_account_file.__func__(ClientGatewaysServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ClientGatewaysServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ClientGatewaysServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -193,7 +201,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ClientGatewaysServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ClientGatewaysServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ClientGatewaysServiceTransport: diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/client.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/client.py index 860246d1935d..51930ecbdfe0 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/client.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_clientgateways_v1 import gapic_version as package_version @@ -63,12 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.beyondcorp_clientgateways_v1.services.client_gateways_service import ( pagers, @@ -89,9 +91,7 @@ class ClientGatewaysServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ClientGatewaysServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ClientGatewaysServiceTransport]] _transport_registry["grpc"] = ClientGatewaysServiceGrpcTransport _transport_registry["grpc_asyncio"] = ClientGatewaysServiceGrpcAsyncIOTransport _transport_registry["rest"] = ClientGatewaysServiceRestTransport @@ -648,11 +648,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ClientGatewaysServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ClientGatewaysServiceClient._read_environment_variables() + ) self._client_cert_source = ClientGatewaysServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -687,8 +685,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ClientGatewaysServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/pagers.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/pagers.py index 33a182126680..c7d8b4ae4bb2 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/pagers.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/__init__.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/__init__.py index 8ed9f73eaa32..577632851a82 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/__init__.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ClientGatewaysServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ClientGatewaysServiceTransport]] _transport_registry["grpc"] = ClientGatewaysServiceGrpcTransport _transport_registry["grpc_asyncio"] = ClientGatewaysServiceGrpcAsyncIOTransport _transport_registry["rest"] = ClientGatewaysServiceRestTransport diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/base.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/base.py index 32de9e5adb58..1bb232b18b89 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/base.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_clientgateways_v1 import gapic_version as package_version from google.cloud.beyondcorp_clientgateways_v1.types import client_gateways_service @@ -287,13 +289,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc.py index d20bddf9c8cf..3ee4a15c6086 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_clientgateways_v1.types import client_gateways_service diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc_asyncio.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc_asyncio.py index 2436bf47eb01..de3013041a44 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_clientgateways_v1.types import client_gateways_service diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest.py index b6485aa5484a..47a97952308a 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -744,9 +746,7 @@ def __call__( """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseCreateClientGateway._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseCreateClientGateway._get_http_options() request, metadata = self._interceptor.pre_create_client_gateway( request, metadata @@ -899,9 +899,7 @@ def __call__( """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseDeleteClientGateway._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseDeleteClientGateway._get_http_options() request, metadata = self._interceptor.pre_delete_client_gateway( request, metadata @@ -1048,9 +1046,7 @@ def __call__( """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseGetClientGateway._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseGetClientGateway._get_http_options() request, metadata = self._interceptor.pre_get_client_gateway( request, metadata @@ -1202,9 +1198,7 @@ def __call__( """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseListClientGateways._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseListClientGateways._get_http_options() request, metadata = self._interceptor.pre_list_client_gateways( request, metadata @@ -1400,9 +1394,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseClientGatewaysServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1541,9 +1533,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseClientGatewaysServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1682,9 +1672,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseClientGatewaysServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1824,9 +1812,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseClientGatewaysServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1971,9 +1957,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2119,9 +2103,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2241,9 +2223,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2361,9 +2341,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseClientGatewaysServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2502,9 +2480,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseClientGatewaysServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest_base.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest_base.py index 0b43d53f800f..495300a447ee 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest_base.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/types/client_gateways_service.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/types/client_gateways_service.py index 9209bba31f12..2766a29dd66c 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/types/client_gateways_service.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/types/client_gateways_service.py @@ -80,6 +80,7 @@ class State(proto.Enum): ClientGateway encountered an error and is in indeterministic state. """ + STATE_UNSPECIFIED = 0 CREATING = 1 UPDATING = 2 diff --git a/packages/google-cloud-beyondcorp-clientgateways/mypy.ini b/packages/google-cloud-beyondcorp-clientgateways/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/mypy.ini +++ b/packages/google-cloud-beyondcorp-clientgateways/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-beyondcorp-clientgateways/noxfile.py b/packages/google-cloud-beyondcorp-clientgateways/noxfile.py index d0bf8e29363b..b1e2204495cf 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/noxfile.py +++ b/packages/google-cloud-beyondcorp-clientgateways/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-beyondcorp-clientgateways/tests/unit/gapic/beyondcorp_clientgateways_v1/test_client_gateways_service.py b/packages/google-cloud-beyondcorp-clientgateways/tests/unit/gapic/beyondcorp_clientgateways_v1/test_client_gateways_service.py index d61227cd8782..85e1c5804474 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/tests/unit/gapic/beyondcorp_clientgateways_v1/test_client_gateways_service.py +++ b/packages/google-cloud-beyondcorp-clientgateways/tests/unit/gapic/beyondcorp_clientgateways_v1/test_client_gateways_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +57,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.beyondcorp_clientgateways_v1.services.client_gateways_service import ( ClientGatewaysServiceAsyncClient, @@ -1010,10 +1012,9 @@ def test_client_gateways_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1059,9 @@ def test_client_gateways_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1097,10 +1097,9 @@ def test_client_gateways_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1360,9 +1359,7 @@ def test_client_gateways_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1483,9 +1480,9 @@ def test_list_client_gateways_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_client_gateways - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_client_gateways] = ( + mock_rpc + ) request = {} client.list_client_gateways(request) @@ -2039,9 +2036,9 @@ def test_get_client_gateway_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_client_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_client_gateway] = ( + mock_rpc + ) request = {} client.get_client_gateway(request) @@ -2389,9 +2386,9 @@ def test_create_client_gateway_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_client_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_client_gateway] = ( + mock_rpc + ) request = {} client.create_client_gateway(request) @@ -2758,9 +2755,9 @@ def test_delete_client_gateway_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_client_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_client_gateway] = ( + mock_rpc + ) request = {} client.delete_client_gateway(request) @@ -3039,9 +3036,9 @@ def test_list_client_gateways_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_client_gateways - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_client_gateways] = ( + mock_rpc + ) request = {} client.list_client_gateways(request) @@ -3310,9 +3307,9 @@ def test_get_client_gateway_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_client_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_client_gateway] = ( + mock_rpc + ) request = {} client.get_client_gateway(request) @@ -3495,9 +3492,9 @@ def test_create_client_gateway_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_client_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_client_gateway] = ( + mock_rpc + ) request = {} client.create_client_gateway(request) @@ -3704,9 +3701,9 @@ def test_delete_client_gateway_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_client_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_client_gateway] = ( + mock_rpc + ) request = {} client.delete_client_gateway(request) diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/__init__.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/__init__.py index f7506a1924d5..bd7f0f90e7a6 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/__init__.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.iceberg_catalog_service import ( IcebergCatalogServiceAsyncClient, IcebergCatalogServiceClient, diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/async_client.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/async_client.py index 9ecd31f311d7..b8c5650c0e51 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/async_client.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.biglake_v1 import gapic_version as package_version @@ -146,7 +146,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IcebergCatalogServiceAsyncClient: The constructed client. """ - return IcebergCatalogServiceClient.from_service_account_info.__func__(IcebergCatalogServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + IcebergCatalogServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(IcebergCatalogServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -162,7 +165,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IcebergCatalogServiceAsyncClient: The constructed client. """ - return IcebergCatalogServiceClient.from_service_account_file.__func__(IcebergCatalogServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + IcebergCatalogServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(IcebergCatalogServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -200,7 +206,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return IcebergCatalogServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return IcebergCatalogServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> IcebergCatalogServiceTransport: diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/client.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/client.py index 133fb03c4076..241e5ddff79e 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/client.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.biglake_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class IcebergCatalogServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[IcebergCatalogServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[IcebergCatalogServiceTransport]] _transport_registry["grpc"] = IcebergCatalogServiceGrpcTransport _transport_registry["grpc_asyncio"] = IcebergCatalogServiceGrpcAsyncIOTransport _transport_registry["rest"] = IcebergCatalogServiceRestTransport @@ -652,11 +650,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IcebergCatalogServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IcebergCatalogServiceClient._read_environment_variables() + ) self._client_cert_source = IcebergCatalogServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -691,8 +687,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IcebergCatalogServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/pagers.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/pagers.py index 6e4d13397363..330b927bdf38 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/pagers.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/__init__.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/__init__.py index 9be2072c2b6d..fd8ed43c7ba8 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/__init__.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[IcebergCatalogServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[IcebergCatalogServiceTransport]] _transport_registry["grpc"] = IcebergCatalogServiceGrpcTransport _transport_registry["grpc_asyncio"] = IcebergCatalogServiceGrpcAsyncIOTransport _transport_registry["rest"] = IcebergCatalogServiceRestTransport diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/base.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/base.py index b41e2699eac8..b6d98455415a 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/base.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.biglake_v1 import gapic_version as package_version from google.cloud.biglake_v1.types import iceberg_rest_catalog diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc.py index fa42e4126269..6b3728733129 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.biglake_v1.types import iceberg_rest_catalog diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc_asyncio.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc_asyncio.py index a2a3b3ad5ea3..7457c6be5bb6 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.biglake_v1.types import iceberg_rest_catalog diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/rest.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/rest.py index db78917852ae..12840494aaee 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/rest.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -547,9 +547,7 @@ def __call__( The Iceberg REST Catalog information. """ - http_options = ( - _BaseIcebergCatalogServiceRestTransport._BaseCreateIcebergCatalog._get_http_options() - ) + http_options = _BaseIcebergCatalogServiceRestTransport._BaseCreateIcebergCatalog._get_http_options() request, metadata = self._interceptor.pre_create_iceberg_catalog( request, metadata @@ -707,9 +705,7 @@ def __call__( """ - http_options = ( - _BaseIcebergCatalogServiceRestTransport._BaseFailoverIcebergCatalog._get_http_options() - ) + http_options = _BaseIcebergCatalogServiceRestTransport._BaseFailoverIcebergCatalog._get_http_options() request, metadata = self._interceptor.pre_failover_iceberg_catalog( request, metadata @@ -863,9 +859,7 @@ def __call__( The Iceberg REST Catalog information. """ - http_options = ( - _BaseIcebergCatalogServiceRestTransport._BaseGetIcebergCatalog._get_http_options() - ) + http_options = _BaseIcebergCatalogServiceRestTransport._BaseGetIcebergCatalog._get_http_options() request, metadata = self._interceptor.pre_get_iceberg_catalog( request, metadata @@ -1016,9 +1010,7 @@ def __call__( """ - http_options = ( - _BaseIcebergCatalogServiceRestTransport._BaseListIcebergCatalogs._get_http_options() - ) + http_options = _BaseIcebergCatalogServiceRestTransport._BaseListIcebergCatalogs._get_http_options() request, metadata = self._interceptor.pre_list_iceberg_catalogs( request, metadata @@ -1171,9 +1163,7 @@ def __call__( The Iceberg REST Catalog information. """ - http_options = ( - _BaseIcebergCatalogServiceRestTransport._BaseUpdateIcebergCatalog._get_http_options() - ) + http_options = _BaseIcebergCatalogServiceRestTransport._BaseUpdateIcebergCatalog._get_http_options() request, metadata = self._interceptor.pre_update_iceberg_catalog( request, metadata @@ -1292,7 +1282,9 @@ def failover_iceberg_catalog( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FailoverIcebergCatalog(self._session, self._host, self._interceptor) # type: ignore + return self._FailoverIcebergCatalog( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_iceberg_catalog( diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/types/iceberg_rest_catalog.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/types/iceberg_rest_catalog.py index 26676a41da76..d587c7610281 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/types/iceberg_rest_catalog.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/types/iceberg_rest_catalog.py @@ -82,6 +82,7 @@ class CatalogType(proto.Enum): Catalog type for Google Cloud Storage Buckets. """ + CATALOG_TYPE_UNSPECIFIED = 0 CATALOG_TYPE_GCS_BUCKET = 1 @@ -110,6 +111,7 @@ class CredentialMode(proto.Enum): https://github.com/apache/iceberg/blob/931865ecaf40a827f9081dddb675bf1c95c05461/open-api/rest-catalog-open-api.yaml#L1854 for more details. """ + CREDENTIAL_MODE_UNSPECIFIED = 0 CREDENTIAL_MODE_END_USER = 1 CREDENTIAL_MODE_VENDED_CREDENTIALS = 2 @@ -250,6 +252,7 @@ class CatalogView(proto.Enum): CATALOG_VIEW_FULL (2): Include all fields of the catalog. """ + CATALOG_VIEW_UNSPECIFIED = 0 CATALOG_VIEW_BASIC = 1 CATALOG_VIEW_FULL = 2 diff --git a/packages/google-cloud-biglake/mypy.ini b/packages/google-cloud-biglake/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-biglake/mypy.ini +++ b/packages/google-cloud-biglake/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-biglake/noxfile.py b/packages/google-cloud-biglake/noxfile.py index 5bce68fc8bb3..309eaaa6b357 100644 --- a/packages/google-cloud-biglake/noxfile.py +++ b/packages/google-cloud-biglake/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-biglake/tests/unit/gapic/biglake_v1/test_iceberg_catalog_service.py b/packages/google-cloud-biglake/tests/unit/gapic/biglake_v1/test_iceberg_catalog_service.py index eb24e6efc3ab..6f67a0107c58 100644 --- a/packages/google-cloud-biglake/tests/unit/gapic/biglake_v1/test_iceberg_catalog_service.py +++ b/packages/google-cloud-biglake/tests/unit/gapic/biglake_v1/test_iceberg_catalog_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.biglake_v1.services.iceberg_catalog_service import ( IcebergCatalogServiceAsyncClient, @@ -996,10 +1001,9 @@ def test_iceberg_catalog_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1048,9 @@ def test_iceberg_catalog_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1083,10 +1086,9 @@ def test_iceberg_catalog_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1346,9 +1348,7 @@ def test_iceberg_catalog_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1480,9 +1480,9 @@ def test_get_iceberg_catalog_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_iceberg_catalog - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_iceberg_catalog] = ( + mock_rpc + ) request = {} client.get_iceberg_catalog(request) @@ -1843,9 +1843,9 @@ def test_list_iceberg_catalogs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_iceberg_catalogs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_iceberg_catalogs] = ( + mock_rpc + ) request = {} client.list_iceberg_catalogs(request) @@ -2404,9 +2404,9 @@ def test_update_iceberg_catalog_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_iceberg_catalog - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_iceberg_catalog] = ( + mock_rpc + ) request = {} client.update_iceberg_catalog(request) @@ -2791,9 +2791,9 @@ def test_create_iceberg_catalog_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_iceberg_catalog - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_iceberg_catalog] = ( + mock_rpc + ) request = {} client.create_iceberg_catalog(request) @@ -3450,9 +3450,9 @@ def test_get_iceberg_catalog_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_iceberg_catalog - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_iceberg_catalog] = ( + mock_rpc + ) request = {} client.get_iceberg_catalog(request) @@ -3633,9 +3633,9 @@ def test_list_iceberg_catalogs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_iceberg_catalogs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_iceberg_catalogs] = ( + mock_rpc + ) request = {} client.list_iceberg_catalogs(request) @@ -3899,9 +3899,9 @@ def test_update_iceberg_catalog_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_iceberg_catalog - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_iceberg_catalog] = ( + mock_rpc + ) request = {} client.update_iceberg_catalog(request) @@ -4084,9 +4084,9 @@ def test_create_iceberg_catalog_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_iceberg_catalog - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_iceberg_catalog] = ( + mock_rpc + ) request = {} client.create_iceberg_catalog(request) diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/__init__.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/__init__.py index 8fd80eded13b..2479e51e6097 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/__init__.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.analytics_hub_service import ( AnalyticsHubServiceAsyncClient, AnalyticsHubServiceClient, diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/async_client.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/async_client.py index 756ea0c12dc6..9e043547dace 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/async_client.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_analyticshub_v1 import gapic_version as package_version @@ -48,10 +48,10 @@ import google.api_core.operation_async as operation_async # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.bigquery_analyticshub_v1.services.analytics_hub_service import pagers from google.cloud.bigquery_analyticshub_v1.types import analyticshub @@ -155,7 +155,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AnalyticsHubServiceAsyncClient: The constructed client. """ - return AnalyticsHubServiceClient.from_service_account_info.__func__(AnalyticsHubServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AnalyticsHubServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AnalyticsHubServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -171,7 +174,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AnalyticsHubServiceAsyncClient: The constructed client. """ - return AnalyticsHubServiceClient.from_service_account_file.__func__(AnalyticsHubServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AnalyticsHubServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AnalyticsHubServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -209,7 +215,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AnalyticsHubServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AnalyticsHubServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AnalyticsHubServiceTransport: diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/client.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/client.py index ee73743435b0..6cf0ae1a5342 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/client.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_analyticshub_v1 import gapic_version as package_version @@ -65,10 +65,10 @@ import google.api_core.operation_async as operation_async # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.bigquery_analyticshub_v1.services.analytics_hub_service import pagers from google.cloud.bigquery_analyticshub_v1.types import analyticshub @@ -86,9 +86,7 @@ class AnalyticsHubServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AnalyticsHubServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsHubServiceTransport]] _transport_registry["grpc"] = AnalyticsHubServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsHubServiceGrpcAsyncIOTransport @@ -818,11 +816,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AnalyticsHubServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AnalyticsHubServiceClient._read_environment_variables() + ) self._client_cert_source = AnalyticsHubServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -857,8 +853,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AnalyticsHubServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/pagers.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/pagers.py index d3354d539393..4240ee9b35e1 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/pagers.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -769,7 +769,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -851,7 +851,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -927,7 +927,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/__init__.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/__init__.py index d97066cc7aaf..2be520d8722d 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/__init__.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import AnalyticsHubServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AnalyticsHubServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsHubServiceTransport]] _transport_registry["grpc"] = AnalyticsHubServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsHubServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/base.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/base.py index e999d0ae7c73..6b3210659f2e 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/base.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/base.py @@ -17,17 +17,17 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.bigquery_analyticshub_v1 import gapic_version as package_version from google.cloud.bigquery_analyticshub_v1.types import analyticshub diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc.py index 68bb292cb039..f0dae5dee629 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc.py @@ -16,21 +16,21 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_analyticshub_v1.types import analyticshub @@ -816,12 +816,12 @@ def list_shared_resource_subscriptions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_shared_resource_subscriptions" not in self._stubs: - self._stubs[ - "list_shared_resource_subscriptions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.analyticshub.v1.AnalyticsHubService/ListSharedResourceSubscriptions", - request_serializer=analyticshub.ListSharedResourceSubscriptionsRequest.serialize, - response_deserializer=analyticshub.ListSharedResourceSubscriptionsResponse.deserialize, + self._stubs["list_shared_resource_subscriptions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.analyticshub.v1.AnalyticsHubService/ListSharedResourceSubscriptions", + request_serializer=analyticshub.ListSharedResourceSubscriptionsRequest.serialize, + response_deserializer=analyticshub.ListSharedResourceSubscriptionsResponse.deserialize, + ) ) return self._stubs["list_shared_resource_subscriptions"] diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc_asyncio.py index 3dc0ad4961b7..56653a77abff 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc_asyncio.py @@ -17,23 +17,23 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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 -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_analyticshub_v1.types import analyticshub @@ -837,12 +837,12 @@ def list_shared_resource_subscriptions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_shared_resource_subscriptions" not in self._stubs: - self._stubs[ - "list_shared_resource_subscriptions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.analyticshub.v1.AnalyticsHubService/ListSharedResourceSubscriptions", - request_serializer=analyticshub.ListSharedResourceSubscriptionsRequest.serialize, - response_deserializer=analyticshub.ListSharedResourceSubscriptionsResponse.deserialize, + self._stubs["list_shared_resource_subscriptions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.analyticshub.v1.AnalyticsHubService/ListSharedResourceSubscriptions", + request_serializer=analyticshub.ListSharedResourceSubscriptionsRequest.serialize, + response_deserializer=analyticshub.ListSharedResourceSubscriptionsResponse.deserialize, + ) ) return self._stubs["list_shared_resource_subscriptions"] diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/types/analyticshub.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/types/analyticshub.py index 5c4b3d871764..db43c9f87681 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/types/analyticshub.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/types/analyticshub.py @@ -97,6 +97,7 @@ class DiscoveryType(proto.Enum): The Data exchange/listing can be discovered in the 'Public' results list. """ + DISCOVERY_TYPE_UNSPECIFIED = 0 DISCOVERY_TYPE_PRIVATE = 1 DISCOVERY_TYPE_PUBLIC = 2 @@ -114,6 +115,7 @@ class SharedResourceType(proto.Enum): PUBSUB_TOPIC (2): Pub/Sub Topic Asset. """ + SHARED_RESOURCE_TYPE_UNSPECIFIED = 0 BIGQUERY_DATASET = 1 PUBSUB_TOPIC = 2 @@ -290,6 +292,7 @@ class State(proto.Enum): APPROVED (4): The QueryTemplate is in approved state. """ + STATE_UNSPECIFIED = 0 DRAFTED = 1 PENDING = 2 @@ -361,6 +364,7 @@ class RoutineType(proto.Enum): TABLE_VALUED_FUNCTION (1): Non-built-in persistent TVF. """ + ROUTINE_TYPE_UNSPECIFIED = 0 TABLE_VALUED_FUNCTION = 1 @@ -898,6 +902,7 @@ class State(proto.Enum): dataexchange.listings.subscribe permission can subscribe to this listing. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 @@ -948,6 +953,7 @@ class Category(proto.Enum): CATEGORY_GOOGLE_EARTH_ENGINE (20): No description available. """ + CATEGORY_UNSPECIFIED = 0 CATEGORY_OTHERS = 1 CATEGORY_ADVERTISING_AND_MARKETING = 2 @@ -1107,6 +1113,7 @@ class ReplicaState(proto.Enum): The replica is unavailable, does not exist, or has not been backfilled yet. """ + REPLICA_STATE_UNSPECIFIED = 0 READY_TO_USE = 1 UNAVAILABLE = 2 @@ -1121,6 +1128,7 @@ class PrimaryState(proto.Enum): PRIMARY_REPLICA (1): The replica is the primary replica. """ + PRIMARY_STATE_UNSPECIFIED = 0 PRIMARY_REPLICA = 1 @@ -1164,12 +1172,12 @@ class PrimaryState(proto.Enum): proto.STRING, number=5, ) - effective_replicas: MutableSequence[ - "Listing.BigQueryDatasetSource.Replica" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="Listing.BigQueryDatasetSource.Replica", + effective_replicas: MutableSequence["Listing.BigQueryDatasetSource.Replica"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="Listing.BigQueryDatasetSource.Replica", + ) ) class PubSubTopicSource(proto.Message): @@ -1275,6 +1283,7 @@ class CommercialState(proto.Enum): Commercialization is complete and available for use. """ + COMMERCIAL_STATE_UNSPECIFIED = 0 ONBOARDING = 1 ACTIVE = 2 @@ -1421,6 +1430,7 @@ class StoredProcedureType(proto.Enum): SQL_PROCEDURE (1): SQL stored procedure. """ + STORED_PROCEDURE_TYPE_UNSPECIFIED = 0 SQL_PROCEDURE = 1 @@ -1428,12 +1438,12 @@ class StoredProcedureType(proto.Enum): proto.BOOL, number=1, ) - allowed_stored_procedure_types: MutableSequence[ - StoredProcedureType - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum=StoredProcedureType, + allowed_stored_procedure_types: MutableSequence[StoredProcedureType] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum=StoredProcedureType, + ) ) @@ -1530,6 +1540,7 @@ class State(proto.Enum): This subscription has been cancelled or revoked and the data is no longer accessible. """ + STATE_UNSPECIFIED = 0 STATE_ACTIVE = 1 STATE_STALE = 2 @@ -2323,12 +2334,12 @@ class ListSharedResourceSubscriptionsResponse(proto.Message): def raw_page(self): return self - shared_resource_subscriptions: MutableSequence[ - "Subscription" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Subscription", + shared_resource_subscriptions: MutableSequence["Subscription"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Subscription", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-bigquery-analyticshub/mypy.ini b/packages/google-cloud-bigquery-analyticshub/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-bigquery-analyticshub/mypy.ini +++ b/packages/google-cloud-bigquery-analyticshub/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-bigquery-analyticshub/noxfile.py b/packages/google-cloud-bigquery-analyticshub/noxfile.py index fca276edf046..b55e958a0523 100644 --- a/packages/google-cloud-bigquery-analyticshub/noxfile.py +++ b/packages/google-cloud-bigquery-analyticshub/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_async.py index c07acf5d0ec0..0877ad1a0cd8 100644 --- a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-analyticshub -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START analyticshub_v1_generated_AnalyticsHubService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_analyticshub_v1 diff --git a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_sync.py index 14fd9d0651cf..f56831c36fc9 100644 --- a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-analyticshub -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START analyticshub_v1_generated_AnalyticsHubService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_analyticshub_v1 diff --git a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_async.py index 7646c50e09f4..f1fbbf68c55d 100644 --- a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-analyticshub -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START analyticshub_v1_generated_AnalyticsHubService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_analyticshub_v1 diff --git a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_sync.py index c870e9edf49b..82ceaed960d9 100644 --- a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-analyticshub -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START analyticshub_v1_generated_AnalyticsHubService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_analyticshub_v1 diff --git a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_async.py index e8da9a277cf1..5ceeffb6370a 100644 --- a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-analyticshub -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START analyticshub_v1_generated_AnalyticsHubService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_analyticshub_v1 diff --git a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_sync.py index 915e6175c292..30c4cb6bc826 100644 --- a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-analyticshub -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START analyticshub_v1_generated_AnalyticsHubService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_analyticshub_v1 diff --git a/packages/google-cloud-bigquery-analyticshub/tests/unit/gapic/bigquery_analyticshub_v1/test_analytics_hub_service.py b/packages/google-cloud-bigquery-analyticshub/tests/unit/gapic/bigquery_analyticshub_v1/test_analytics_hub_service.py index c3b6799b3e47..7c8148dc6ac1 100644 --- a/packages/google-cloud-bigquery-analyticshub/tests/unit/gapic/bigquery_analyticshub_v1/test_analytics_hub_service.py +++ b/packages/google-cloud-bigquery-analyticshub/tests/unit/gapic/bigquery_analyticshub_v1/test_analytics_hub_service.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +40,19 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,24 +61,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.options_pb2 as options_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore -import google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.bigquery_analyticshub_v1.services.analytics_hub_service import ( AnalyticsHubServiceAsyncClient, @@ -978,10 +979,9 @@ def test_analytics_hub_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1026,9 @@ def test_analytics_hub_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1065,10 +1064,9 @@ def test_analytics_hub_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1317,9 +1315,7 @@ def test_analytics_hub_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1437,9 +1433,9 @@ def test_list_data_exchanges_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_exchanges - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_exchanges] = ( + mock_rpc + ) request = {} client.list_data_exchanges(request) @@ -2541,9 +2537,9 @@ def test_get_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_exchange] = ( + mock_rpc + ) request = {} client.get_data_exchange(request) @@ -2916,9 +2912,9 @@ def test_create_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_exchange] = ( + mock_rpc + ) request = {} client.create_data_exchange(request) @@ -3295,9 +3291,9 @@ def test_update_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_exchange] = ( + mock_rpc + ) request = {} client.update_data_exchange(request) @@ -3659,9 +3655,9 @@ def test_delete_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_exchange] = ( + mock_rpc + ) request = {} client.delete_data_exchange(request) @@ -5995,9 +5991,9 @@ def test_subscribe_listing_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.subscribe_listing - ] = mock_rpc + client._transport._wrapped_methods[client._transport.subscribe_listing] = ( + mock_rpc + ) request = {} client.subscribe_listing(request) @@ -6683,9 +6679,9 @@ def test_refresh_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.refresh_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.refresh_subscription] = ( + mock_rpc + ) request = {} client.refresh_subscription(request) @@ -7039,9 +7035,9 @@ def test_get_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_subscription] = ( + mock_rpc + ) request = {} client.get_subscription(request) @@ -7386,9 +7382,9 @@ def test_list_subscriptions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_subscriptions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_subscriptions] = ( + mock_rpc + ) request = {} client.list_subscriptions(request) @@ -8475,9 +8471,9 @@ def test_revoke_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.revoke_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.revoke_subscription] = ( + mock_rpc + ) request = {} client.revoke_subscription(request) @@ -8810,9 +8806,9 @@ def test_delete_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_subscription] = ( + mock_rpc + ) request = {} client.delete_subscription(request) @@ -9679,9 +9675,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -9969,9 +9965,9 @@ def test_create_query_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_query_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_query_template] = ( + mock_rpc + ) request = {} client.create_query_template(request) @@ -10355,9 +10351,9 @@ def test_get_query_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_query_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_query_template] = ( + mock_rpc + ) request = {} client.get_query_template(request) @@ -10710,9 +10706,9 @@ def test_list_query_templates_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_query_templates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_query_templates] = ( + mock_rpc + ) request = {} client.list_query_templates(request) @@ -11262,9 +11258,9 @@ def test_update_query_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_query_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_query_template] = ( + mock_rpc + ) request = {} client.update_query_template(request) @@ -11624,9 +11620,9 @@ def test_delete_query_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_query_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_query_template] = ( + mock_rpc + ) request = {} client.delete_query_template(request) @@ -11970,9 +11966,9 @@ def test_submit_query_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.submit_query_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.submit_query_template] = ( + mock_rpc + ) request = {} client.submit_query_template(request) @@ -12337,9 +12333,9 @@ def test_approve_query_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.approve_query_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.approve_query_template] = ( + mock_rpc + ) request = {} client.approve_query_template(request) diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/__init__.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/__init__.py index 9cc7930e05b7..05f6277e64b4 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/__init__.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.metastore_service import ( MetastoreServiceAsyncClient, MetastoreServiceClient, diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/async_client.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/async_client.py index 005c3e0219eb..15407e78a13d 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/async_client.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_biglake_v1 import gapic_version as package_version @@ -131,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MetastoreServiceAsyncClient: The constructed client. """ - return MetastoreServiceClient.from_service_account_info.__func__(MetastoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + MetastoreServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(MetastoreServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MetastoreServiceAsyncClient: The constructed client. """ - return MetastoreServiceClient.from_service_account_file.__func__(MetastoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + MetastoreServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(MetastoreServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/client.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/client.py index 7a8e787c635b..30a8df06a647 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/client.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_biglake_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class MetastoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MetastoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MetastoreServiceTransport]] _transport_registry["grpc"] = MetastoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = MetastoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = MetastoreServiceRestTransport @@ -686,11 +684,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MetastoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MetastoreServiceClient._read_environment_variables() + ) self._client_cert_source = MetastoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -725,8 +721,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MetastoreServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/pagers.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/pagers.py index f6be1ef07891..3580a730b6f0 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/pagers.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/base.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/base.py index 24fc561a235d..a00a976bedbf 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/base.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_biglake_v1 import gapic_version as package_version from google.cloud.bigquery_biglake_v1.types import metastore diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc.py index 1bd2ca0086a4..cbaf6e66682e 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_biglake_v1.types import metastore diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc_asyncio.py index f5fbe114e17a..3c6a9eebb73b 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_biglake_v1.types import metastore diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/rest.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/rest.py index f374a02336ff..fa0b59c411cf 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/rest.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1028,9 +1028,7 @@ def __call__( """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseCreateCatalog._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseCreateCatalog._get_http_options() request, metadata = self._interceptor.pre_create_catalog(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseCreateCatalog._get_transcoded_request( @@ -1179,9 +1177,7 @@ def __call__( Database is the container of tables. """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseCreateDatabase._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseCreateDatabase._get_http_options() request, metadata = self._interceptor.pre_create_database(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseCreateDatabase._get_transcoded_request( @@ -1482,9 +1478,7 @@ def __call__( """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseDeleteCatalog._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseDeleteCatalog._get_http_options() request, metadata = self._interceptor.pre_delete_catalog(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseDeleteCatalog._get_transcoded_request( @@ -1627,9 +1621,7 @@ def __call__( Database is the container of tables. """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseDeleteDatabase._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseDeleteDatabase._get_http_options() request, metadata = self._interceptor.pre_delete_database(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseDeleteDatabase._get_transcoded_request( @@ -2505,9 +2497,7 @@ def __call__( """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseListDatabases._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseListDatabases._get_http_options() request, metadata = self._interceptor.pre_list_databases(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseListDatabases._get_transcoded_request( @@ -2949,9 +2939,7 @@ def __call__( Database is the container of tables. """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseUpdateDatabase._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseUpdateDatabase._get_http_options() request, metadata = self._interceptor.pre_update_database(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseUpdateDatabase._get_transcoded_request( diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/types/metastore.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/types/metastore.py index 6cad530e7863..5faddc828c51 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/types/metastore.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/types/metastore.py @@ -66,6 +66,7 @@ class TableView(proto.Enum): FULL (2): Include everything. """ + TABLE_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -160,6 +161,7 @@ class Type(proto.Enum): Represents a database storing tables compatible with Hive Metastore tables. """ + TYPE_UNSPECIFIED = 0 HIVE = 1 @@ -246,6 +248,7 @@ class Type(proto.Enum): Represents a table compatible with Hive Metastore tables. """ + TYPE_UNSPECIFIED = 0 HIVE = 1 diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/__init__.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/__init__.py index a9aeb77caa2b..8ab79e96e0c8 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/__init__.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.metastore_service import ( MetastoreServiceAsyncClient, MetastoreServiceClient, diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/async_client.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/async_client.py index 99fb97440f10..c605d85b0d6d 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/async_client.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_biglake_v1alpha1 import gapic_version as package_version @@ -133,7 +133,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MetastoreServiceAsyncClient: The constructed client. """ - return MetastoreServiceClient.from_service_account_info.__func__(MetastoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + MetastoreServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(MetastoreServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +152,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MetastoreServiceAsyncClient: The constructed client. """ - return MetastoreServiceClient.from_service_account_file.__func__(MetastoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + MetastoreServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(MetastoreServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/client.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/client.py index c1d88b0eae5a..76e7f0415716 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/client.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_biglake_v1alpha1 import gapic_version as package_version @@ -81,9 +81,7 @@ class MetastoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MetastoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MetastoreServiceTransport]] _transport_registry["grpc"] = MetastoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = MetastoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = MetastoreServiceRestTransport @@ -712,11 +710,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MetastoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MetastoreServiceClient._read_environment_variables() + ) self._client_cert_source = MetastoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -751,8 +747,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MetastoreServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/pagers.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/pagers.py index 52f65f7df103..79365f36592f 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/pagers.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/base.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/base.py index 8589fd3aab56..83b5b5b4f902 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/base.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.bigquery_biglake_v1alpha1 import gapic_version as package_version from google.cloud.bigquery_biglake_v1alpha1.types import metastore diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc.py index 3ff80b9965a7..b77909d00158 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_biglake_v1alpha1.types import metastore diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc_asyncio.py index fd0dbf242f7c..70c3cbf1e3b6 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_biglake_v1alpha1.types import metastore diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest.py index 7264d1f60add..3f9e8401ef37 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.bigquery_biglake_v1alpha1.types import metastore @@ -1354,9 +1354,7 @@ def __call__( """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseCreateCatalog._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseCreateCatalog._get_http_options() request, metadata = self._interceptor.pre_create_catalog(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseCreateCatalog._get_transcoded_request( @@ -1505,9 +1503,7 @@ def __call__( Database is the container of tables. """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseCreateDatabase._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseCreateDatabase._get_http_options() request, metadata = self._interceptor.pre_create_database(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseCreateDatabase._get_transcoded_request( @@ -1959,9 +1955,7 @@ def __call__( """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseDeleteCatalog._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseDeleteCatalog._get_http_options() request, metadata = self._interceptor.pre_delete_catalog(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseDeleteCatalog._get_transcoded_request( @@ -2104,9 +2098,7 @@ def __call__( Database is the container of tables. """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseDeleteDatabase._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseDeleteDatabase._get_http_options() request, metadata = self._interceptor.pre_delete_database(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseDeleteDatabase._get_transcoded_request( @@ -3089,9 +3081,7 @@ def __call__( """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseListDatabases._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseListDatabases._get_http_options() request, metadata = self._interceptor.pre_list_databases(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseListDatabases._get_transcoded_request( @@ -3680,9 +3670,7 @@ def __call__( Database is the container of tables. """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseUpdateDatabase._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseUpdateDatabase._get_http_options() request, metadata = self._interceptor.pre_update_database(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseUpdateDatabase._get_transcoded_request( diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest_base.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest_base.py index 3986f6e0d412..0ad4c15ee445 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest_base.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.bigquery_biglake_v1alpha1.types import metastore diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/types/metastore.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/types/metastore.py index 4c4cc61d79a5..4f21c6007160 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/types/metastore.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/types/metastore.py @@ -72,6 +72,7 @@ class TableView(proto.Enum): FULL (2): Include everything. """ + TABLE_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -166,6 +167,7 @@ class Type(proto.Enum): Represents a database storing tables compatible with Hive Metastore tables. """ + TYPE_UNSPECIFIED = 0 HIVE = 1 @@ -252,6 +254,7 @@ class Type(proto.Enum): Represents a table compatible with Hive Metastore tables. """ + TYPE_UNSPECIFIED = 0 HIVE = 1 @@ -329,6 +332,7 @@ class Type(proto.Enum): An exclusive lock prevents another lock from being created on the same resource. """ + TYPE_UNSPECIFIED = 0 EXCLUSIVE = 1 @@ -343,6 +347,7 @@ class State(proto.Enum): ACQUIRED (2): The lock has been acquired. """ + STATE_UNSPECIFIED = 0 WAITING = 1 ACQUIRED = 2 diff --git a/packages/google-cloud-bigquery-biglake/mypy.ini b/packages/google-cloud-bigquery-biglake/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-bigquery-biglake/mypy.ini +++ b/packages/google-cloud-bigquery-biglake/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-bigquery-biglake/noxfile.py b/packages/google-cloud-bigquery-biglake/noxfile.py index e0bd615fb48a..55a036b2608e 100644 --- a/packages/google-cloud-bigquery-biglake/noxfile.py +++ b/packages/google-cloud-bigquery-biglake/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1/test_metastore_service.py b/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1/test_metastore_service.py index 9510e9d7ab52..6e42ca3c4827 100644 --- a/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1/test_metastore_service.py +++ b/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1/test_metastore_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.bigquery_biglake_v1.services.metastore_service import ( MetastoreServiceAsyncClient, @@ -972,10 +977,9 @@ def test_metastore_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1020,10 +1024,9 @@ def test_metastore_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1062,9 @@ def test_metastore_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1314,9 +1316,7 @@ def test_metastore_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1alpha1/test_metastore_service.py b/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1alpha1/test_metastore_service.py index 24b2de4fdc5e..48de023f5f17 100644 --- a/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1alpha1/test_metastore_service.py +++ b/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1alpha1/test_metastore_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.bigquery_biglake_v1alpha1.services.metastore_service import ( MetastoreServiceAsyncClient, @@ -972,10 +977,9 @@ def test_metastore_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1020,10 +1024,9 @@ def test_metastore_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1062,9 @@ def test_metastore_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1314,9 +1316,7 @@ def test_metastore_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/__init__.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/__init__.py index 7d65235e7746..a22c3c9ad153 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/__init__.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.connection_service import ( ConnectionServiceAsyncClient, ConnectionServiceClient, diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/async_client.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/async_client.py index 8efcced98a81..5aac13c3f62a 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/async_client.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_connection_v1 import gapic_version as package_version @@ -49,8 +49,8 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.bigquery_connection_v1.services.connection_service import pagers -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from .client import ConnectionServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ConnectionServiceTransport @@ -122,7 +122,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConnectionServiceAsyncClient: The constructed client. """ - return ConnectionServiceClient.from_service_account_info.__func__(ConnectionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConnectionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConnectionServiceAsyncClient, 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: ConnectionServiceAsyncClient: The constructed client. """ - return ConnectionServiceClient.from_service_account_file.__func__(ConnectionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConnectionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ConnectionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/client.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/client.py index 55773b2e6510..dbcf343836f6 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/client.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_connection_v1 import gapic_version as package_version @@ -66,8 +66,8 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.bigquery_connection_v1.services.connection_service import pagers -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from .transports.base import DEFAULT_CLIENT_INFO, ConnectionServiceTransport from .transports.grpc import ConnectionServiceGrpcTransport @@ -83,9 +83,7 @@ class ConnectionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConnectionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConnectionServiceTransport]] _transport_registry["grpc"] = ConnectionServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConnectionServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConnectionServiceRestTransport @@ -675,11 +673,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConnectionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConnectionServiceClient._read_environment_variables() + ) self._client_cert_source = ConnectionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -714,8 +710,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConnectionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/pagers.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/pagers.py index 442938ce3eae..83abb6d65f58 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/pagers.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/base.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/base.py index d2d3eab8b05d..d2bcabe1a341 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/base.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core -from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1 -from google.api_core import retry as retries import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore import google.protobuf import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials # type: ignore +from google.oauth2 import service_account # type: ignore from google.cloud.bigquery_connection_v1 import gapic_version as package_version -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc.py index 85852a54e46e..b098fded95d8 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from .base import DEFAULT_CLIENT_INFO, ConnectionServiceTransport diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc_asyncio.py index d57efca4b77c..1b11230697c4 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc_asyncio.py @@ -17,25 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from .base import DEFAULT_CLIENT_INFO, ConnectionServiceTransport from .grpc import ConnectionServiceGrpcTransport diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest.py index a5b6d239e501..3d7592561057 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest.py @@ -16,23 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConnectionServiceRestTransport @@ -642,9 +642,7 @@ def __call__( """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseCreateConnection._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseCreateConnection._get_http_options() request, metadata = self._interceptor.pre_create_connection( request, metadata @@ -791,9 +789,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseDeleteConnection._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseDeleteConnection._get_http_options() request, metadata = self._interceptor.pre_delete_connection( request, metadata @@ -908,9 +904,7 @@ def __call__( """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseGetConnection._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseGetConnection._get_http_options() request, metadata = self._interceptor.pre_get_connection(request, metadata) transcoded_request = _BaseConnectionServiceRestTransport._BaseGetConnection._get_transcoded_request( @@ -1128,9 +1122,7 @@ def __call__( """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseConnectionServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1281,9 +1273,7 @@ def __call__( """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseListConnections._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseListConnections._get_http_options() request, metadata = self._interceptor.pre_list_connections( request, metadata @@ -1505,9 +1495,7 @@ def __call__( """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseConnectionServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1656,9 +1644,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1813,9 +1799,7 @@ def __call__( """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseUpdateConnection._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseUpdateConnection._get_http_options() request, metadata = self._interceptor.pre_update_connection( request, metadata diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest_base.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest_base.py index 1206d26e6d92..3f2a157a9033 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest_base.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.protobuf import json_format import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import gapic_v1, path_template +from google.protobuf import json_format -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from .base import DEFAULT_CLIENT_INFO, ConnectionServiceTransport diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/types/connection.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/types/connection.py index 7260f04b70df..18530974c603 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/types/connection.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/types/connection.py @@ -359,6 +359,7 @@ class DatabaseType(proto.Enum): MYSQL (2): Cloud SQL for MySQL. """ + DATABASE_TYPE_UNSPECIFIED = 0 POSTGRES = 1 MYSQL = 2 diff --git a/packages/google-cloud-bigquery-connection/mypy.ini b/packages/google-cloud-bigquery-connection/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-bigquery-connection/mypy.ini +++ b/packages/google-cloud-bigquery-connection/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-bigquery-connection/noxfile.py b/packages/google-cloud-bigquery-connection/noxfile.py index 65946dd1c7e6..59d61fa72f8c 100644 --- a/packages/google-cloud-bigquery-connection/noxfile.py +++ b/packages/google-cloud-bigquery-connection/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_async.py index cfe0bc7ce2e6..1597986573a5 100644 --- a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-connection -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigqueryconnection_v1_generated_ConnectionService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_connection_v1 diff --git a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_sync.py index 5e64f4ad35c2..c33f2a8cfe35 100644 --- a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-connection -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigqueryconnection_v1_generated_ConnectionService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_connection_v1 diff --git a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_async.py index 42cd96773d12..3be1e576575c 100644 --- a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-connection -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigqueryconnection_v1_generated_ConnectionService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_connection_v1 diff --git a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_sync.py index 09a571bb0cd5..2ca01965d3b1 100644 --- a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-connection -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigqueryconnection_v1_generated_ConnectionService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_connection_v1 diff --git a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_async.py index 0c53b77ccef5..c473009835cb 100644 --- a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-connection -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigqueryconnection_v1_generated_ConnectionService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_connection_v1 diff --git a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_sync.py index 1095cbb81b21..3f9222ebe9db 100644 --- a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-connection -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigqueryconnection_v1_generated_ConnectionService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_connection_v1 diff --git a/packages/google-cloud-bigquery-connection/tests/unit/gapic/bigquery_connection_v1/test_connection_service.py b/packages/google-cloud-bigquery-connection/tests/unit/gapic/bigquery_connection_v1/test_connection_service.py index 5daa7290e1fd..b73eb1b2cbef 100644 --- a/packages/google-cloud-bigquery-connection/tests/unit/gapic/bigquery_connection_v1/test_connection_service.py +++ b/packages/google-cloud-bigquery-connection/tests/unit/gapic/bigquery_connection_v1/test_connection_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.options_pb2 as options_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.bigquery_connection_v1.services.connection_service import ( ConnectionServiceAsyncClient, @@ -63,8 +68,8 @@ pagers, transports, ) -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -984,10 +989,9 @@ def test_connection_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1036,9 @@ def test_connection_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1071,10 +1074,9 @@ def test_connection_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1326,9 +1328,7 @@ def test_connection_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1454,9 +1454,9 @@ def test_create_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -2165,9 +2165,9 @@ def test_list_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -2698,9 +2698,9 @@ def test_update_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) @@ -3065,9 +3065,9 @@ def test_delete_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -4078,9 +4078,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4379,9 +4379,9 @@ def test_create_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -4754,9 +4754,9 @@ def test_list_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -5030,9 +5030,9 @@ def test_update_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) @@ -5228,9 +5228,9 @@ def test_delete_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -5769,9 +5769,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/__init__.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/__init__.py index 6dcb3dde344f..286c97e34d23 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/__init__.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.analytics_hub_service import ( AnalyticsHubServiceAsyncClient, AnalyticsHubServiceClient, diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/async_client.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/async_client.py index 15a960ebf0a8..0dbcfa3478ef 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/async_client.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_data_exchange_v1beta1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore from google.cloud.bigquery_data_exchange_v1beta1.services.analytics_hub_service import ( pagers, @@ -133,7 +133,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AnalyticsHubServiceAsyncClient: The constructed client. """ - return AnalyticsHubServiceClient.from_service_account_info.__func__(AnalyticsHubServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AnalyticsHubServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AnalyticsHubServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +152,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AnalyticsHubServiceAsyncClient: The constructed client. """ - return AnalyticsHubServiceClient.from_service_account_file.__func__(AnalyticsHubServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AnalyticsHubServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AnalyticsHubServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -187,7 +193,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AnalyticsHubServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AnalyticsHubServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AnalyticsHubServiceTransport: diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/client.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/client.py index 0699b3946911..255fa207cb97 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/client.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_data_exchange_v1beta1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore from google.cloud.bigquery_data_exchange_v1beta1.services.analytics_hub_service import ( pagers, @@ -84,9 +84,7 @@ class AnalyticsHubServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AnalyticsHubServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsHubServiceTransport]] _transport_registry["grpc"] = AnalyticsHubServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsHubServiceGrpcAsyncIOTransport @@ -677,11 +675,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AnalyticsHubServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AnalyticsHubServiceClient._read_environment_variables() + ) self._client_cert_source = AnalyticsHubServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -716,8 +712,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AnalyticsHubServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/pagers.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/pagers.py index 551718929727..6a7c0c5b8d08 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/pagers.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/__init__.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/__init__.py index d97066cc7aaf..2be520d8722d 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/__init__.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import AnalyticsHubServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AnalyticsHubServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsHubServiceTransport]] _transport_registry["grpc"] = AnalyticsHubServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsHubServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/base.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/base.py index 12b67eb32832..0bc3b48fa999 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/base.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/base.py @@ -17,17 +17,17 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.bigquery_data_exchange_v1beta1 import gapic_version as package_version from google.cloud.bigquery_data_exchange_v1beta1.types import dataexchange diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc.py index dcc7a3f12a1a..363dba685ed7 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc.py @@ -16,21 +16,21 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_data_exchange_v1beta1.types import dataexchange diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc_asyncio.py index a2d85d294213..6789d617eb18 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc_asyncio.py @@ -17,23 +17,23 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.cloud.location import locations_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_data_exchange_v1beta1.types import dataexchange diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/types/dataexchange.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/types/dataexchange.py index 277c582b71ef..224bc6f98e65 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/types/dataexchange.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/types/dataexchange.py @@ -320,6 +320,7 @@ class State(proto.Enum): dataexchange.listings.subscribe permission can subscribe to this listing. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 @@ -368,6 +369,7 @@ class Category(proto.Enum): CATEGORY_TRAVEL_AND_TOURISM (19): No description available. """ + CATEGORY_UNSPECIFIED = 0 CATEGORY_OTHERS = 1 CATEGORY_ADVERTISING_AND_MARKETING = 2 diff --git a/packages/google-cloud-bigquery-data-exchange/mypy.ini b/packages/google-cloud-bigquery-data-exchange/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-bigquery-data-exchange/mypy.ini +++ b/packages/google-cloud-bigquery-data-exchange/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-bigquery-data-exchange/noxfile.py b/packages/google-cloud-bigquery-data-exchange/noxfile.py index fb36003e1b27..6806c9f14884 100644 --- a/packages/google-cloud-bigquery-data-exchange/noxfile.py +++ b/packages/google-cloud-bigquery-data-exchange/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_async.py index 683fc3acff9f..8582cd75e789 100644 --- a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-data-exchange -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START analyticshub_v1beta1_generated_AnalyticsHubService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_data_exchange_v1beta1 diff --git a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_sync.py index 9bea409e6cce..01a97bb23b74 100644 --- a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-data-exchange -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START analyticshub_v1beta1_generated_AnalyticsHubService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_data_exchange_v1beta1 diff --git a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_async.py index 08ac764d3c60..17ff814c0eb9 100644 --- a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-data-exchange -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START analyticshub_v1beta1_generated_AnalyticsHubService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_data_exchange_v1beta1 diff --git a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_sync.py index a7bfd5de37c0..be438a2b7519 100644 --- a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-data-exchange -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START analyticshub_v1beta1_generated_AnalyticsHubService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_data_exchange_v1beta1 diff --git a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_async.py index 7e4b333ef73d..3dc4265a4bf1 100644 --- a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-data-exchange -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START analyticshub_v1beta1_generated_AnalyticsHubService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_data_exchange_v1beta1 diff --git a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_sync.py index 7f332f584b18..1aebcbafd499 100644 --- a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-data-exchange -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START analyticshub_v1beta1_generated_AnalyticsHubService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_data_exchange_v1beta1 diff --git a/packages/google-cloud-bigquery-data-exchange/tests/unit/gapic/bigquery_data_exchange_v1beta1/test_analytics_hub_service.py b/packages/google-cloud-bigquery-data-exchange/tests/unit/gapic/bigquery_data_exchange_v1beta1/test_analytics_hub_service.py index e732622f66f4..289c871f805a 100644 --- a/packages/google-cloud-bigquery-data-exchange/tests/unit/gapic/bigquery_data_exchange_v1beta1/test_analytics_hub_service.py +++ b/packages/google-cloud-bigquery-data-exchange/tests/unit/gapic/bigquery_data_exchange_v1beta1/test_analytics_hub_service.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,21 +40,26 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.options_pb2 as options_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.cloud.location import locations_pb2 +from google.oauth2 import service_account from google.cloud.bigquery_data_exchange_v1beta1.services.analytics_hub_service import ( AnalyticsHubServiceAsyncClient, @@ -966,10 +972,9 @@ def test_analytics_hub_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1019,9 @@ def test_analytics_hub_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1053,10 +1057,9 @@ def test_analytics_hub_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1305,9 +1308,7 @@ def test_analytics_hub_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1425,9 +1426,9 @@ def test_list_data_exchanges_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_exchanges - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_exchanges] = ( + mock_rpc + ) request = {} client.list_data_exchanges(request) @@ -2525,9 +2526,9 @@ def test_get_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_exchange] = ( + mock_rpc + ) request = {} client.get_data_exchange(request) @@ -2892,9 +2893,9 @@ def test_create_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_exchange] = ( + mock_rpc + ) request = {} client.create_data_exchange(request) @@ -3263,9 +3264,9 @@ def test_update_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_exchange] = ( + mock_rpc + ) request = {} client.update_data_exchange(request) @@ -3623,9 +3624,9 @@ def test_delete_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_exchange] = ( + mock_rpc + ) request = {} client.delete_data_exchange(request) @@ -5911,9 +5912,9 @@ def test_subscribe_listing_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.subscribe_listing - ] = mock_rpc + client._transport._wrapped_methods[client._transport.subscribe_listing] = ( + mock_rpc + ) request = {} client.subscribe_listing(request) @@ -6770,9 +6771,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/__init__.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/__init__.py index 072cbb85997e..9e4d3cef6e83 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/__init__.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_policy_service import ( DataPolicyServiceAsyncClient, DataPolicyServiceClient, diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/async_client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/async_client.py index 50c1e8db717f..3a2ae41cde7a 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/async_client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v1 import gapic_version as package_version @@ -121,7 +121,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_info.__func__(DataPolicyServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataPolicyServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataPolicyServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +140,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_file.__func__(DataPolicyServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataPolicyServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataPolicyServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/client.py index 9594242323ac..630c9b093855 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v1 import gapic_version as package_version @@ -82,9 +82,7 @@ class DataPolicyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataPolicyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataPolicyServiceTransport]] _transport_registry["grpc"] = DataPolicyServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataPolicyServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataPolicyServiceRestTransport @@ -632,11 +630,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataPolicyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataPolicyServiceClient._read_environment_variables() + ) self._client_cert_source = DataPolicyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -671,8 +667,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataPolicyServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/pagers.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/pagers.py index 36b4e74ed0b9..7a34d33d4d8c 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/pagers.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/base.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/base.py index 9aae4d04cb04..b8beac6e9a67 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/base.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core -from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1 -from google.api_core import retry as retries import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore import google.protobuf import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials # type: ignore +from google.oauth2 import service_account # type: ignore from google.cloud.bigquery_datapolicies_v1 import gapic_version as package_version from google.cloud.bigquery_datapolicies_v1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc.py index ad5f07bcd045..8be3e0ffe779 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_datapolicies_v1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc_asyncio.py index a0d110873f8c..16fe1871c9b3 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc_asyncio.py @@ -17,22 +17,22 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_datapolicies_v1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest.py index cabcad547500..e2139099b658 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.bigquery_datapolicies_v1.types import datapolicy @@ -695,9 +695,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseCreateDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseCreateDataPolicy._get_http_options() request, metadata = self._interceptor.pre_create_data_policy( request, metadata @@ -844,9 +842,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseDeleteDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseDeleteDataPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_data_policy( request, metadata @@ -958,9 +954,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_http_options() request, metadata = self._interceptor.pre_get_data_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_transcoded_request( @@ -1178,9 +1172,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1331,9 +1323,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseListDataPolicies._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseListDataPolicies._get_http_options() request, metadata = self._interceptor.pre_list_data_policies( request, metadata @@ -1482,9 +1472,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseRenameDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseRenameDataPolicy._get_http_options() request, metadata = self._interceptor.pre_rename_data_policy( request, metadata @@ -1709,9 +1697,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1860,9 +1846,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2014,9 +1998,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseUpdateDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseUpdateDataPolicy._get_http_options() request, metadata = self._interceptor.pre_update_data_policy( request, metadata diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest_base.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest_base.py index 05c68545a5c1..359b74638414 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest_base.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.protobuf import json_format import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import gapic_v1, path_template +from google.protobuf import json_format from google.cloud.bigquery_datapolicies_v1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/types/datapolicy.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/types/datapolicy.py index 1c0794abcacf..3b794f4dfb63 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/types/datapolicy.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/types/datapolicy.py @@ -260,6 +260,7 @@ class DataPolicyType(proto.Enum): Used to create a data policy for data masking. """ + DATA_POLICY_TYPE_UNSPECIFIED = 0 COLUMN_LEVEL_SECURITY_POLICY = 3 DATA_MASKING_POLICY = 2 @@ -388,6 +389,7 @@ class PredefinedExpression(proto.Enum): system variable. For more information, see the System variables reference. """ + PREDEFINED_EXPRESSION_UNSPECIFIED = 0 SHA256 = 3 ALWAYS_NULL = 5 diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/__init__.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/__init__.py index 60dcf15741bc..1b4e76aa7a8a 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/__init__.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_policy_service import ( DataPolicyServiceAsyncClient, DataPolicyServiceClient, diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/async_client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/async_client.py index dee9acd60043..dc55cb873d93 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/async_client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v1beta1 import gapic_version as package_version @@ -123,7 +123,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_info.__func__(DataPolicyServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataPolicyServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataPolicyServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +142,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_file.__func__(DataPolicyServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataPolicyServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataPolicyServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/client.py index 28d909fa9ec0..982347813a6e 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v1beta1 import gapic_version as package_version @@ -83,9 +83,7 @@ class DataPolicyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataPolicyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataPolicyServiceTransport]] _transport_registry["grpc"] = DataPolicyServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataPolicyServiceGrpcAsyncIOTransport @@ -632,11 +630,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataPolicyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataPolicyServiceClient._read_environment_variables() + ) self._client_cert_source = DataPolicyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -671,8 +667,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataPolicyServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/pagers.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/pagers.py index c13a214b5221..acdd4ba54c16 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/pagers.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/base.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/base.py index 6a2c471cfd16..a431c68b8bd5 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/base.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core -from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1 -from google.api_core import retry as retries import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore import google.protobuf import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials # type: ignore +from google.oauth2 import service_account # type: ignore from google.cloud.bigquery_datapolicies_v1beta1 import gapic_version as package_version from google.cloud.bigquery_datapolicies_v1beta1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc.py index c05306d8bfab..118ee2ad85eb 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_datapolicies_v1beta1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc_asyncio.py index d484bd0bb99a..c118ecd854ef 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc_asyncio.py @@ -17,22 +17,22 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_datapolicies_v1beta1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/types/datapolicy.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/types/datapolicy.py index 6903b4c147de..2d00cecc0adc 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/types/datapolicy.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/types/datapolicy.py @@ -224,6 +224,7 @@ class DataPolicyType(proto.Enum): Used to create a data policy for data masking. """ + DATA_POLICY_TYPE_UNSPECIFIED = 0 COLUMN_LEVEL_SECURITY_POLICY = 3 DATA_MASKING_POLICY = 2 @@ -304,6 +305,7 @@ class PredefinedExpression(proto.Enum): - STRUCT: NOT_APPLICABLE - JSON: NULL """ + PREDEFINED_EXPRESSION_UNSPECIFIED = 0 SHA256 = 3 ALWAYS_NULL = 5 diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/__init__.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/__init__.py index 674f50dad48e..39b8fc64e7be 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/__init__.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_policy_service import ( DataPolicyServiceAsyncClient, DataPolicyServiceClient, diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/async_client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/async_client.py index b5c5c36dbdc8..a2ff3d832373 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/async_client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v2 import gapic_version as package_version @@ -125,7 +125,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_info.__func__(DataPolicyServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataPolicyServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataPolicyServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +144,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_file.__func__(DataPolicyServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataPolicyServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataPolicyServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/client.py index ddd86a815f3d..cb8fd1bc0203 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v2 import gapic_version as package_version @@ -82,9 +82,7 @@ class DataPolicyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataPolicyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataPolicyServiceTransport]] _transport_registry["grpc"] = DataPolicyServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataPolicyServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataPolicyServiceRestTransport @@ -678,11 +676,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataPolicyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataPolicyServiceClient._read_environment_variables() + ) self._client_cert_source = DataPolicyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -717,8 +713,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataPolicyServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/pagers.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/pagers.py index ecd9be589c42..c94a28399242 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/pagers.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/base.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/base.py index e78bcb0f913b..a9ad428af1f2 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/base.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core -from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1 -from google.api_core import retry as retries import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore import google.protobuf import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials # type: ignore +from google.oauth2 import service_account # type: ignore from google.cloud.bigquery_datapolicies_v2 import gapic_version as package_version from google.cloud.bigquery_datapolicies_v2.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc.py index 8f27c610daec..d6b1cacb8a85 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_datapolicies_v2.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc_asyncio.py index 9f3b248d78b4..b954f690fc45 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc_asyncio.py @@ -17,22 +17,22 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_datapolicies_v2.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest.py index 651c6a11ba82..b21702351b82 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.bigquery_datapolicies_v2.types import datapolicy @@ -900,9 +900,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseCreateDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseCreateDataPolicy._get_http_options() request, metadata = self._interceptor.pre_create_data_policy( request, metadata @@ -1049,9 +1047,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseDeleteDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseDeleteDataPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_data_policy( request, metadata @@ -1163,9 +1159,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_http_options() request, metadata = self._interceptor.pre_get_data_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_transcoded_request( @@ -1383,9 +1377,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1536,9 +1528,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseListDataPolicies._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseListDataPolicies._get_http_options() request, metadata = self._interceptor.pre_list_data_policies( request, metadata @@ -1687,9 +1677,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseRemoveGrantees._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseRemoveGrantees._get_http_options() request, metadata = self._interceptor.pre_remove_grantees(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseRemoveGrantees._get_transcoded_request( @@ -1912,9 +1900,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2063,9 +2049,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2217,9 +2201,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseUpdateDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseUpdateDataPolicy._get_http_options() request, metadata = self._interceptor.pre_update_data_policy( request, metadata diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest_base.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest_base.py index 4234042ce0bf..8d24d4a4dd85 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest_base.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.protobuf import json_format import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import gapic_v1, path_template +from google.protobuf import json_format from google.cloud.bigquery_datapolicies_v2.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/types/datapolicy.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/types/datapolicy.py index 535733463ee7..7af3f7b531bc 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/types/datapolicy.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/types/datapolicy.py @@ -351,6 +351,7 @@ class DataPolicyType(proto.Enum): GET and LIST operations for V1 data policies in V2 api. """ + DATA_POLICY_TYPE_UNSPECIFIED = 0 DATA_MASKING_POLICY = 1 RAW_DATA_ACCESS_POLICY = 2 @@ -370,6 +371,7 @@ class Version(proto.Enum): V2 (2): V2 data policy version. """ + VERSION_UNSPECIFIED = 0 V1 = 1 V2 = 2 @@ -517,6 +519,7 @@ class PredefinedExpression(proto.Enum): hash / masked result to be different for each query. Hence the name "random hash". """ + PREDEFINED_EXPRESSION_UNSPECIFIED = 0 SHA256 = 1 ALWAYS_NULL = 2 diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/__init__.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/__init__.py index df62f0d8620c..b8eb3a39ad5e 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/__init__.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_policy_service import ( DataPolicyServiceAsyncClient, DataPolicyServiceClient, diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/async_client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/async_client.py index 3f42390596ba..26a9f348c407 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/async_client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v2beta1 import gapic_version as package_version @@ -125,7 +125,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_info.__func__(DataPolicyServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataPolicyServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataPolicyServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +144,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_file.__func__(DataPolicyServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataPolicyServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataPolicyServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/client.py index e02c07547f38..c8cdc3231e2d 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v2beta1 import gapic_version as package_version @@ -84,9 +84,7 @@ class DataPolicyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataPolicyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataPolicyServiceTransport]] _transport_registry["grpc"] = DataPolicyServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataPolicyServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataPolicyServiceRestTransport @@ -658,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataPolicyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataPolicyServiceClient._read_environment_variables() + ) self._client_cert_source = DataPolicyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -697,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataPolicyServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/pagers.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/pagers.py index a0bbc3ad8aba..6beca69a6cf7 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/pagers.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/base.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/base.py index b332025f2f30..b463702e0ab4 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/base.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core -from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1 -from google.api_core import retry as retries import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore import google.protobuf import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials # type: ignore +from google.oauth2 import service_account # type: ignore from google.cloud.bigquery_datapolicies_v2beta1 import gapic_version as package_version from google.cloud.bigquery_datapolicies_v2beta1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc.py index 9f65327d997f..2a43b507cd50 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_datapolicies_v2beta1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc_asyncio.py index 26c26523334f..15a97e04478c 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc_asyncio.py @@ -17,22 +17,22 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_datapolicies_v2beta1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest.py index f0f85f046870..245bcabdce4c 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.bigquery_datapolicies_v2beta1.types import datapolicy @@ -900,9 +900,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseCreateDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseCreateDataPolicy._get_http_options() request, metadata = self._interceptor.pre_create_data_policy( request, metadata @@ -1049,9 +1047,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseDeleteDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseDeleteDataPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_data_policy( request, metadata @@ -1163,9 +1159,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_http_options() request, metadata = self._interceptor.pre_get_data_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_transcoded_request( @@ -1383,9 +1377,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1536,9 +1528,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseListDataPolicies._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseListDataPolicies._get_http_options() request, metadata = self._interceptor.pre_list_data_policies( request, metadata @@ -1687,9 +1677,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseRemoveGrantees._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseRemoveGrantees._get_http_options() request, metadata = self._interceptor.pre_remove_grantees(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseRemoveGrantees._get_transcoded_request( @@ -1912,9 +1900,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2063,9 +2049,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2217,9 +2201,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseUpdateDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseUpdateDataPolicy._get_http_options() request, metadata = self._interceptor.pre_update_data_policy( request, metadata diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest_base.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest_base.py index 6a07f94a9644..208d33fb164e 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest_base.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.protobuf import json_format import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import gapic_v1, path_template +from google.protobuf import json_format from google.cloud.bigquery_datapolicies_v2beta1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/types/datapolicy.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/types/datapolicy.py index 39eba8188a45..ab09949cf6fb 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/types/datapolicy.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/types/datapolicy.py @@ -324,6 +324,7 @@ class DataPolicyType(proto.Enum): Used to create a data policy for raw data access. """ + DATA_POLICY_TYPE_UNSPECIFIED = 0 DATA_MASKING_POLICY = 1 RAW_DATA_ACCESS_POLICY = 2 @@ -342,6 +343,7 @@ class Version(proto.Enum): V2 (2): V2 data policy version. """ + VERSION_UNSPECIFIED = 0 V1 = 1 V2 = 2 @@ -433,6 +435,7 @@ class PredefinedExpression(proto.Enum): - STRUCT: NOT_APPLICABLE - JSON: NULL """ + PREDEFINED_EXPRESSION_UNSPECIFIED = 0 SHA256 = 1 ALWAYS_NULL = 2 diff --git a/packages/google-cloud-bigquery-datapolicies/mypy.ini b/packages/google-cloud-bigquery-datapolicies/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-bigquery-datapolicies/mypy.ini +++ b/packages/google-cloud-bigquery-datapolicies/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-bigquery-datapolicies/noxfile.py b/packages/google-cloud-bigquery-datapolicies/noxfile.py index 42d398433113..718c23648157 100644 --- a/packages/google-cloud-bigquery-datapolicies/noxfile.py +++ b/packages/google-cloud-bigquery-datapolicies/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_async.py index 16e8fb49a0c2..66ec9f92b129 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1_generated_DataPolicyService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_sync.py index 3d7582b45a0d..3a669686bac2 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1_generated_DataPolicyService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_async.py index af6d69fdc328..1268cd521d89 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1_generated_DataPolicyService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_sync.py index 756caec96253..0594916ea20f 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1_generated_DataPolicyService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_async.py index 141401bc2220..e55daf5ac3d0 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1_generated_DataPolicyService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_sync.py index 5172f5cac6dd..87cfc1c66baf 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1_generated_DataPolicyService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_async.py index a9e04cba3cc9..a49d65de20fd 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1beta1_generated_DataPolicyService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_sync.py index e40e92bc054e..ecab0065a1b4 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1beta1_generated_DataPolicyService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_async.py index 9317e461f376..4b0ed461a800 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1beta1_generated_DataPolicyService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_sync.py index aaeb37eaa269..9d8d76a9f628 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1beta1_generated_DataPolicyService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_async.py index 53ad1d53d973..0040262abd43 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1beta1_generated_DataPolicyService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_sync.py index 837aa8b24ea6..511851113f4b 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1beta1_generated_DataPolicyService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_async.py index 2f08b548a11f..66b32c73fda1 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2_generated_DataPolicyService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_sync.py index 1f8fe8f85f68..c24e722be1b6 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2_generated_DataPolicyService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_async.py index acdf6558d943..425528fe7132 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2_generated_DataPolicyService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_sync.py index 4ba51eb19e0f..63cce6596fea 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2_generated_DataPolicyService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_async.py index 7bd12d5dc695..34a252a9eb10 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2_generated_DataPolicyService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_sync.py index 8d37b0cbe1f7..64f74a3836cf 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2_generated_DataPolicyService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_async.py index 8a37b4fe2770..4a07f8ddac62 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2beta1_generated_DataPolicyService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_sync.py index e1bc25c90564..e16feca4d0dd 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2beta1_generated_DataPolicyService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_async.py index 217b2c772587..6708fd721e2a 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2beta1_generated_DataPolicyService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_sync.py index 4b213c1f7659..6d05f4697f39 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2beta1_generated_DataPolicyService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_async.py index 645c849d482a..c400dc7c6ede 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2beta1_generated_DataPolicyService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_sync.py index 86f485d36b75..227d57733ff7 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2beta1_generated_DataPolicyService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1/test_data_policy_service.py b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1/test_data_policy_service.py index fe2ccd998167..131e66d75ddc 100644 --- a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1/test_data_policy_service.py +++ b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1/test_data_policy_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.options_pb2 as options_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.bigquery_datapolicies_v1.services.data_policy_service import ( DataPolicyServiceAsyncClient, @@ -983,10 +988,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1035,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1070,10 +1073,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1325,9 +1327,7 @@ def test_data_policy_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1451,9 +1451,9 @@ def test_create_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_policy] = ( + mock_rpc + ) request = {} client.create_data_policy(request) @@ -1813,9 +1813,9 @@ def test_update_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_policy] = ( + mock_rpc + ) request = {} client.update_data_policy(request) @@ -2181,9 +2181,9 @@ def test_rename_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.rename_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.rename_data_policy] = ( + mock_rpc + ) request = {} client.rename_data_policy(request) @@ -2536,9 +2536,9 @@ def test_delete_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_policy] = ( + mock_rpc + ) request = {} client.delete_data_policy(request) @@ -3210,9 +3210,9 @@ def test_list_data_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_policies] = ( + mock_rpc + ) request = {} client.list_data_policies(request) @@ -4274,9 +4274,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4481,9 +4481,9 @@ def test_create_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_policy] = ( + mock_rpc + ) request = {} client.create_data_policy(request) @@ -4674,9 +4674,9 @@ def test_update_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_policy] = ( + mock_rpc + ) request = {} client.update_data_policy(request) @@ -4860,9 +4860,9 @@ def test_rename_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.rename_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.rename_data_policy] = ( + mock_rpc + ) request = {} client.rename_data_policy(request) @@ -5059,9 +5059,9 @@ def test_delete_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_policy] = ( + mock_rpc + ) request = {} client.delete_data_policy(request) @@ -5418,9 +5418,9 @@ def test_list_data_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_policies] = ( + mock_rpc + ) request = {} client.list_data_policies(request) @@ -5926,9 +5926,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1beta1/test_data_policy_service.py b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1beta1/test_data_policy_service.py index 8219e00d2b0f..c9220d732ee0 100644 --- a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1beta1/test_data_policy_service.py +++ b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1beta1/test_data_policy_service.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,19 +40,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.options_pb2 as options_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.bigquery_datapolicies_v1beta1.services.data_policy_service import ( DataPolicyServiceAsyncClient, @@ -954,10 +960,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1002,10 +1007,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1045,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1289,9 +1292,7 @@ def test_data_policy_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1415,9 +1416,9 @@ def test_create_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_policy] = ( + mock_rpc + ) request = {} client.create_data_policy(request) @@ -1777,9 +1778,9 @@ def test_update_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_policy] = ( + mock_rpc + ) request = {} client.update_data_policy(request) @@ -2132,9 +2133,9 @@ def test_delete_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_policy] = ( + mock_rpc + ) request = {} client.delete_data_policy(request) @@ -2804,9 +2805,9 @@ def test_list_data_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_policies] = ( + mock_rpc + ) request = {} client.list_data_policies(request) @@ -3868,9 +3869,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2/test_data_policy_service.py b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2/test_data_policy_service.py index 2305293e8ff6..d08ed4d4b0a3 100644 --- a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2/test_data_policy_service.py +++ b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2/test_data_policy_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.options_pb2 as options_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.bigquery_datapolicies_v2.services.data_policy_service import ( DataPolicyServiceAsyncClient, @@ -983,10 +988,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1035,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1070,10 +1073,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1325,9 +1327,7 @@ def test_data_policy_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1460,9 +1460,9 @@ def test_create_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_policy] = ( + mock_rpc + ) request = {} client.create_data_policy(request) @@ -2597,9 +2597,9 @@ def test_update_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_policy] = ( + mock_rpc + ) request = {} client.update_data_policy(request) @@ -2984,9 +2984,9 @@ def test_delete_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_policy] = ( + mock_rpc + ) request = {} client.delete_data_policy(request) @@ -3673,9 +3673,9 @@ def test_list_data_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_policies] = ( + mock_rpc + ) request = {} client.list_data_policies(request) @@ -4737,9 +4737,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4944,9 +4944,9 @@ def test_create_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_policy] = ( + mock_rpc + ) request = {} client.create_data_policy(request) @@ -5540,9 +5540,9 @@ def test_update_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_policy] = ( + mock_rpc + ) request = {} client.update_data_policy(request) @@ -5747,9 +5747,9 @@ def test_delete_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_policy] = ( + mock_rpc + ) request = {} client.delete_data_policy(request) @@ -6106,9 +6106,9 @@ def test_list_data_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_policies] = ( + mock_rpc + ) request = {} client.list_data_policies(request) @@ -6614,9 +6614,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2beta1/test_data_policy_service.py b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2beta1/test_data_policy_service.py index 84622ba1c5f7..ee384eeb6c1e 100644 --- a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2beta1/test_data_policy_service.py +++ b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2beta1/test_data_policy_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.options_pb2 as options_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.bigquery_datapolicies_v2beta1.services.data_policy_service import ( DataPolicyServiceAsyncClient, @@ -983,10 +988,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1035,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1070,10 +1073,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1325,9 +1327,7 @@ def test_data_policy_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1460,9 +1460,9 @@ def test_create_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_policy] = ( + mock_rpc + ) request = {} client.create_data_policy(request) @@ -2597,9 +2597,9 @@ def test_update_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_policy] = ( + mock_rpc + ) request = {} client.update_data_policy(request) @@ -2984,9 +2984,9 @@ def test_delete_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_policy] = ( + mock_rpc + ) request = {} client.delete_data_policy(request) @@ -3671,9 +3671,9 @@ def test_list_data_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_policies] = ( + mock_rpc + ) request = {} client.list_data_policies(request) @@ -4735,9 +4735,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4942,9 +4942,9 @@ def test_create_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_policy] = ( + mock_rpc + ) request = {} client.create_data_policy(request) @@ -5538,9 +5538,9 @@ def test_update_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_policy] = ( + mock_rpc + ) request = {} client.update_data_policy(request) @@ -5732,9 +5732,9 @@ def test_delete_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_policy] = ( + mock_rpc + ) request = {} client.delete_data_policy(request) @@ -6091,9 +6091,9 @@ def test_list_data_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_policies] = ( + mock_rpc + ) request = {} client.list_data_policies(request) @@ -6597,9 +6597,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/__init__.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/__init__.py index a3f485409113..fd7335d8023c 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/__init__.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_transfer_service import ( DataTransferServiceAsyncClient, DataTransferServiceClient, diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/async_client.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/async_client.py index 4e11e7e4a7f5..1c1f2de59164 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/async_client.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datatransfer_v1 import gapic_version as package_version @@ -45,12 +45,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore 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.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 google.cloud.location import locations_pb2 # type: ignore from google.cloud.bigquery_datatransfer_v1.services.data_transfer_service import pagers from google.cloud.bigquery_datatransfer_v1.types import datatransfer, transfer @@ -131,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataTransferServiceAsyncClient: The constructed client. """ - return DataTransferServiceClient.from_service_account_info.__func__(DataTransferServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataTransferServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataTransferServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataTransferServiceAsyncClient: The constructed client. """ - return DataTransferServiceClient.from_service_account_file.__func__(DataTransferServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataTransferServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataTransferServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -185,7 +191,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataTransferServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataTransferServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataTransferServiceTransport: diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/client.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/client.py index a5447c739db9..1ea2ea896fd9 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/client.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datatransfer_v1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore 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.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 google.cloud.location import locations_pb2 # type: ignore from google.cloud.bigquery_datatransfer_v1.services.data_transfer_service import pagers from google.cloud.bigquery_datatransfer_v1.types import datatransfer, transfer @@ -85,9 +85,7 @@ class DataTransferServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataTransferServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataTransferServiceTransport]] _transport_registry["grpc"] = DataTransferServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataTransferServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataTransferServiceRestTransport @@ -672,11 +670,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataTransferServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataTransferServiceClient._read_environment_variables() + ) self._client_cert_source = DataTransferServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -711,8 +707,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataTransferServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/pagers.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/pagers.py index df1ff367b00e..d457e9675774 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/pagers.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/__init__.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/__init__.py index 7a2276d6b11f..93f26c5ea89e 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/__init__.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import DataTransferServiceRestInterceptor, DataTransferServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataTransferServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataTransferServiceTransport]] _transport_registry["grpc"] = DataTransferServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataTransferServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataTransferServiceRestTransport diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/base.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/base.py index 79876cd69d19..bba198be487e 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/base.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.bigquery_datatransfer_v1 import gapic_version as package_version from google.cloud.bigquery_datatransfer_v1.types import datatransfer, transfer diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc.py index 53d8210f2e39..28d420a066fd 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.cloud.location import locations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_datatransfer_v1.types import datatransfer, transfer @@ -574,12 +574,12 @@ def start_manual_transfer_runs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "start_manual_transfer_runs" not in self._stubs: - self._stubs[ - "start_manual_transfer_runs" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.datatransfer.v1.DataTransferService/StartManualTransferRuns", - request_serializer=datatransfer.StartManualTransferRunsRequest.serialize, - response_deserializer=datatransfer.StartManualTransferRunsResponse.deserialize, + self._stubs["start_manual_transfer_runs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.datatransfer.v1.DataTransferService/StartManualTransferRuns", + request_serializer=datatransfer.StartManualTransferRunsRequest.serialize, + response_deserializer=datatransfer.StartManualTransferRunsResponse.deserialize, + ) ) return self._stubs["start_manual_transfer_runs"] diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc_asyncio.py index ab9e07b7da82..195fe511facb 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.cloud.location import locations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_datatransfer_v1.types import datatransfer, transfer @@ -593,12 +593,12 @@ def start_manual_transfer_runs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "start_manual_transfer_runs" not in self._stubs: - self._stubs[ - "start_manual_transfer_runs" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.datatransfer.v1.DataTransferService/StartManualTransferRuns", - request_serializer=datatransfer.StartManualTransferRunsRequest.serialize, - response_deserializer=datatransfer.StartManualTransferRunsResponse.deserialize, + self._stubs["start_manual_transfer_runs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.datatransfer.v1.DataTransferService/StartManualTransferRuns", + request_serializer=datatransfer.StartManualTransferRunsRequest.serialize, + response_deserializer=datatransfer.StartManualTransferRunsResponse.deserialize, + ) ) return self._stubs["start_manual_transfer_runs"] diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest.py index 9d1bf4e5ab6d..1b96db40e650 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.bigquery_datatransfer_v1.types import datatransfer, transfer @@ -1053,9 +1053,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseCheckValidCreds._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseCheckValidCreds._get_http_options() request, metadata = self._interceptor.pre_check_valid_creds( request, metadata @@ -1228,9 +1226,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseCreateTransferConfig._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseCreateTransferConfig._get_http_options() request, metadata = self._interceptor.pre_create_transfer_config( request, metadata @@ -1381,9 +1377,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseDeleteTransferConfig._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseDeleteTransferConfig._get_http_options() request, metadata = self._interceptor.pre_delete_transfer_config( request, metadata @@ -1493,9 +1487,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseDeleteTransferRun._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseDeleteTransferRun._get_http_options() request, metadata = self._interceptor.pre_delete_transfer_run( request, metadata @@ -1606,9 +1598,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseEnrollDataSources._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseEnrollDataSources._get_http_options() request, metadata = self._interceptor.pre_enroll_data_sources( request, metadata @@ -1728,9 +1718,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseGetDataSource._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseGetDataSource._get_http_options() request, metadata = self._interceptor.pre_get_data_source(request, metadata) transcoded_request = _BaseDataTransferServiceRestTransport._BaseGetDataSource._get_transcoded_request( @@ -1881,9 +1869,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseGetTransferConfig._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseGetTransferConfig._get_http_options() request, metadata = self._interceptor.pre_get_transfer_config( request, metadata @@ -2031,9 +2017,7 @@ def __call__( Represents a data transfer run. """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseGetTransferRun._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseGetTransferRun._get_http_options() request, metadata = self._interceptor.pre_get_transfer_run( request, metadata @@ -2182,9 +2166,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseListDataSources._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseListDataSources._get_http_options() request, metadata = self._interceptor.pre_list_data_sources( request, metadata @@ -2334,9 +2316,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseListTransferConfigs._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseListTransferConfigs._get_http_options() request, metadata = self._interceptor.pre_list_transfer_configs( request, metadata @@ -2489,9 +2469,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseListTransferLogs._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseListTransferLogs._get_http_options() request, metadata = self._interceptor.pre_list_transfer_logs( request, metadata @@ -2640,9 +2618,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseListTransferRuns._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseListTransferRuns._get_http_options() request, metadata = self._interceptor.pre_list_transfer_runs( request, metadata @@ -2793,9 +2769,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseScheduleTransferRuns._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseScheduleTransferRuns._get_http_options() request, metadata = self._interceptor.pre_schedule_transfer_runs( request, metadata @@ -2954,9 +2928,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseStartManualTransferRuns._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseStartManualTransferRuns._get_http_options() request, metadata = self._interceptor.pre_start_manual_transfer_runs( request, metadata @@ -3108,9 +3080,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseUnenrollDataSources._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseUnenrollDataSources._get_http_options() request, metadata = self._interceptor.pre_unenroll_data_sources( request, metadata @@ -3244,9 +3214,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseUpdateTransferConfig._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseUpdateTransferConfig._get_http_options() request, metadata = self._interceptor.pre_update_transfer_config( request, metadata @@ -3470,7 +3438,9 @@ def start_manual_transfer_runs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._StartManualTransferRuns(self._session, self._host, self._interceptor) # type: ignore + return self._StartManualTransferRuns( + self._session, self._host, self._interceptor + ) # type: ignore @property def unenroll_data_sources( @@ -3546,9 +3516,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDataTransferServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -3687,9 +3655,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataTransferServiceRestTransport._BaseListLocations._get_transcoded_request( diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest_base.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest_base.py index b9c14b997c8f..2dcd598406e8 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest_base.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.bigquery_datatransfer_v1.types import datatransfer, transfer diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/datatransfer.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/datatransfer.py index aa449c954d20..4db571428896 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/datatransfer.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/datatransfer.py @@ -126,6 +126,7 @@ class Type(proto.Enum): LIST (7): List of strings parameter. """ + TYPE_UNSPECIFIED = 0 STRING = 1 INTEGER = 2 @@ -285,6 +286,7 @@ class AuthorizationType(proto.Enum): FIRST_PARTY_OAUTH (3): Use First Party OAuth. """ + AUTHORIZATION_TYPE_UNSPECIFIED = 0 AUTHORIZATION_CODE = 1 GOOGLE_PLUS_AUTHORIZATION_CODE = 2 @@ -308,6 +310,7 @@ class DataRefreshType(proto.Enum): days. Allows custom values to be set for each transfer config. """ + DATA_REFRESH_TYPE_UNSPECIFIED = 0 SLIDING_WINDOW = 1 CUSTOM_SLIDING_WINDOW = 2 @@ -863,6 +866,7 @@ class RunAttempt(proto.Enum): LATEST (1): Only latest run per day should be returned. """ + RUN_ATTEMPT_UNSPECIFIED = 0 LATEST = 1 @@ -956,12 +960,12 @@ class ListTransferLogsRequest(proto.Message): proto.INT32, number=5, ) - message_types: MutableSequence[ - transfer.TransferMessage.MessageSeverity - ] = proto.RepeatedField( - proto.ENUM, - number=6, - enum=transfer.TransferMessage.MessageSeverity, + message_types: MutableSequence[transfer.TransferMessage.MessageSeverity] = ( + proto.RepeatedField( + proto.ENUM, + number=6, + enum=transfer.TransferMessage.MessageSeverity, + ) ) diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/transfer.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/transfer.py index 8557bd4b8745..6665c9f662c2 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/transfer.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/transfer.py @@ -56,6 +56,7 @@ class TransferType(proto.Enum): source currently doesn't support multiple transfer configs per project. """ + _pb_options = {"deprecated": True} TRANSFER_TYPE_UNSPECIFIED = 0 BATCH = 1 @@ -80,6 +81,7 @@ class TransferState(proto.Enum): CANCELLED (6): Data transfer is cancelled (6). """ + TRANSFER_STATE_UNSPECIFIED = 0 PENDING = 2 RUNNING = 3 @@ -690,6 +692,7 @@ class MessageSeverity(proto.Enum): ERROR (3): Error message. """ + MESSAGE_SEVERITY_UNSPECIFIED = 0 INFO = 1 WARNING = 2 diff --git a/packages/google-cloud-bigquery-datatransfer/mypy.ini b/packages/google-cloud-bigquery-datatransfer/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-bigquery-datatransfer/mypy.ini +++ b/packages/google-cloud-bigquery-datatransfer/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-bigquery-datatransfer/noxfile.py b/packages/google-cloud-bigquery-datatransfer/noxfile.py index 7157f8f22ca2..854a758dbe74 100644 --- a/packages/google-cloud-bigquery-datatransfer/noxfile.py +++ b/packages/google-cloud-bigquery-datatransfer/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-datatransfer/tests/unit/gapic/bigquery_datatransfer_v1/test_data_transfer_service.py b/packages/google-cloud-bigquery-datatransfer/tests/unit/gapic/bigquery_datatransfer_v1/test_data_transfer_service.py index 928bc76a64dc..5ad4de062c36 100644 --- a/packages/google-cloud-bigquery-datatransfer/tests/unit/gapic/bigquery_datatransfer_v1/test_data_transfer_service.py +++ b/packages/google-cloud-bigquery-datatransfer/tests/unit/gapic/bigquery_datatransfer_v1/test_data_transfer_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,7 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.oauth2 import service_account import google.protobuf.any_pb2 as any_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore @@ -59,6 +51,19 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.cloud.location import locations_pb2 +from google.oauth2 import service_account from google.cloud.bigquery_datatransfer_v1.services.data_transfer_service import ( DataTransferServiceAsyncClient, @@ -1000,10 +1005,9 @@ def test_data_transfer_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1048,10 +1052,9 @@ def test_data_transfer_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1087,10 +1090,9 @@ def test_data_transfer_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1350,9 +1352,7 @@ def test_data_transfer_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1860,9 +1860,9 @@ def test_list_data_sources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_sources] = ( + mock_rpc + ) request = {} client.list_data_sources(request) @@ -2429,9 +2429,9 @@ def test_create_transfer_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_transfer_config] = ( + mock_rpc + ) request = {} client.create_transfer_config(request) @@ -2823,9 +2823,9 @@ def test_update_transfer_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_transfer_config] = ( + mock_rpc + ) request = {} client.update_transfer_config(request) @@ -3191,9 +3191,9 @@ def test_delete_transfer_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_transfer_config] = ( + mock_rpc + ) request = {} client.delete_transfer_config(request) @@ -3543,9 +3543,9 @@ def test_get_transfer_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transfer_config] = ( + mock_rpc + ) request = {} client.get_transfer_config(request) @@ -3905,9 +3905,9 @@ def test_list_transfer_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transfer_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transfer_configs] = ( + mock_rpc + ) request = {} client.list_transfer_configs(request) @@ -4447,9 +4447,9 @@ def test_schedule_transfer_runs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.schedule_transfer_runs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.schedule_transfer_runs] = ( + mock_rpc + ) request = {} client.schedule_transfer_runs(request) @@ -5062,9 +5062,9 @@ def test_get_transfer_run_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transfer_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transfer_run] = ( + mock_rpc + ) request = {} client.get_transfer_run(request) @@ -5400,9 +5400,9 @@ def test_delete_transfer_run_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_transfer_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_transfer_run] = ( + mock_rpc + ) request = {} client.delete_transfer_run(request) @@ -5734,9 +5734,9 @@ def test_list_transfer_runs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transfer_runs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transfer_runs] = ( + mock_rpc + ) request = {} client.list_transfer_runs(request) @@ -6279,9 +6279,9 @@ def test_list_transfer_logs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transfer_logs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transfer_logs] = ( + mock_rpc + ) request = {} client.list_transfer_logs(request) @@ -6820,9 +6820,9 @@ def test_check_valid_creds_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.check_valid_creds - ] = mock_rpc + client._transport._wrapped_methods[client._transport.check_valid_creds] = ( + mock_rpc + ) request = {} client.check_valid_creds(request) @@ -7158,9 +7158,9 @@ def test_enroll_data_sources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enroll_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enroll_data_sources] = ( + mock_rpc + ) request = {} client.enroll_data_sources(request) @@ -7404,9 +7404,9 @@ def test_unenroll_data_sources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.unenroll_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.unenroll_data_sources] = ( + mock_rpc + ) request = {} client.unenroll_data_sources(request) @@ -7763,9 +7763,9 @@ def test_list_data_sources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_sources] = ( + mock_rpc + ) request = {} client.list_data_sources(request) @@ -8024,9 +8024,9 @@ def test_create_transfer_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_transfer_config] = ( + mock_rpc + ) request = {} client.create_transfer_config(request) @@ -8232,9 +8232,9 @@ def test_update_transfer_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_transfer_config] = ( + mock_rpc + ) request = {} client.update_transfer_config(request) @@ -8441,9 +8441,9 @@ def test_delete_transfer_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_transfer_config] = ( + mock_rpc + ) request = {} client.delete_transfer_config(request) @@ -8620,9 +8620,9 @@ def test_get_transfer_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transfer_config] = ( + mock_rpc + ) request = {} client.get_transfer_config(request) @@ -8805,9 +8805,9 @@ def test_list_transfer_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transfer_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transfer_configs] = ( + mock_rpc + ) request = {} client.list_transfer_configs(request) @@ -9068,9 +9068,9 @@ def test_schedule_transfer_runs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.schedule_transfer_runs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.schedule_transfer_runs] = ( + mock_rpc + ) request = {} client.schedule_transfer_runs(request) @@ -9390,9 +9390,9 @@ def test_get_transfer_run_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transfer_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transfer_run] = ( + mock_rpc + ) request = {} client.get_transfer_run(request) @@ -9574,9 +9574,9 @@ def test_delete_transfer_run_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_transfer_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_transfer_run] = ( + mock_rpc + ) request = {} client.delete_transfer_run(request) @@ -9753,9 +9753,9 @@ def test_list_transfer_runs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transfer_runs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transfer_runs] = ( + mock_rpc + ) request = {} client.list_transfer_runs(request) @@ -10021,9 +10021,9 @@ def test_list_transfer_logs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transfer_logs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transfer_logs] = ( + mock_rpc + ) request = {} client.list_transfer_logs(request) @@ -10285,9 +10285,9 @@ def test_check_valid_creds_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.check_valid_creds - ] = mock_rpc + client._transport._wrapped_methods[client._transport.check_valid_creds] = ( + mock_rpc + ) request = {} client.check_valid_creds(request) @@ -10470,9 +10470,9 @@ def test_enroll_data_sources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enroll_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enroll_data_sources] = ( + mock_rpc + ) request = {} client.enroll_data_sources(request) @@ -10593,9 +10593,9 @@ def test_unenroll_data_sources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.unenroll_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.unenroll_data_sources] = ( + mock_rpc + ) request = {} client.unenroll_data_sources(request) diff --git a/packages/google-cloud-bigquery-logging/google/cloud/bigquery_logging_v1/__init__.py b/packages/google-cloud-bigquery-logging/google/cloud/bigquery_logging_v1/__init__.py index c8f9f992fcaa..fcd4d8cdebe3 100644 --- a/packages/google-cloud-bigquery-logging/google/cloud/bigquery_logging_v1/__init__.py +++ b/packages/google-cloud-bigquery-logging/google/cloud/bigquery_logging_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.audit_data import ( AuditData, BigQueryAcl, diff --git a/packages/google-cloud-bigquery-logging/mypy.ini b/packages/google-cloud-bigquery-logging/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-bigquery-logging/mypy.ini +++ b/packages/google-cloud-bigquery-logging/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-bigquery-logging/noxfile.py b/packages/google-cloud-bigquery-logging/noxfile.py index b14969c771b6..bab4ae344fe6 100644 --- a/packages/google-cloud-bigquery-logging/noxfile.py +++ b/packages/google-cloud-bigquery-logging/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/__init__.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/__init__.py index 5fa1869e10ef..7cd6902401a4 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/__init__.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.migration_service import ( MigrationServiceAsyncClient, MigrationServiceClient, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/async_client.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/async_client.py index f1712d9a9d0d..e145142e22d2 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/async_client.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_migration_v2 import gapic_version as package_version @@ -129,7 +129,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MigrationServiceAsyncClient: The constructed client. """ - return MigrationServiceClient.from_service_account_info.__func__(MigrationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + MigrationServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(MigrationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +148,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MigrationServiceAsyncClient: The constructed client. """ - return MigrationServiceClient.from_service_account_file.__func__(MigrationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + MigrationServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(MigrationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/client.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/client.py index ab4d6ce7f139..8f699cd2ed33 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/client.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_migration_v2 import gapic_version as package_version @@ -85,9 +85,7 @@ class MigrationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MigrationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MigrationServiceTransport]] _transport_registry["grpc"] = MigrationServiceGrpcTransport _transport_registry["grpc_asyncio"] = MigrationServiceGrpcAsyncIOTransport @@ -652,11 +650,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MigrationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MigrationServiceClient._read_environment_variables() + ) self._client_cert_source = MigrationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -691,8 +687,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MigrationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/pagers.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/pagers.py index e250732c1fb4..085817a45412 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/pagers.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -230,7 +230,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -308,7 +308,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/base.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/base.py index 39ce029ae5aa..28a2b6366d15 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/base.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.bigquery_migration_v2 import gapic_version as package_version from google.cloud.bigquery_migration_v2.types import ( diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc.py index 860e09d03347..c96be6ad43e5 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_migration_v2.types import ( migration_entities, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc_asyncio.py index bc43e97e02dd..af82c8b62fc9 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_migration_v2.types import ( migration_entities, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/__init__.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/__init__.py index ab4720f6619f..f8eeabbfabe5 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/__init__.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/__init__.py @@ -20,8 +20,17 @@ MigrationWorkflow, TranslationTaskResult, ) -from .migration_error_details import ErrorDetail, ErrorLocation, ResourceErrorDetail -from .migration_metrics import Point, TimeInterval, TimeSeries, TypedValue +from .migration_error_details import ( + ErrorDetail, + ErrorLocation, + ResourceErrorDetail, +) +from .migration_metrics import ( + Point, + TimeInterval, + TimeSeries, + TypedValue, +) from .migration_service import ( CreateMigrationWorkflowRequest, DeleteMigrationWorkflowRequest, @@ -67,8 +76,12 @@ TargetSpec, TranslationDetails, ) -from .translation_suggestion import TranslationReportRecord -from .translation_usability import GcsReportLogMessage +from .translation_suggestion import ( + TranslationReportRecord, +) +from .translation_usability import ( + GcsReportLogMessage, +) __all__ = ( "MigrationSubtask", diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_entities.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_entities.py index 222802841889..6646d0eea0fa 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_entities.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_entities.py @@ -25,11 +25,11 @@ migration_error_details, migration_metrics, translation_config, + translation_usability, ) from google.cloud.bigquery_migration_v2.types import ( translation_details as gcbm_translation_details, ) -from google.cloud.bigquery_migration_v2.types import translation_usability __protobuf__ = proto.module( package="google.cloud.bigquery.migration.v2", @@ -92,6 +92,7 @@ class State(proto.Enum): (e.g. forced termination), they will not be scheduled. """ + STATE_UNSPECIFIED = 0 DRAFT = 1 RUNNING = 2 @@ -217,6 +218,7 @@ class State(proto.Enum): FAILED (6): The task finished unsuccessfully. """ + STATE_UNSPECIFIED = 0 PENDING = 1 ORCHESTRATING = 2 @@ -371,6 +373,7 @@ class State(proto.Enum): The subtask is pending a dependency. It will be scheduled once its dependencies are done. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 RUNNING = 2 @@ -460,19 +463,19 @@ class TranslationTaskResult(proto.Message): a migration workflow. """ - translated_literals: MutableSequence[ - gcbm_translation_details.Literal - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcbm_translation_details.Literal, + translated_literals: MutableSequence[gcbm_translation_details.Literal] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcbm_translation_details.Literal, + ) ) - report_log_messages: MutableSequence[ - translation_usability.GcsReportLogMessage - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=translation_usability.GcsReportLogMessage, + report_log_messages: MutableSequence[translation_usability.GcsReportLogMessage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=translation_usability.GcsReportLogMessage, + ) ) diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_service.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_service.py index e9e0a20c3a69..f6b92940e500 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_service.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_service.py @@ -141,12 +141,12 @@ class ListMigrationWorkflowsResponse(proto.Message): def raw_page(self): return self - migration_workflows: MutableSequence[ - migration_entities.MigrationWorkflow - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=migration_entities.MigrationWorkflow, + migration_workflows: MutableSequence[migration_entities.MigrationWorkflow] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=migration_entities.MigrationWorkflow, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -275,12 +275,12 @@ class ListMigrationSubtasksResponse(proto.Message): def raw_page(self): return self - migration_subtasks: MutableSequence[ - migration_entities.MigrationSubtask - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=migration_entities.MigrationSubtask, + migration_subtasks: MutableSequence[migration_entities.MigrationSubtask] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=migration_entities.MigrationSubtask, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_config.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_config.py index 63f66db134e4..ce84fd118705 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_config.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_config.py @@ -351,6 +351,7 @@ class Mode(proto.Enum): BTEQ (2): BTEQ mode (which includes SQL). """ + MODE_UNSPECIFIED = 0 SQL = 1 BTEQ = 2 @@ -499,6 +500,7 @@ class Type(proto.Enum): FUNCTION (7): The object being mapped is a function. """ + TYPE_UNSPECIFIED = 0 DATABASE = 1 SCHEMA = 2 diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_suggestion.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_suggestion.py index 077e2e5f4e44..df466647b3e7 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_suggestion.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_suggestion.py @@ -61,6 +61,7 @@ class Severity(proto.Enum): ERROR (3): ERROR type. Translation failed. """ + SEVERITY_UNSPECIFIED = 0 INFO = 1 WARNING = 2 diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/__init__.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/__init__.py index db36133683dd..11b72e38e435 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/__init__.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.migration_service import ( MigrationServiceAsyncClient, MigrationServiceClient, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/async_client.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/async_client.py index 838b9ec52827..8bb86a70df9c 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/async_client.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_migration_v2alpha import gapic_version as package_version @@ -129,7 +129,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MigrationServiceAsyncClient: The constructed client. """ - return MigrationServiceClient.from_service_account_info.__func__(MigrationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + MigrationServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(MigrationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +148,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MigrationServiceAsyncClient: The constructed client. """ - return MigrationServiceClient.from_service_account_file.__func__(MigrationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + MigrationServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(MigrationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/client.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/client.py index 6b902254ad53..487302e185d2 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/client.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_migration_v2alpha import gapic_version as package_version @@ -85,9 +85,7 @@ class MigrationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MigrationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MigrationServiceTransport]] _transport_registry["grpc"] = MigrationServiceGrpcTransport _transport_registry["grpc_asyncio"] = MigrationServiceGrpcAsyncIOTransport @@ -652,11 +650,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MigrationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MigrationServiceClient._read_environment_variables() + ) self._client_cert_source = MigrationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -691,8 +687,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MigrationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/pagers.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/pagers.py index 4cf9e6dd69a5..12991ca05699 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/pagers.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -230,7 +230,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -308,7 +308,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/base.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/base.py index d2e08d2939e5..c4af6da7e24b 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/base.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.bigquery_migration_v2alpha import gapic_version as package_version from google.cloud.bigquery_migration_v2alpha.types import ( diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc.py index 5d1e75e24ab4..4b49035003f2 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_migration_v2alpha.types import ( migration_entities, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc_asyncio.py index 58abe7a64065..8ab9b9e95d8d 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_migration_v2alpha.types import ( migration_entities, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/async_client.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/async_client.py index 4d00cbd2dbbf..bdf36c5f56e3 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/async_client.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_migration_v2alpha import gapic_version as package_version @@ -114,7 +114,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SqlTranslationServiceAsyncClient: The constructed client. """ - return SqlTranslationServiceClient.from_service_account_info.__func__(SqlTranslationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SqlTranslationServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SqlTranslationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +133,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SqlTranslationServiceAsyncClient: The constructed client. """ - return SqlTranslationServiceClient.from_service_account_file.__func__(SqlTranslationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SqlTranslationServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SqlTranslationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -168,7 +174,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SqlTranslationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SqlTranslationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SqlTranslationServiceTransport: diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/client.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/client.py index ecd06a3ede7e..605a9d0bd957 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/client.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_migration_v2alpha import gapic_version as package_version @@ -76,9 +76,7 @@ class SqlTranslationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SqlTranslationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SqlTranslationServiceTransport]] _transport_registry["grpc"] = SqlTranslationServiceGrpcTransport _transport_registry["grpc_asyncio"] = SqlTranslationServiceGrpcAsyncIOTransport @@ -603,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SqlTranslationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SqlTranslationServiceClient._read_environment_variables() + ) self._client_cert_source = SqlTranslationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -642,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SqlTranslationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/__init__.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/__init__.py index 16855a83d770..8c53db322b1a 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/__init__.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import SqlTranslationServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SqlTranslationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SqlTranslationServiceTransport]] _transport_registry["grpc"] = SqlTranslationServiceGrpcTransport _transport_registry["grpc_asyncio"] = SqlTranslationServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/base.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/base.py index 2c095e47f485..9050218b0e99 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/base.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_migration_v2alpha import gapic_version as package_version from google.cloud.bigquery_migration_v2alpha.types import translation_service diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc.py index ef08356b88d8..7345cda2ff82 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_migration_v2alpha.types import translation_service diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc_asyncio.py index c49eafc35d3e..e03f8a1bbaa8 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_migration_v2alpha.types import translation_service diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/__init__.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/__init__.py index 4d041a4bd68e..1d3f2c95d04f 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/__init__.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/__init__.py @@ -13,15 +13,27 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .assessment_task import AssessmentOrchestrationResultDetails, AssessmentTaskDetails +from .assessment_task import ( + AssessmentOrchestrationResultDetails, + AssessmentTaskDetails, +) from .migration_entities import ( MigrationSubtask, MigrationTask, MigrationTaskOrchestrationResult, MigrationWorkflow, ) -from .migration_error_details import ErrorDetail, ErrorLocation, ResourceErrorDetail -from .migration_metrics import Point, TimeInterval, TimeSeries, TypedValue +from .migration_error_details import ( + ErrorDetail, + ErrorLocation, + ResourceErrorDetail, +) +from .migration_metrics import ( + Point, + TimeInterval, + TimeSeries, + TypedValue, +) from .migration_service import ( CreateMigrationWorkflowRequest, DeleteMigrationWorkflowRequest, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_entities.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_entities.py index 261052eb784b..70fb6568b631 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_entities.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_entities.py @@ -89,6 +89,7 @@ class State(proto.Enum): (e.g. forced termination), they will not be scheduled. """ + STATE_UNSPECIFIED = 0 DRAFT = 1 RUNNING = 2 @@ -193,6 +194,7 @@ class State(proto.Enum): FAILED (6): The task finished unsuccessfully. """ + STATE_UNSPECIFIED = 0 PENDING = 1 ORCHESTRATING = 2 @@ -323,6 +325,7 @@ class State(proto.Enum): still finish but no new lease renewals will be granted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 RUNNING = 2 diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_service.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_service.py index d351c5463048..5275f2ed3aa7 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_service.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_service.py @@ -141,12 +141,12 @@ class ListMigrationWorkflowsResponse(proto.Message): def raw_page(self): return self - migration_workflows: MutableSequence[ - migration_entities.MigrationWorkflow - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=migration_entities.MigrationWorkflow, + migration_workflows: MutableSequence[migration_entities.MigrationWorkflow] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=migration_entities.MigrationWorkflow, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -275,12 +275,12 @@ class ListMigrationSubtasksResponse(proto.Message): def raw_page(self): return self - migration_subtasks: MutableSequence[ - migration_entities.MigrationSubtask - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=migration_entities.MigrationSubtask, + migration_subtasks: MutableSequence[migration_entities.MigrationSubtask] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=migration_entities.MigrationSubtask, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_service.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_service.py index 2f5269a9505f..525ae555bff1 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_service.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_service.py @@ -53,6 +53,7 @@ class SqlTranslationSourceDialect(proto.Enum): TERADATA (1): Teradata SQL. """ + SQL_TRANSLATION_SOURCE_DIALECT_UNSPECIFIED = 0 TERADATA = 1 @@ -165,6 +166,7 @@ class SqlTranslationErrorType(proto.Enum): Found unsupported functions in the input SQL query that are not able to translate. """ + SQL_TRANSLATION_ERROR_TYPE_UNSPECIFIED = 0 SQL_PARSE_ERROR = 1 UNSUPPORTED_SQL_FUNCTION = 2 diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_task.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_task.py index f1e064349d26..846bb6e205c5 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_task.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_task.py @@ -136,6 +136,7 @@ class FileEncoding(proto.Enum): UTF_16BE (6): File encoding is UTF_16BE. """ + FILE_ENCODING_UNSPECIFIED = 0 UTF_8 = 1 ISO_8859_1 = 2 @@ -165,6 +166,7 @@ class TokenType(proto.Enum): TIMESTAMP (7): Token type as timestamp. """ + TOKEN_TYPE_UNSPECIFIED = 0 STRING = 1 INT64 = 2 @@ -271,6 +273,7 @@ class IdentifierCase(proto.Enum): LOWER (3): Identifiers will be in lower cases. """ + IDENTIFIER_CASE_UNSPECIFIED = 0 ORIGINAL = 1 UPPER = 2 @@ -287,6 +290,7 @@ class IdentifierRewriteMode(proto.Enum): REWRITE_ALL (2): All SQL identifiers will be rewrite. """ + IDENTIFIER_REWRITE_MODE_UNSPECIFIED = 0 NONE = 1 REWRITE_ALL = 2 diff --git a/packages/google-cloud-bigquery-migration/mypy.ini b/packages/google-cloud-bigquery-migration/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-bigquery-migration/mypy.ini +++ b/packages/google-cloud-bigquery-migration/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-bigquery-migration/noxfile.py b/packages/google-cloud-bigquery-migration/noxfile.py index 82baad669e03..2746f035640e 100644 --- a/packages/google-cloud-bigquery-migration/noxfile.py +++ b/packages/google-cloud-bigquery-migration/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2/test_migration_service.py b/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2/test_migration_service.py index 17d8f59b7d1f..0e2cbd7c946c 100644 --- a/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2/test_migration_service.py +++ b/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2/test_migration_service.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -41,18 +42,23 @@ import google.api.distribution_pb2 as distribution_pb2 # type: ignore import google.api.metric_pb2 as metric_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.oauth2 import service_account 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.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.error_details_pb2 as error_details_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.bigquery_migration_v2.services.migration_service import ( MigrationServiceAsyncClient, @@ -955,10 +961,9 @@ def test_migration_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1008,9 @@ def test_migration_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1046,9 @@ def test_migration_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1290,9 +1293,7 @@ def test_migration_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1771,9 +1772,9 @@ def test_get_migration_workflow_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_migration_workflow - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_migration_workflow] = ( + mock_rpc + ) request = {} client.get_migration_workflow(request) @@ -3339,9 +3340,9 @@ def test_get_migration_subtask_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_migration_subtask - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_migration_subtask] = ( + mock_rpc + ) request = {} client.get_migration_subtask(request) diff --git a/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_migration_service.py b/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_migration_service.py index c692a2e8dd3c..8eb21717df5e 100644 --- a/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_migration_service.py +++ b/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_migration_service.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,18 +40,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.oauth2 import service_account 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.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.error_details_pb2 as error_details_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.bigquery_migration_v2alpha.services.migration_service import ( MigrationServiceAsyncClient, @@ -952,10 +958,9 @@ def test_migration_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1000,10 +1005,9 @@ def test_migration_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1043,9 @@ def test_migration_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1287,9 +1290,7 @@ def test_migration_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1768,9 +1769,9 @@ def test_get_migration_workflow_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_migration_workflow - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_migration_workflow] = ( + mock_rpc + ) request = {} client.get_migration_workflow(request) @@ -3336,9 +3337,9 @@ def test_get_migration_subtask_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_migration_subtask - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_migration_subtask] = ( + mock_rpc + ) request = {} client.get_migration_subtask(request) diff --git a/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_sql_translation_service.py b/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_sql_translation_service.py index cf66e28d5362..a0e8c8f257d5 100644 --- a/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_sql_translation_service.py +++ b/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_sql_translation_service.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,11 +40,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -960,10 +966,9 @@ def test_sql_translation_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1013,9 @@ def test_sql_translation_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1047,10 +1051,9 @@ def test_sql_translation_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1299,9 +1302,7 @@ def test_sql_translation_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1596,9 +1597,7 @@ def test_translate_query_flattened(): mock_val = "parent_value" assert arg == mock_val arg = args[0].source_dialect - mock_val = ( - translation_service.TranslateQueryRequest.SqlTranslationSourceDialect.TERADATA - ) + mock_val = translation_service.TranslateQueryRequest.SqlTranslationSourceDialect.TERADATA assert arg == mock_val arg = args[0].query mock_val = "query_value" @@ -1651,9 +1650,7 @@ async def test_translate_query_flattened_async(): mock_val = "parent_value" assert arg == mock_val arg = args[0].source_dialect - mock_val = ( - translation_service.TranslateQueryRequest.SqlTranslationSourceDialect.TERADATA - ) + mock_val = translation_service.TranslateQueryRequest.SqlTranslationSourceDialect.TERADATA assert arg == mock_val arg = args[0].query mock_val = "query_value" diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/__init__.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/__init__.py index a276315a13db..df2b76396659 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/__init__.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.reservation_service import ( ReservationServiceAsyncClient, ReservationServiceClient, diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/async_client.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/async_client.py index d437f922e87e..e298f5ecc508 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/async_client.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_reservation_v1 import gapic_version as package_version @@ -52,8 +52,8 @@ import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.bigquery_reservation_v1.services.reservation_service import pagers -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from .client import ReservationServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ReservationServiceTransport @@ -157,7 +157,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ReservationServiceAsyncClient: The constructed client. """ - return ReservationServiceClient.from_service_account_info.__func__(ReservationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ReservationServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ReservationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -173,7 +176,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ReservationServiceAsyncClient: The constructed client. """ - return ReservationServiceClient.from_service_account_file.__func__(ReservationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ReservationServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ReservationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -211,7 +217,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ReservationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ReservationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ReservationServiceTransport: diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/client.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/client.py index 9d325aa32a8b..4787accb29e9 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/client.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_reservation_v1 import gapic_version as package_version @@ -68,8 +68,8 @@ import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.bigquery_reservation_v1.services.reservation_service import pagers -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from .transports.base import DEFAULT_CLIENT_INFO, ReservationServiceTransport from .transports.grpc import ReservationServiceGrpcTransport @@ -85,9 +85,7 @@ class ReservationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ReservationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ReservationServiceTransport]] _transport_registry["grpc"] = ReservationServiceGrpcTransport _transport_registry["grpc_asyncio"] = ReservationServiceGrpcAsyncIOTransport _transport_registry["rest"] = ReservationServiceRestTransport @@ -737,11 +735,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReservationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReservationServiceClient._read_environment_variables() + ) self._client_cert_source = ReservationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -776,8 +772,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReservationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/pagers.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/pagers.py index 8627ddb401f8..7a5ee2157454 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/pagers.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/__init__.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/__init__.py index 3c070b3a9abe..16c412a7fada 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/__init__.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ReservationServiceRestInterceptor, ReservationServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ReservationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ReservationServiceTransport]] _transport_registry["grpc"] = ReservationServiceGrpcTransport _transport_registry["grpc_asyncio"] = ReservationServiceGrpcAsyncIOTransport _transport_registry["rest"] = ReservationServiceRestTransport diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/base.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/base.py index d68707ef5f0b..a3216df37cb1 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/base.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core -from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1 -from google.api_core import retry as retries import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore import google.protobuf import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials # type: ignore +from google.oauth2 import service_account # type: ignore from google.cloud.bigquery_reservation_v1 import gapic_version as package_version -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc.py index 363e9ee0a472..de99768eacea 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from .base import DEFAULT_CLIENT_INFO, ReservationServiceTransport @@ -531,12 +531,12 @@ def create_capacity_commitment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_capacity_commitment" not in self._stubs: - self._stubs[ - "create_capacity_commitment" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/CreateCapacityCommitment", - request_serializer=reservation.CreateCapacityCommitmentRequest.serialize, - response_deserializer=reservation.CapacityCommitment.deserialize, + self._stubs["create_capacity_commitment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/CreateCapacityCommitment", + request_serializer=reservation.CreateCapacityCommitmentRequest.serialize, + response_deserializer=reservation.CapacityCommitment.deserialize, + ) ) return self._stubs["create_capacity_commitment"] @@ -619,12 +619,12 @@ def delete_capacity_commitment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_capacity_commitment" not in self._stubs: - self._stubs[ - "delete_capacity_commitment" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/DeleteCapacityCommitment", - request_serializer=reservation.DeleteCapacityCommitmentRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_capacity_commitment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/DeleteCapacityCommitment", + request_serializer=reservation.DeleteCapacityCommitmentRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_capacity_commitment"] @@ -656,12 +656,12 @@ def update_capacity_commitment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_capacity_commitment" not in self._stubs: - self._stubs[ - "update_capacity_commitment" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/UpdateCapacityCommitment", - request_serializer=reservation.UpdateCapacityCommitmentRequest.serialize, - response_deserializer=reservation.CapacityCommitment.deserialize, + self._stubs["update_capacity_commitment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/UpdateCapacityCommitment", + request_serializer=reservation.UpdateCapacityCommitmentRequest.serialize, + response_deserializer=reservation.CapacityCommitment.deserialize, + ) ) return self._stubs["update_capacity_commitment"] @@ -732,12 +732,12 @@ def merge_capacity_commitments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "merge_capacity_commitments" not in self._stubs: - self._stubs[ - "merge_capacity_commitments" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/MergeCapacityCommitments", - request_serializer=reservation.MergeCapacityCommitmentsRequest.serialize, - response_deserializer=reservation.CapacityCommitment.deserialize, + self._stubs["merge_capacity_commitments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/MergeCapacityCommitments", + request_serializer=reservation.MergeCapacityCommitmentsRequest.serialize, + response_deserializer=reservation.CapacityCommitment.deserialize, + ) ) return self._stubs["merge_capacity_commitments"] diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc_asyncio.py index afdc62ff3573..aa879acbfeb1 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc_asyncio.py @@ -17,25 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from .base import DEFAULT_CLIENT_INFO, ReservationServiceTransport from .grpc import ReservationServiceGrpcTransport @@ -547,12 +547,12 @@ def create_capacity_commitment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_capacity_commitment" not in self._stubs: - self._stubs[ - "create_capacity_commitment" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/CreateCapacityCommitment", - request_serializer=reservation.CreateCapacityCommitmentRequest.serialize, - response_deserializer=reservation.CapacityCommitment.deserialize, + self._stubs["create_capacity_commitment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/CreateCapacityCommitment", + request_serializer=reservation.CreateCapacityCommitmentRequest.serialize, + response_deserializer=reservation.CapacityCommitment.deserialize, + ) ) return self._stubs["create_capacity_commitment"] @@ -638,12 +638,12 @@ def delete_capacity_commitment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_capacity_commitment" not in self._stubs: - self._stubs[ - "delete_capacity_commitment" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/DeleteCapacityCommitment", - request_serializer=reservation.DeleteCapacityCommitmentRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_capacity_commitment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/DeleteCapacityCommitment", + request_serializer=reservation.DeleteCapacityCommitmentRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_capacity_commitment"] @@ -676,12 +676,12 @@ def update_capacity_commitment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_capacity_commitment" not in self._stubs: - self._stubs[ - "update_capacity_commitment" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/UpdateCapacityCommitment", - request_serializer=reservation.UpdateCapacityCommitmentRequest.serialize, - response_deserializer=reservation.CapacityCommitment.deserialize, + self._stubs["update_capacity_commitment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/UpdateCapacityCommitment", + request_serializer=reservation.UpdateCapacityCommitmentRequest.serialize, + response_deserializer=reservation.CapacityCommitment.deserialize, + ) ) return self._stubs["update_capacity_commitment"] @@ -753,12 +753,12 @@ def merge_capacity_commitments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "merge_capacity_commitments" not in self._stubs: - self._stubs[ - "merge_capacity_commitments" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/MergeCapacityCommitments", - request_serializer=reservation.MergeCapacityCommitmentsRequest.serialize, - response_deserializer=reservation.CapacityCommitment.deserialize, + self._stubs["merge_capacity_commitments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/MergeCapacityCommitments", + request_serializer=reservation.MergeCapacityCommitmentsRequest.serialize, + response_deserializer=reservation.CapacityCommitment.deserialize, + ) ) return self._stubs["merge_capacity_commitments"] diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest.py index 51b6e1b8e92f..dcf1dfc39087 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest.py @@ -16,23 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseReservationServiceRestTransport @@ -1749,9 +1749,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseCreateAssignment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseCreateAssignment._get_http_options() request, metadata = self._interceptor.pre_create_assignment( request, metadata @@ -1918,9 +1916,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseCreateCapacityCommitment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseCreateCapacityCommitment._get_http_options() request, metadata = self._interceptor.pre_create_capacity_commitment( request, metadata @@ -2076,9 +2072,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseCreateReservation._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseCreateReservation._get_http_options() request, metadata = self._interceptor.pre_create_reservation( request, metadata @@ -2232,9 +2226,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseCreateReservationGroup._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseCreateReservationGroup._get_http_options() request, metadata = self._interceptor.pre_create_reservation_group( request, metadata @@ -2385,9 +2377,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseReservationServiceRestTransport._BaseDeleteAssignment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseDeleteAssignment._get_http_options() request, metadata = self._interceptor.pre_delete_assignment( request, metadata @@ -2496,9 +2486,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseReservationServiceRestTransport._BaseDeleteCapacityCommitment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseDeleteCapacityCommitment._get_http_options() request, metadata = self._interceptor.pre_delete_capacity_commitment( request, metadata @@ -2608,9 +2596,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseReservationServiceRestTransport._BaseDeleteReservation._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseDeleteReservation._get_http_options() request, metadata = self._interceptor.pre_delete_reservation( request, metadata @@ -2718,9 +2704,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseReservationServiceRestTransport._BaseDeleteReservationGroup._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseDeleteReservationGroup._get_http_options() request, metadata = self._interceptor.pre_delete_reservation_group( request, metadata @@ -2837,9 +2821,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseFailoverReservation._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseFailoverReservation._get_http_options() request, metadata = self._interceptor.pre_failover_reservation( request, metadata @@ -2992,9 +2974,7 @@ def __call__( Represents a BI Reservation. """ - http_options = ( - _BaseReservationServiceRestTransport._BaseGetBiReservation._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseGetBiReservation._get_http_options() request, metadata = self._interceptor.pre_get_bi_reservation( request, metadata @@ -3154,9 +3134,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseGetCapacityCommitment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseGetCapacityCommitment._get_http_options() request, metadata = self._interceptor.pre_get_capacity_commitment( request, metadata @@ -3378,9 +3356,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseReservationServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -3526,9 +3502,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseGetReservation._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseGetReservation._get_http_options() request, metadata = self._interceptor.pre_get_reservation(request, metadata) transcoded_request = _BaseReservationServiceRestTransport._BaseGetReservation._get_transcoded_request( @@ -3674,9 +3648,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseGetReservationGroup._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseGetReservationGroup._get_http_options() request, metadata = self._interceptor.pre_get_reservation_group( request, metadata @@ -3826,9 +3798,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseListAssignments._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseListAssignments._get_http_options() request, metadata = self._interceptor.pre_list_assignments( request, metadata @@ -3978,9 +3948,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseListCapacityCommitments._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseListCapacityCommitments._get_http_options() request, metadata = self._interceptor.pre_list_capacity_commitments( request, metadata @@ -4132,9 +4100,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseListReservationGroups._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseListReservationGroups._get_http_options() request, metadata = self._interceptor.pre_list_reservation_groups( request, metadata @@ -4286,9 +4252,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseListReservations._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseListReservations._get_http_options() request, metadata = self._interceptor.pre_list_reservations( request, metadata @@ -4452,9 +4416,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseMergeCapacityCommitments._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseMergeCapacityCommitments._get_http_options() request, metadata = self._interceptor.pre_merge_capacity_commitments( request, metadata @@ -4618,9 +4580,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseMoveAssignment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseMoveAssignment._get_http_options() request, metadata = self._interceptor.pre_move_assignment(request, metadata) transcoded_request = _BaseReservationServiceRestTransport._BaseMoveAssignment._get_transcoded_request( @@ -4773,9 +4733,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseSearchAllAssignments._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseSearchAllAssignments._get_http_options() request, metadata = self._interceptor.pre_search_all_assignments( request, metadata @@ -4929,9 +4887,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseSearchAssignments._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseSearchAssignments._get_http_options() request, metadata = self._interceptor.pre_search_assignments( request, metadata @@ -5154,9 +5110,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseReservationServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -5308,9 +5262,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseSplitCapacityCommitment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseSplitCapacityCommitment._get_http_options() request, metadata = self._interceptor.pre_split_capacity_commitment( request, metadata @@ -5465,9 +5417,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseReservationServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5624,9 +5574,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseUpdateAssignment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseUpdateAssignment._get_http_options() request, metadata = self._interceptor.pre_update_assignment( request, metadata @@ -5777,9 +5725,7 @@ def __call__( Represents a BI Reservation. """ - http_options = ( - _BaseReservationServiceRestTransport._BaseUpdateBiReservation._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseUpdateBiReservation._get_http_options() request, metadata = self._interceptor.pre_update_bi_reservation( request, metadata @@ -5948,9 +5894,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseUpdateCapacityCommitment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseUpdateCapacityCommitment._get_http_options() request, metadata = self._interceptor.pre_update_capacity_commitment( request, metadata @@ -6106,9 +6050,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseUpdateReservation._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseUpdateReservation._get_http_options() request, metadata = self._interceptor.pre_update_reservation( request, metadata @@ -6219,7 +6161,9 @@ def create_capacity_commitment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateCapacityCommitment(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCapacityCommitment( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_reservation( @@ -6239,7 +6183,9 @@ def create_reservation_group( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateReservationGroup(self._session, self._host, self._interceptor) # type: ignore + return self._CreateReservationGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_assignment( @@ -6255,7 +6201,9 @@ def delete_capacity_commitment( ) -> Callable[[reservation.DeleteCapacityCommitmentRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteCapacityCommitment(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteCapacityCommitment( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_reservation( @@ -6271,7 +6219,9 @@ def delete_reservation_group( ) -> Callable[[reservation.DeleteReservationGroupRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteReservationGroup(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteReservationGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def failover_reservation( @@ -6344,7 +6294,9 @@ def list_capacity_commitments( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListCapacityCommitments(self._session, self._host, self._interceptor) # type: ignore + return self._ListCapacityCommitments( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_reservation_groups( @@ -6375,7 +6327,9 @@ def merge_capacity_commitments( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._MergeCapacityCommitments(self._session, self._host, self._interceptor) # type: ignore + return self._MergeCapacityCommitments( + self._session, self._host, self._interceptor + ) # type: ignore @property def move_assignment( @@ -6423,7 +6377,9 @@ def split_capacity_commitment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SplitCapacityCommitment(self._session, self._host, self._interceptor) # type: ignore + return self._SplitCapacityCommitment( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( @@ -6460,7 +6416,9 @@ def update_capacity_commitment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateCapacityCommitment(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCapacityCommitment( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_reservation( diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest_base.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest_base.py index d62dd63b7e84..503fafebdd2c 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest_base.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.protobuf import json_format import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import gapic_v1, path_template +from google.protobuf import json_format -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from .base import DEFAULT_CLIENT_INFO, ReservationServiceTransport diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/types/reservation.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/types/reservation.py index d439cdadc320..9829cd7325eb 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/types/reservation.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/types/reservation.py @@ -88,6 +88,7 @@ class Edition(proto.Enum): ENTERPRISE_PLUS (3): Enterprise Plus edition. """ + EDITION_UNSPECIFIED = 0 STANDARD = 1 ENTERPRISE = 2 @@ -114,6 +115,7 @@ class FailoverMode(proto.Enum): writes are replicated to the secondary. There can be data loss for hard failover. """ + FAILOVER_MODE_UNSPECIFIED = 0 SOFT = 1 HARD = 2 @@ -373,6 +375,7 @@ class ScalingMode(proto.Enum): be set to false. Otherwise the request will be rejected with error code ``google.rpc.Code.INVALID_ARGUMENT``. """ + SCALING_MODE_UNSPECIFIED = 0 AUTOSCALE_ONLY = 1 IDLE_SLOTS_ONLY = 2 @@ -718,6 +721,7 @@ class CommitmentPlan(proto.Enum): renewal_plan is NONE, capacity commitment will be removed at the end of its commitment period. """ + COMMITMENT_PLAN_UNSPECIFIED = 0 FLEX = 3 FLEX_FLAT_RATE = 7 @@ -747,6 +751,7 @@ class State(proto.Enum): Capacity commitment is failed to be activated by the backend. """ + STATE_UNSPECIFIED = 0 PENDING = 1 ACTIVE = 2 @@ -1443,6 +1448,7 @@ class JobType(proto.Enum): priority over a default BACKGROUND reservation assignment (if it exists). """ + JOB_TYPE_UNSPECIFIED = 0 PIPELINE = 1 QUERY = 2 @@ -1467,6 +1473,7 @@ class State(proto.Enum): ACTIVE (2): Assignment is ready. """ + STATE_UNSPECIFIED = 0 PENDING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-bigquery-reservation/mypy.ini b/packages/google-cloud-bigquery-reservation/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-bigquery-reservation/mypy.ini +++ b/packages/google-cloud-bigquery-reservation/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-bigquery-reservation/noxfile.py b/packages/google-cloud-bigquery-reservation/noxfile.py index 2d2510302db0..ad517744a4b4 100644 --- a/packages/google-cloud-bigquery-reservation/noxfile.py +++ b/packages/google-cloud-bigquery-reservation/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_async.py index dc8cab2633d9..d617d2c60f86 100644 --- a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-reservation -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigqueryreservation_v1_generated_ReservationService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_reservation_v1 diff --git a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_sync.py index 95c458847e46..bbc6a317891b 100644 --- a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-reservation -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigqueryreservation_v1_generated_ReservationService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_reservation_v1 diff --git a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_async.py index af04cd3fea3d..84cfd345a4f1 100644 --- a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-reservation -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigqueryreservation_v1_generated_ReservationService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_reservation_v1 diff --git a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_sync.py index d11da07c6b1e..c5f7d565048b 100644 --- a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-reservation -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigqueryreservation_v1_generated_ReservationService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_reservation_v1 diff --git a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_async.py index cd315a03df45..9e1836e7e570 100644 --- a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-reservation -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigqueryreservation_v1_generated_ReservationService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_reservation_v1 diff --git a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_sync.py index 495c222c436f..6933dfd7e90b 100644 --- a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-reservation -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START bigqueryreservation_v1_generated_ReservationService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_reservation_v1 diff --git a/packages/google-cloud-bigquery-reservation/tests/unit/gapic/bigquery_reservation_v1/test_reservation_service.py b/packages/google-cloud-bigquery-reservation/tests/unit/gapic/bigquery_reservation_v1/test_reservation_service.py index d730b8609b06..f8f4b0eb2cc6 100644 --- a/packages/google-cloud-bigquery-reservation/tests/unit/gapic/bigquery_reservation_v1/test_reservation_service.py +++ b/packages/google-cloud-bigquery-reservation/tests/unit/gapic/bigquery_reservation_v1/test_reservation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,22 +43,27 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.options_pb2 as options_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account 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.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.bigquery_reservation_v1.services.reservation_service import ( ReservationServiceAsyncClient, @@ -66,8 +71,8 @@ pagers, transports, ) -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -991,10 +996,9 @@ def test_reservation_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1043,9 @@ def test_reservation_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1078,10 +1081,9 @@ def test_reservation_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1333,9 +1335,7 @@ def test_reservation_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1477,9 +1477,9 @@ def test_create_reservation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_reservation] = ( + mock_rpc + ) request = {} client.create_reservation(request) @@ -1863,9 +1863,9 @@ def test_list_reservations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_reservations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_reservations] = ( + mock_rpc + ) request = {} client.list_reservations(request) @@ -2770,9 +2770,9 @@ def test_delete_reservation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_reservation] = ( + mock_rpc + ) request = {} client.delete_reservation(request) @@ -3122,9 +3122,9 @@ def test_update_reservation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_reservation] = ( + mock_rpc + ) request = {} client.update_reservation(request) @@ -3520,9 +3520,9 @@ def test_failover_reservation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_reservation] = ( + mock_rpc + ) request = {} client.failover_reservation(request) @@ -6546,9 +6546,9 @@ def test_create_assignment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_assignment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_assignment] = ( + mock_rpc + ) request = {} client.create_assignment(request) @@ -6901,9 +6901,9 @@ def test_list_assignments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_assignments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_assignments] = ( + mock_rpc + ) request = {} client.list_assignments(request) @@ -7421,9 +7421,9 @@ def test_delete_assignment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_assignment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_assignment] = ( + mock_rpc + ) request = {} client.delete_assignment(request) @@ -7757,9 +7757,9 @@ def test_search_assignments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_assignments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_assignments] = ( + mock_rpc + ) request = {} client.search_assignments(request) @@ -8315,9 +8315,9 @@ def test_search_all_assignments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_all_assignments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_all_assignments] = ( + mock_rpc + ) request = {} client.search_all_assignments(request) @@ -9224,9 +9224,9 @@ def test_update_assignment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_assignment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_assignment] = ( + mock_rpc + ) request = {} client.update_assignment(request) @@ -9585,9 +9585,9 @@ def test_get_bi_reservation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_bi_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_bi_reservation] = ( + mock_rpc + ) request = {} client.get_bi_reservation(request) @@ -9927,9 +9927,9 @@ def test_update_bi_reservation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_bi_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_bi_reservation] = ( + mock_rpc + ) request = {} client.update_bi_reservation(request) @@ -10961,9 +10961,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -11496,9 +11496,9 @@ def test_get_reservation_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_reservation_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_reservation_group] = ( + mock_rpc + ) request = {} client.get_reservation_group(request) @@ -12647,9 +12647,9 @@ def test_create_reservation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_reservation] = ( + mock_rpc + ) request = {} client.create_reservation(request) @@ -12834,9 +12834,9 @@ def test_list_reservations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_reservations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_reservations] = ( + mock_rpc + ) request = {} client.list_reservations(request) @@ -13274,9 +13274,9 @@ def test_delete_reservation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_reservation] = ( + mock_rpc + ) request = {} client.delete_reservation(request) @@ -13453,9 +13453,9 @@ def test_update_reservation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_reservation] = ( + mock_rpc + ) request = {} client.update_reservation(request) @@ -13557,9 +13557,9 @@ def test_failover_reservation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_reservation] = ( + mock_rpc + ) request = {} client.failover_reservation(request) @@ -14903,9 +14903,9 @@ def test_create_assignment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_assignment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_assignment] = ( + mock_rpc + ) request = {} client.create_assignment(request) @@ -15090,9 +15090,9 @@ def test_list_assignments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_assignments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_assignments] = ( + mock_rpc + ) request = {} client.list_assignments(request) @@ -15352,9 +15352,9 @@ def test_delete_assignment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_assignment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_assignment] = ( + mock_rpc + ) request = {} client.delete_assignment(request) @@ -15531,9 +15531,9 @@ def test_search_assignments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_assignments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_assignments] = ( + mock_rpc + ) request = {} client.search_assignments(request) @@ -15796,9 +15796,9 @@ def test_search_all_assignments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_all_assignments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_all_assignments] = ( + mock_rpc + ) request = {} client.search_all_assignments(request) @@ -16241,9 +16241,9 @@ def test_update_assignment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_assignment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_assignment] = ( + mock_rpc + ) request = {} client.update_assignment(request) @@ -16345,9 +16345,9 @@ def test_get_bi_reservation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_bi_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_bi_reservation] = ( + mock_rpc + ) request = {} client.get_bi_reservation(request) @@ -16528,9 +16528,9 @@ def test_update_bi_reservation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_bi_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_bi_reservation] = ( + mock_rpc + ) request = {} client.update_bi_reservation(request) @@ -16995,9 +16995,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -17283,9 +17283,9 @@ def test_get_reservation_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_reservation_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_reservation_group] = ( + mock_rpc + ) request = {} client.get_reservation_group(request) diff --git a/packages/google-cloud-bigquery-storage/CHANGELOG.md b/packages/google-cloud-bigquery-storage/CHANGELOG.md index 64a1201e0e3e..3c6d98ccede7 100644 --- a/packages/google-cloud-bigquery-storage/CHANGELOG.md +++ b/packages/google-cloud-bigquery-storage/CHANGELOG.md @@ -4,6 +4,18 @@ [1]: https://pypi.org/project/google-cloud-bigquery-storage/#history +## [2.36.1](https://github.com/googleapis/google-cloud-python/compare/google-cloud-bigquery-storage-v2.36.0...google-cloud-bigquery-storage-v2.36.1) (2026-02-12) + + +### Documentation + +* Update BigQuery Storage Arrow samples batching logic (#14961) ([45d4cee9e0e48a209b2d9292be29a15125548458](https://github.com/googleapis/google-cloud-python/commit/45d4cee9e0e48a209b2d9292be29a15125548458)) + + +### Bug Fixes + +* fix mypy (#15531) ([f2536ae337cf3e29715d548dd049bda22504cf17](https://github.com/googleapis/google-cloud-python/commit/f2536ae337cf3e29715d548dd049bda22504cf17)) + ## [2.36.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-bigquery-storage-v2.35.0...google-cloud-bigquery-storage-v2.36.0) (2025-12-17) diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage/gapic_version.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage/gapic_version.py index e138acef04f7..a65ae5681af4 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage/gapic_version.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.36.0" # {x-release-please-version} +__version__ = "2.36.1" # {x-release-please-version} diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/__init__.py index 050d120d5d3e..b3ebb66b6eef 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from google.cloud.bigquery_storage_v1 import client, types diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/client.py index 330c4a13dc08..0decb4f413ba 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/client.py @@ -21,8 +21,8 @@ from __future__ import absolute_import -from google.api_core import gapic_v1 import google.api_core.gapic_v1.method +from google.api_core import gapic_v1 from google.cloud.bigquery_storage_v1 import gapic_version as package_version from google.cloud.bigquery_storage_v1 import reader diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/gapic_types.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/gapic_types.py index 4aa4d2fdf5f2..c5137feb5895 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/gapic_types.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/gapic_types.py @@ -20,11 +20,10 @@ import inspect import sys +import proto # type: ignore from google.protobuf import message as protobuf_message from google.protobuf import timestamp_pb2 -import proto # type: ignore - from google.cloud.bigquery_storage_v1.types import arrow, avro, storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/gapic_version.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/gapic_version.py index e138acef04f7..a65ae5681af4 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/gapic_version.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.36.0" # {x-release-please-version} +__version__ = "2.36.1" # {x-release-please-version} diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/reader.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/reader.py index f6f52fbfd6ae..5ef4c53ba1fe 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/reader.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/reader.py @@ -176,7 +176,7 @@ def _reconnect(self): self._wrapped = self._client.read_rows( read_stream=self._name, offset=self._offset, - **self._read_rows_kwargs + **self._read_rows_kwargs, ) break except Exception as exc: diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/async_client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/async_client.py index cff4f348f618..9f63dcfd71fc 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/async_client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, Awaitable, @@ -31,13 +31,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1 import gapic_version as package_version @@ -119,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BigQueryReadAsyncClient: The constructed client. """ - return BigQueryReadClient.from_service_account_info.__func__(BigQueryReadAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BigQueryReadClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(BigQueryReadAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BigQueryReadAsyncClient: The constructed client. """ - return BigQueryReadClient.from_service_account_file.__func__(BigQueryReadAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BigQueryReadClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(BigQueryReadAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/client.py index a9c6badd6bd9..efad33d545bf 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1 import gapic_version as package_version @@ -667,11 +667,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BigQueryReadClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BigQueryReadClient._read_environment_variables() + ) self._client_cert_source = BigQueryReadClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -706,8 +704,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BigQueryReadTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/base.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/base.py index ae0c02a80771..4f8f8b1cae88 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/base.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1 import gapic_version as package_version from google.cloud.bigquery_storage_v1.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc.py index af53d73e3dd9..1bb4eb1b974d 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_storage_v1.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc_asyncio.py index 8c46d504d13f..77cfc5f750f9 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_storage_v1.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/async_client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/async_client.py index ac567d0fb5c6..1194fca60ddd 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/async_client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1 import gapic_version as package_version @@ -127,7 +127,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BigQueryWriteAsyncClient: The constructed client. """ - return BigQueryWriteClient.from_service_account_info.__func__(BigQueryWriteAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BigQueryWriteClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(BigQueryWriteAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +146,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BigQueryWriteAsyncClient: The constructed client. """ - return BigQueryWriteClient.from_service_account_file.__func__(BigQueryWriteAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BigQueryWriteClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(BigQueryWriteAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/client.py index fff4ac9d3de4..5a95b6e76176 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1 import gapic_version as package_version @@ -651,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BigQueryWriteClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BigQueryWriteClient._read_environment_variables() + ) self._client_cert_source = BigQueryWriteClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -690,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BigQueryWriteTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/base.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/base.py index d0fdf09bf803..83c409bfdde1 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/base.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1 import gapic_version as package_version from google.cloud.bigquery_storage_v1.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc.py index d9bdeba663a1..65235810b39a 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_storage_v1.types import storage, stream @@ -500,12 +500,12 @@ def batch_commit_write_streams( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_commit_write_streams" not in self._stubs: - self._stubs[ - "batch_commit_write_streams" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1.BigQueryWrite/BatchCommitWriteStreams", - request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, - response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + self._stubs["batch_commit_write_streams"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1.BigQueryWrite/BatchCommitWriteStreams", + request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, + response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + ) ) return self._stubs["batch_commit_write_streams"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc_asyncio.py index 51287a1b6269..83dfecb3d713 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_storage_v1.types import storage, stream @@ -509,12 +509,12 @@ def batch_commit_write_streams( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_commit_write_streams" not in self._stubs: - self._stubs[ - "batch_commit_write_streams" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1.BigQueryWrite/BatchCommitWriteStreams", - request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, - response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + self._stubs["batch_commit_write_streams"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1.BigQueryWrite/BatchCommitWriteStreams", + request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, + response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + ) ) return self._stubs["batch_commit_write_streams"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/__init__.py index 93a69b9b56e6..895bca758ba0 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/__init__.py @@ -13,9 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .arrow import ArrowRecordBatch, ArrowSchema, ArrowSerializationOptions -from .avro import AvroRows, AvroSchema, AvroSerializationOptions -from .protobuf import ProtoRows, ProtoSchema +from .arrow import ( + ArrowRecordBatch, + ArrowSchema, + ArrowSerializationOptions, +) +from .avro import ( + AvroRows, + AvroSchema, + AvroSerializationOptions, +) +from .protobuf import ( + ProtoRows, + ProtoSchema, +) from .storage import ( AppendRowsRequest, AppendRowsResponse, @@ -37,8 +48,17 @@ StreamStats, ThrottleState, ) -from .stream import DataFormat, ReadSession, ReadStream, WriteStream, WriteStreamView -from .table import TableFieldSchema, TableSchema +from .stream import ( + DataFormat, + ReadSession, + ReadStream, + WriteStream, + WriteStreamView, +) +from .table import ( + TableFieldSchema, + TableSchema, +) __all__ = ( "ArrowRecordBatch", diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/arrow.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/arrow.py index 209e32a032ad..1f6e684c5540 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/arrow.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/arrow.py @@ -95,6 +95,7 @@ class CompressionCodec(proto.Enum): ZSTD (2): Zstandard compression. """ + COMPRESSION_UNSPECIFIED = 0 LZ4_FRAME = 1 ZSTD = 2 @@ -123,6 +124,7 @@ class PicosTimestampPrecision(proto.Enum): picosecond value. The value will be encoded as a string which conforms to ISO 8601 format. """ + PICOS_TIMESTAMP_PRECISION_UNSPECIFIED = 0 TIMESTAMP_PRECISION_MICROS = 1 TIMESTAMP_PRECISION_NANOS = 2 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/avro.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/avro.py index 45526830a575..1c2ab654a821 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/avro.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/avro.py @@ -113,6 +113,7 @@ class PicosTimestampPrecision(proto.Enum): picosecond value. The value will be encoded as a string which conforms to ISO 8601 format. """ + PICOS_TIMESTAMP_PRECISION_UNSPECIFIED = 0 TIMESTAMP_PRECISION_MICROS = 1 TIMESTAMP_PRECISION_NANOS = 2 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/storage.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/storage.py index 2f2e85be8bb7..69c8b9c2da1e 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/storage.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/storage.py @@ -500,6 +500,7 @@ class MissingValueInterpretation(proto.Enum): default value if declared in the table schema, NULL otherwise. """ + MISSING_VALUE_INTERPRETATION_UNSPECIFIED = 0 NULL_VALUE = 1 DEFAULT_VALUE = 2 @@ -585,13 +586,13 @@ class ProtoData(proto.Message): proto.STRING, number=6, ) - missing_value_interpretations: MutableMapping[ - str, MissingValueInterpretation - ] = proto.MapField( - proto.STRING, - proto.ENUM, - number=7, - enum=MissingValueInterpretation, + missing_value_interpretations: MutableMapping[str, MissingValueInterpretation] = ( + proto.MapField( + proto.STRING, + proto.ENUM, + number=7, + enum=MissingValueInterpretation, + ) ) default_missing_value_interpretation: MissingValueInterpretation = proto.Field( proto.ENUM, @@ -907,6 +908,7 @@ class StorageErrorCode(proto.Enum): Permission denied while using customer-managed encryption key. """ + STORAGE_ERROR_CODE_UNSPECIFIED = 0 TABLE_NOT_FOUND = 1 STREAM_ALREADY_COMMITTED = 2 @@ -960,6 +962,7 @@ class RowErrorCode(proto.Enum): FIELDS_ERROR (1): One or more fields in the row has errors. """ + ROW_ERROR_CODE_UNSPECIFIED = 0 FIELDS_ERROR = 1 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/stream.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/stream.py index d9cc8a45b05d..918703038b9c 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/stream.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/stream.py @@ -50,6 +50,7 @@ class DataFormat(proto.Enum): message format. See https://arrow.apache.org/ for more details. """ + DATA_FORMAT_UNSPECIFIED = 0 AVRO = 1 ARROW = 2 @@ -73,6 +74,7 @@ class WriteStreamView(proto.Enum): CreateWriteStream returns the full projection of write stream metadata. """ + WRITE_STREAM_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -271,6 +273,7 @@ class ResponseCompressionCodec(proto.Enum): RESPONSE_COMPRESSION_CODEC_LZ4 (2): Use raw LZ4 compression. """ + RESPONSE_COMPRESSION_CODEC_UNSPECIFIED = 0 RESPONSE_COMPRESSION_CODEC_LZ4 = 2 @@ -435,6 +438,7 @@ class Type(proto.Enum): Data is only visible up to the offset to which it was flushed. """ + TYPE_UNSPECIFIED = 0 COMMITTED = 1 PENDING = 2 @@ -451,6 +455,7 @@ class WriteMode(proto.Enum): It is the default value if customers do not specify it. """ + WRITE_MODE_UNSPECIFIED = 0 INSERT = 1 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/table.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/table.py index 34320c14b356..5b2d085a9f23 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/table.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/table.py @@ -185,6 +185,7 @@ class Type(proto.Enum): RANGE (16): RANGE """ + TYPE_UNSPECIFIED = 0 STRING = 1 INT64 = 2 @@ -216,6 +217,7 @@ class Mode(proto.Enum): REPEATED (3): No description available. """ + MODE_UNSPECIFIED = 0 NULLABLE = 1 REQUIRED = 2 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/writer.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/writer.py index 6604270df1cd..4f0da5e1d933 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/writer.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/writer.py @@ -22,10 +22,10 @@ import time from typing import Callable, List, Optional, Sequence, Tuple, Union -from google.api_core import bidi, exceptions -from google.api_core.future import polling as polling_future import google.api_core.retry import grpc # type: ignore +from google.api_core import bidi, exceptions +from google.api_core.future import polling as polling_future from google.cloud.bigquery_storage_v1 import exceptions as bqstorage_exceptions from google.cloud.bigquery_storage_v1 import gapic_version as package_version diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/__init__.py index 0e43a48f9c71..0ff6ecd049de 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + if hasattr(api_core, "check_python_version") and hasattr( api_core, "check_dependency_versions" ): # pragma: NO COVER diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/gapic_version.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/gapic_version.py index e138acef04f7..a65ae5681af4 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/gapic_version.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.36.0" # {x-release-please-version} +__version__ = "2.36.1" # {x-release-please-version} diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/async_client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/async_client.py index fef3e06aff74..6aaa104ecfa0 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/async_client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1alpha import gapic_version as package_version @@ -131,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MetastorePartitionServiceAsyncClient: The constructed client. """ - return MetastorePartitionServiceClient.from_service_account_info.__func__(MetastorePartitionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + MetastorePartitionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(MetastorePartitionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MetastorePartitionServiceAsyncClient: The constructed client. """ - return MetastorePartitionServiceClient.from_service_account_file.__func__(MetastorePartitionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + MetastorePartitionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + MetastorePartitionServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -185,7 +193,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return MetastorePartitionServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return MetastorePartitionServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> MetastorePartitionServiceTransport: diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/client.py index d5bf020cb87e..068e4443ab32 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1alpha import gapic_version as package_version @@ -78,9 +78,7 @@ class MetastorePartitionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MetastorePartitionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MetastorePartitionServiceTransport]] _transport_registry["grpc"] = MetastorePartitionServiceGrpcTransport _transport_registry["grpc_asyncio"] = MetastorePartitionServiceGrpcAsyncIOTransport @@ -653,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MetastorePartitionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MetastorePartitionServiceClient._read_environment_variables() + ) self._client_cert_source = ( MetastorePartitionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MetastorePartitionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/__init__.py index 830d53c2088f..6fa517d14e00 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import MetastorePartitionServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[MetastorePartitionServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[MetastorePartitionServiceTransport]] _transport_registry["grpc"] = MetastorePartitionServiceGrpcTransport _transport_registry["grpc_asyncio"] = MetastorePartitionServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/base.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/base.py index b3dd9fe1e1fb..0d28635e60a7 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/base.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.bigquery_storage_v1alpha import gapic_version as package_version from google.cloud.bigquery_storage_v1alpha.types import metastore_partition diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc.py index 1d864ba41118..76f0d1376746 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_storage_v1alpha.types import metastore_partition @@ -348,12 +348,12 @@ def batch_create_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_create_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_create_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchCreateMetastorePartitions", - request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + self._stubs["batch_create_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchCreateMetastorePartitions", + request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_create_metastore_partitions"] @@ -379,12 +379,12 @@ def batch_delete_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_delete_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_delete_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchDeleteMetastorePartitions", - request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["batch_delete_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchDeleteMetastorePartitions", + request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["batch_delete_metastore_partitions"] @@ -411,12 +411,12 @@ def batch_update_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_update_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchUpdateMetastorePartitions", - request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + self._stubs["batch_update_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchUpdateMetastorePartitions", + request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_update_metastore_partitions"] @@ -478,12 +478,12 @@ def stream_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_metastore_partitions" not in self._stubs: - self._stubs[ - "stream_metastore_partitions" - ] = self._logged_channel.stream_stream( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/StreamMetastorePartitions", - request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + self._stubs["stream_metastore_partitions"] = ( + self._logged_channel.stream_stream( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/StreamMetastorePartitions", + request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["stream_metastore_partitions"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc_asyncio.py index fc63c16b0275..b81caa4c9a63 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_storage_v1alpha.types import metastore_partition @@ -356,12 +356,12 @@ def batch_create_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_create_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_create_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchCreateMetastorePartitions", - request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + self._stubs["batch_create_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchCreateMetastorePartitions", + request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_create_metastore_partitions"] @@ -388,12 +388,12 @@ def batch_delete_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_delete_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_delete_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchDeleteMetastorePartitions", - request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["batch_delete_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchDeleteMetastorePartitions", + request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["batch_delete_metastore_partitions"] @@ -420,12 +420,12 @@ def batch_update_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_update_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchUpdateMetastorePartitions", - request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + self._stubs["batch_update_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchUpdateMetastorePartitions", + request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_update_metastore_partitions"] @@ -487,12 +487,12 @@ def stream_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_metastore_partitions" not in self._stubs: - self._stubs[ - "stream_metastore_partitions" - ] = self._logged_channel.stream_stream( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/StreamMetastorePartitions", - request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + self._stubs["stream_metastore_partitions"] = ( + self._logged_channel.stream_stream( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/StreamMetastorePartitions", + request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["stream_metastore_partitions"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/types/metastore_partition.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/types/metastore_partition.py index d5e3507b082e..953f0dcf40c2 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/types/metastore_partition.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/types/metastore_partition.py @@ -162,12 +162,12 @@ class BatchDeleteMetastorePartitionsRequest(proto.Message): proto.STRING, number=1, ) - partition_values: MutableSequence[ - partition.MetastorePartitionValues - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=partition.MetastorePartitionValues, + partition_values: MutableSequence[partition.MetastorePartitionValues] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=partition.MetastorePartitionValues, + ) ) trace_id: str = proto.Field( proto.STRING, @@ -356,12 +356,12 @@ class StreamMetastorePartitionsRequest(proto.Message): proto.STRING, number=1, ) - metastore_partitions: MutableSequence[ - partition.MetastorePartition - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=partition.MetastorePartition, + metastore_partitions: MutableSequence[partition.MetastorePartition] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=partition.MetastorePartition, + ) ) skip_existing_partitions: bool = proto.Field( proto.BOOL, diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/__init__.py index 7e49ead2f6a8..b4394f8bd3fc 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + if hasattr(api_core, "check_python_version") and hasattr( api_core, "check_dependency_versions" ): # pragma: NO COVER diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/gapic_version.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/gapic_version.py index e138acef04f7..a65ae5681af4 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/gapic_version.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.36.0" # {x-release-please-version} +__version__ = "2.36.1" # {x-release-please-version} diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/async_client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/async_client.py index fb4a917e7d10..948d7976f000 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/async_client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta import gapic_version as package_version @@ -131,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MetastorePartitionServiceAsyncClient: The constructed client. """ - return MetastorePartitionServiceClient.from_service_account_info.__func__(MetastorePartitionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + MetastorePartitionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(MetastorePartitionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MetastorePartitionServiceAsyncClient: The constructed client. """ - return MetastorePartitionServiceClient.from_service_account_file.__func__(MetastorePartitionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + MetastorePartitionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + MetastorePartitionServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -185,7 +193,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return MetastorePartitionServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return MetastorePartitionServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> MetastorePartitionServiceTransport: diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/client.py index 8ad6fccbd146..f4cb6522be41 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta import gapic_version as package_version @@ -78,9 +78,7 @@ class MetastorePartitionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MetastorePartitionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MetastorePartitionServiceTransport]] _transport_registry["grpc"] = MetastorePartitionServiceGrpcTransport _transport_registry["grpc_asyncio"] = MetastorePartitionServiceGrpcAsyncIOTransport @@ -653,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MetastorePartitionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MetastorePartitionServiceClient._read_environment_variables() + ) self._client_cert_source = ( MetastorePartitionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MetastorePartitionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/__init__.py index 830d53c2088f..6fa517d14e00 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import MetastorePartitionServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[MetastorePartitionServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[MetastorePartitionServiceTransport]] _transport_registry["grpc"] = MetastorePartitionServiceGrpcTransport _transport_registry["grpc_asyncio"] = MetastorePartitionServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/base.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/base.py index 61c305cb587e..d731a0f6bd96 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/base.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.bigquery_storage_v1beta import gapic_version as package_version from google.cloud.bigquery_storage_v1beta.types import metastore_partition diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc.py index e0fc4f96d75c..47e8bdd06780 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_storage_v1beta.types import metastore_partition @@ -348,12 +348,12 @@ def batch_create_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_create_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_create_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchCreateMetastorePartitions", - request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + self._stubs["batch_create_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchCreateMetastorePartitions", + request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_create_metastore_partitions"] @@ -379,12 +379,12 @@ def batch_delete_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_delete_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_delete_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchDeleteMetastorePartitions", - request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["batch_delete_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchDeleteMetastorePartitions", + request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["batch_delete_metastore_partitions"] @@ -411,12 +411,12 @@ def batch_update_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_update_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchUpdateMetastorePartitions", - request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + self._stubs["batch_update_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchUpdateMetastorePartitions", + request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_update_metastore_partitions"] @@ -478,12 +478,12 @@ def stream_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_metastore_partitions" not in self._stubs: - self._stubs[ - "stream_metastore_partitions" - ] = self._logged_channel.stream_stream( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/StreamMetastorePartitions", - request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + self._stubs["stream_metastore_partitions"] = ( + self._logged_channel.stream_stream( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/StreamMetastorePartitions", + request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["stream_metastore_partitions"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc_asyncio.py index 434edd8eeb50..77125af97365 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_storage_v1beta.types import metastore_partition @@ -356,12 +356,12 @@ def batch_create_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_create_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_create_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchCreateMetastorePartitions", - request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + self._stubs["batch_create_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchCreateMetastorePartitions", + request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_create_metastore_partitions"] @@ -388,12 +388,12 @@ def batch_delete_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_delete_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_delete_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchDeleteMetastorePartitions", - request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["batch_delete_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchDeleteMetastorePartitions", + request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["batch_delete_metastore_partitions"] @@ -420,12 +420,12 @@ def batch_update_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_update_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchUpdateMetastorePartitions", - request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + self._stubs["batch_update_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchUpdateMetastorePartitions", + request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_update_metastore_partitions"] @@ -487,12 +487,12 @@ def stream_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_metastore_partitions" not in self._stubs: - self._stubs[ - "stream_metastore_partitions" - ] = self._logged_channel.stream_stream( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/StreamMetastorePartitions", - request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + self._stubs["stream_metastore_partitions"] = ( + self._logged_channel.stream_stream( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/StreamMetastorePartitions", + request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["stream_metastore_partitions"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/types/metastore_partition.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/types/metastore_partition.py index 0fb0ec208848..7c701cc2fc09 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/types/metastore_partition.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/types/metastore_partition.py @@ -162,12 +162,12 @@ class BatchDeleteMetastorePartitionsRequest(proto.Message): proto.STRING, number=1, ) - partition_values: MutableSequence[ - partition.MetastorePartitionValues - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=partition.MetastorePartitionValues, + partition_values: MutableSequence[partition.MetastorePartitionValues] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=partition.MetastorePartitionValues, + ) ) trace_id: str = proto.Field( proto.STRING, @@ -361,12 +361,12 @@ class StreamMetastorePartitionsRequest(proto.Message): proto.STRING, number=1, ) - metastore_partitions: MutableSequence[ - partition.MetastorePartition - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=partition.MetastorePartition, + metastore_partitions: MutableSequence[partition.MetastorePartition] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=partition.MetastorePartition, + ) ) skip_existing_partitions: bool = proto.Field( proto.BOOL, diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/__init__.py index b56f2a59cd10..4b00053d2314 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from google.cloud.bigquery_storage_v1beta2 import client, types diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/client.py index 323b5941e9f8..6c9caaa91ed7 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/client.py @@ -19,9 +19,9 @@ This is the base from which all interactions with the API occur. """ -from google.api_core import gapic_v1 import google.api_core.gapic_v1.method import google.api_core.retry +from google.api_core import gapic_v1 from google.cloud.bigquery_storage_v1 import gapic_version as package_version from google.cloud.bigquery_storage_v1 import reader diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/gapic_version.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/gapic_version.py index e138acef04f7..a65ae5681af4 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/gapic_version.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.36.0" # {x-release-please-version} +__version__ = "2.36.1" # {x-release-please-version} diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/async_client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/async_client.py index caf90ff6f2df..87aaf5b0e556 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/async_client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, Awaitable, @@ -31,13 +31,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta2 import gapic_version as package_version @@ -122,7 +122,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BigQueryReadAsyncClient: The constructed client. """ - return BigQueryReadClient.from_service_account_info.__func__(BigQueryReadAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BigQueryReadClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(BigQueryReadAsyncClient, 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: BigQueryReadAsyncClient: The constructed client. """ - return BigQueryReadClient.from_service_account_file.__func__(BigQueryReadAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BigQueryReadClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(BigQueryReadAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/client.py index 99ce986acd31..7bd1ef2a2f7c 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta2 import gapic_version as package_version @@ -670,11 +670,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BigQueryReadClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BigQueryReadClient._read_environment_variables() + ) self._client_cert_source = BigQueryReadClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -709,8 +707,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BigQueryReadTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/base.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/base.py index 5c23579c3c81..04af897a34bc 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/base.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta2 import gapic_version as package_version from google.cloud.bigquery_storage_v1beta2.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc.py index 933070d70ea1..70b00dd46044 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_storage_v1beta2.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc_asyncio.py index 4e1fbd8b82db..d9480070e515 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_storage_v1beta2.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/async_client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/async_client.py index 3388dd60de53..7dba19ada44d 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/async_client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -31,15 +32,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta2 import gapic_version as package_version @@ -129,7 +129,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BigQueryWriteAsyncClient: The constructed client. """ - return BigQueryWriteClient.from_service_account_info.__func__(BigQueryWriteAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BigQueryWriteClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(BigQueryWriteAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +148,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BigQueryWriteAsyncClient: The constructed client. """ - return BigQueryWriteClient.from_service_account_file.__func__(BigQueryWriteAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BigQueryWriteClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(BigQueryWriteAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/client.py index 4dae3dfb0000..1339a1cfce53 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta2 import gapic_version as package_version @@ -652,11 +652,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BigQueryWriteClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BigQueryWriteClient._read_environment_variables() + ) self._client_cert_source = BigQueryWriteClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -691,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BigQueryWriteTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/base.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/base.py index d798bfa8bf80..3ec7406c9a90 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/base.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta2 import gapic_version as package_version from google.cloud.bigquery_storage_v1beta2.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc.py index df8e539747c0..215b3f16cdf1 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_storage_v1beta2.types import storage, stream @@ -487,12 +487,12 @@ def batch_commit_write_streams( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_commit_write_streams" not in self._stubs: - self._stubs[ - "batch_commit_write_streams" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta2.BigQueryWrite/BatchCommitWriteStreams", - request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, - response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + self._stubs["batch_commit_write_streams"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta2.BigQueryWrite/BatchCommitWriteStreams", + request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, + response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + ) ) return self._stubs["batch_commit_write_streams"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc_asyncio.py index d952688a5509..9359e87d9816 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_storage_v1beta2.types import storage, stream @@ -496,12 +496,12 @@ def batch_commit_write_streams( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_commit_write_streams" not in self._stubs: - self._stubs[ - "batch_commit_write_streams" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta2.BigQueryWrite/BatchCommitWriteStreams", - request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, - response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + self._stubs["batch_commit_write_streams"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta2.BigQueryWrite/BatchCommitWriteStreams", + request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, + response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + ) ) return self._stubs["batch_commit_write_streams"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/__init__.py index 98d72add4983..c8e573647b52 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/__init__.py @@ -13,9 +13,19 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .arrow import ArrowRecordBatch, ArrowSchema, ArrowSerializationOptions -from .avro import AvroRows, AvroSchema -from .protobuf import ProtoRows, ProtoSchema +from .arrow import ( + ArrowRecordBatch, + ArrowSchema, + ArrowSerializationOptions, +) +from .avro import ( + AvroRows, + AvroSchema, +) +from .protobuf import ( + ProtoRows, + ProtoSchema, +) from .storage import ( AppendRowsRequest, AppendRowsResponse, @@ -36,8 +46,16 @@ StreamStats, ThrottleState, ) -from .stream import DataFormat, ReadSession, ReadStream, WriteStream -from .table import TableFieldSchema, TableSchema +from .stream import ( + DataFormat, + ReadSession, + ReadStream, + WriteStream, +) +from .table import ( + TableFieldSchema, + TableSchema, +) __all__ = ( "ArrowRecordBatch", diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/arrow.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/arrow.py index e079fe1ed52f..5975fc695e32 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/arrow.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/arrow.py @@ -85,6 +85,7 @@ class Format(proto.Enum): Use the message format as of Apache Arrow Release 0.15. """ + FORMAT_UNSPECIFIED = 0 ARROW_0_14 = 1 ARROW_0_15 = 2 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/storage.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/storage.py index cae766a9c420..2ef57feb0eef 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/storage.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/storage.py @@ -668,6 +668,7 @@ class StorageErrorCode(proto.Enum): STREAM_FINALIZED (6): Stream is finalized. """ + STORAGE_ERROR_CODE_UNSPECIFIED = 0 TABLE_NOT_FOUND = 1 STREAM_ALREADY_COMMITTED = 2 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/stream.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/stream.py index aca4e40bde97..23590aa9a106 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/stream.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/stream.py @@ -49,6 +49,7 @@ class DataFormat(proto.Enum): message format. See https://arrow.apache.org/ for more details. """ + DATA_FORMAT_UNSPECIFIED = 0 AVRO = 1 ARROW = 2 @@ -263,6 +264,7 @@ class Type(proto.Enum): Data is only visible up to the offset to which it was flushed. """ + TYPE_UNSPECIFIED = 0 COMMITTED = 1 PENDING = 2 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/table.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/table.py index 4263b6544f75..400838337bf7 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/table.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/table.py @@ -103,6 +103,7 @@ class Type(proto.Enum): JSON (15): JSON, String """ + TYPE_UNSPECIFIED = 0 STRING = 1 INT64 = 2 @@ -133,6 +134,7 @@ class Mode(proto.Enum): REPEATED (3): No description available. """ + MODE_UNSPECIFIED = 0 NULLABLE = 1 REQUIRED = 2 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/writer.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/writer.py index 6c5ce89858d1..5b7bbf646372 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/writer.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/writer.py @@ -22,10 +22,10 @@ import time from typing import Callable, List, Optional, Sequence, Tuple, Union -from google.api_core import bidi, exceptions -from google.api_core.future import polling as polling_future import google.api_core.retry import grpc # type: ignore +from google.api_core import bidi, exceptions +from google.api_core.future import polling as polling_future from google.cloud.bigquery_storage_v1beta2 import exceptions as bqstorage_exceptions from google.cloud.bigquery_storage_v1beta2 import types as gapic_types diff --git a/packages/google-cloud-bigquery-storage/mypy.ini b/packages/google-cloud-bigquery-storage/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-bigquery-storage/mypy.ini +++ b/packages/google-cloud-bigquery-storage/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-bigquery-storage/noxfile.py b/packages/google-cloud-bigquery-storage/noxfile.py index 16aa63c726ac..506aea78e384 100644 --- a/packages/google-cloud-bigquery-storage/noxfile.py +++ b/packages/google-cloud-bigquery-storage/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -161,10 +160,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -173,10 +177,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -184,19 +196,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1.json b/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1.json index eb57961e461a..a2e9981367e6 100644 --- a/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1.json +++ b/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-bigquery-storage", - "version": "2.36.0" + "version": "2.36.1" }, "snippets": [ { diff --git a/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1alpha.json b/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1alpha.json index 5791574829ae..453cbe2279a4 100644 --- a/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1alpha.json +++ b/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1alpha.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-bigquery-storage", - "version": "2.36.0" + "version": "2.36.1" }, "snippets": [ { diff --git a/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1beta.json b/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1beta.json index 64b7b8c5266f..6a6c2e4cdc8a 100644 --- a/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1beta.json +++ b/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1beta.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-bigquery-storage", - "version": "2.36.0" + "version": "2.36.1" }, "snippets": [ { diff --git a/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1beta2.json b/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1beta2.json index 63146b853c3b..bde48decaf2f 100644 --- a/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1beta2.json +++ b/packages/google-cloud-bigquery-storage/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1beta2.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-bigquery-storage", - "version": "2.36.0" + "version": "2.36.1" }, "snippets": [ { diff --git a/packages/google-cloud-bigquery-storage/samples/pyarrow/append_rows_with_arrow.py b/packages/google-cloud-bigquery-storage/samples/pyarrow/append_rows_with_arrow.py index 51799ae61c29..594985aebe58 100644 --- a/packages/google-cloud-bigquery-storage/samples/pyarrow/append_rows_with_arrow.py +++ b/packages/google-cloud-bigquery-storage/samples/pyarrow/append_rows_with_arrow.py @@ -16,9 +16,9 @@ import datetime import decimal -from google.cloud.bigquery import enums import pandas as pd import pyarrow as pa +from google.cloud.bigquery import enums from google.cloud import bigquery from google.cloud.bigquery_storage_v1 import types as gapic_types diff --git a/packages/google-cloud-bigquery-storage/samples/pyarrow/noxfile.py b/packages/google-cloud-bigquery-storage/samples/pyarrow/noxfile.py index 494639d2fa5e..c0e60097b353 100644 --- a/packages/google-cloud-bigquery-storage/samples/pyarrow/noxfile.py +++ b/packages/google-cloud-bigquery-storage/samples/pyarrow/noxfile.py @@ -16,8 +16,8 @@ import glob import os -from pathlib import Path import sys +from pathlib import Path from typing import Callable, Dict, Optional import nox diff --git a/packages/google-cloud-bigquery-storage/samples/quickstart/noxfile.py b/packages/google-cloud-bigquery-storage/samples/quickstart/noxfile.py index 494639d2fa5e..c0e60097b353 100644 --- a/packages/google-cloud-bigquery-storage/samples/quickstart/noxfile.py +++ b/packages/google-cloud-bigquery-storage/samples/quickstart/noxfile.py @@ -16,8 +16,8 @@ import glob import os -from pathlib import Path import sys +from pathlib import Path from typing import Callable, Dict, Optional import nox diff --git a/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_pending.py b/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_pending.py index 13fdab6c0f33..ac47828dcdd4 100644 --- a/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_pending.py +++ b/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_pending.py @@ -18,9 +18,10 @@ using the low-level generated client for Python. """ +from google.protobuf import descriptor_pb2 + from google.cloud import bigquery_storage_v1 from google.cloud.bigquery_storage_v1 import types, writer -from google.protobuf import descriptor_pb2 # If you update the customer_record.proto protocol buffer definition, run: # diff --git a/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_pending_test.py b/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_pending_test.py index 508ce60b5ca4..9af6957071f4 100644 --- a/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_pending_test.py +++ b/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_pending_test.py @@ -15,9 +15,10 @@ import pathlib import random -from google.cloud import bigquery import pytest +from google.cloud import bigquery + from . import append_rows_pending DIR = pathlib.Path(__file__).parent diff --git a/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_proto2.py b/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_proto2.py index c53d14c24f36..7f3d88a7a3c2 100644 --- a/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_proto2.py +++ b/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_proto2.py @@ -20,9 +20,10 @@ import datetime import decimal +from google.protobuf import descriptor_pb2 + from google.cloud import bigquery_storage_v1 from google.cloud.bigquery_storage_v1 import types, writer -from google.protobuf import descriptor_pb2 # If you make updates to the sample_data.proto protocol buffers definition, # run: diff --git a/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_proto2_test.py b/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_proto2_test.py index f88c9248ccda..904f17ddab94 100644 --- a/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_proto2_test.py +++ b/packages/google-cloud-bigquery-storage/samples/snippets/append_rows_proto2_test.py @@ -17,9 +17,10 @@ import pathlib import random -from google.cloud import bigquery import pytest +from google.cloud import bigquery + from . import append_rows_proto2 DIR = pathlib.Path(__file__).parent diff --git a/packages/google-cloud-bigquery-storage/samples/snippets/conftest.py b/packages/google-cloud-bigquery-storage/samples/snippets/conftest.py index b5a9c444456e..a186291ef074 100644 --- a/packages/google-cloud-bigquery-storage/samples/snippets/conftest.py +++ b/packages/google-cloud-bigquery-storage/samples/snippets/conftest.py @@ -12,10 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -from google.cloud import bigquery import pytest import test_utils.prefixer +from google.cloud import bigquery + prefixer = test_utils.prefixer.Prefixer("python-bigquery-storage", "samples/snippets") diff --git a/packages/google-cloud-bigquery-storage/samples/snippets/customer_record_pb2.py b/packages/google-cloud-bigquery-storage/samples/snippets/customer_record_pb2.py index 08e9ce4f48f3..d8901f2ea20d 100644 --- a/packages/google-cloud-bigquery-storage/samples/snippets/customer_record_pb2.py +++ b/packages/google-cloud-bigquery-storage/samples/snippets/customer_record_pb2.py @@ -17,6 +17,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: customer_record.proto """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import message as _message @@ -39,7 +40,7 @@ (_message.Message,), { "DESCRIPTOR": _CUSTOMERRECORD, - "__module__": "customer_record_pb2" + "__module__": "customer_record_pb2", # @@protoc_insertion_point(class_scope:CustomerRecord) }, ) diff --git a/packages/google-cloud-bigquery-storage/samples/snippets/noxfile.py b/packages/google-cloud-bigquery-storage/samples/snippets/noxfile.py index 494639d2fa5e..c0e60097b353 100644 --- a/packages/google-cloud-bigquery-storage/samples/snippets/noxfile.py +++ b/packages/google-cloud-bigquery-storage/samples/snippets/noxfile.py @@ -16,8 +16,8 @@ import glob import os -from pathlib import Path import sys +from pathlib import Path from typing import Callable, Dict, Optional import nox diff --git a/packages/google-cloud-bigquery-storage/samples/snippets/sample_data_pb2.py b/packages/google-cloud-bigquery-storage/samples/snippets/sample_data_pb2.py index f91efbf365bd..ebd401af3294 100644 --- a/packages/google-cloud-bigquery-storage/samples/snippets/sample_data_pb2.py +++ b/packages/google-cloud-bigquery-storage/samples/snippets/sample_data_pb2.py @@ -17,6 +17,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: sample_data.proto """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database diff --git a/packages/google-cloud-bigquery-storage/samples/to_dataframe/noxfile.py b/packages/google-cloud-bigquery-storage/samples/to_dataframe/noxfile.py index 494639d2fa5e..c0e60097b353 100644 --- a/packages/google-cloud-bigquery-storage/samples/to_dataframe/noxfile.py +++ b/packages/google-cloud-bigquery-storage/samples/to_dataframe/noxfile.py @@ -16,8 +16,8 @@ import glob import os -from pathlib import Path import sys +from pathlib import Path from typing import Callable, Dict, Optional import nox diff --git a/packages/google-cloud-bigquery-storage/samples/to_dataframe/read_table_bqstorage.py b/packages/google-cloud-bigquery-storage/samples/to_dataframe/read_table_bqstorage.py index a0b1c49bc2ee..31b21618b49b 100644 --- a/packages/google-cloud-bigquery-storage/samples/to_dataframe/read_table_bqstorage.py +++ b/packages/google-cloud-bigquery-storage/samples/to_dataframe/read_table_bqstorage.py @@ -21,9 +21,10 @@ def read_table(your_project_id): your_project_id = original_your_project_id # [START bigquerystorage_pandas_tutorial_read_session] + import pandas + from google.cloud import bigquery_storage from google.cloud.bigquery_storage import types - import pandas bqstorageclient = bigquery_storage.BigQueryReadClient() diff --git a/packages/google-cloud-bigquery-storage/tests/system/resources/person_pb2.py b/packages/google-cloud-bigquery-storage/tests/system/resources/person_pb2.py index db5b82cfc4af..c22178895c5e 100644 --- a/packages/google-cloud-bigquery-storage/tests/system/resources/person_pb2.py +++ b/packages/google-cloud-bigquery-storage/tests/system/resources/person_pb2.py @@ -15,6 +15,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: person.proto """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database diff --git a/packages/google-cloud-bigquery-storage/tests/system/test_writer.py b/packages/google-cloud-bigquery-storage/tests/system/test_writer.py index 89a580cabbab..4a481e74b0d1 100644 --- a/packages/google-cloud-bigquery-storage/tests/system/test_writer.py +++ b/packages/google-cloud-bigquery-storage/tests/system/test_writer.py @@ -14,9 +14,9 @@ import uuid +import pytest from google.api_core import exceptions from google.protobuf import descriptor_pb2 -import pytest from google.cloud.bigquery_storage_v1 import types as gapic_types from google.cloud.bigquery_storage_v1.writer import AppendRowsStream diff --git a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_read.py b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_read.py index 4eeaf42275fd..de939eb1d03d 100644 --- a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_read.py +++ b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_read.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,15 +40,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.bigquery_storage_v1.services.big_query_read import ( BigQueryReadAsyncClient, @@ -907,10 +913,9 @@ def test_big_query_read_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +960,9 @@ def test_big_query_read_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +998,9 @@ def test_big_query_read_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1238,9 +1241,7 @@ def test_big_query_read_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1368,9 +1369,9 @@ def test_create_read_session_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_read_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_read_session] = ( + mock_rpc + ) request = {} client.create_read_session(request) @@ -2059,9 +2060,9 @@ def test_split_read_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.split_read_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.split_read_stream] = ( + mock_rpc + ) request = {} client.split_read_stream(request) diff --git a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_write.py b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_write.py index 3d187b293419..4a3ce5330203 100644 --- a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_write.py +++ b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_write.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,18 +40,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.oauth2 import service_account import google.protobuf.descriptor_pb2 as descriptor_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.bigquery_storage_v1.services.big_query_write import ( BigQueryWriteAsyncClient, @@ -931,10 +937,9 @@ def test_big_query_write_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +984,9 @@ def test_big_query_write_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1022,9 @@ def test_big_query_write_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1266,9 +1269,7 @@ def test_big_query_write_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1391,9 +1392,9 @@ def test_create_write_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_write_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_write_stream] = ( + mock_rpc + ) request = {} client.create_write_stream(request) @@ -1893,9 +1894,9 @@ def test_get_write_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_write_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_write_stream] = ( + mock_rpc + ) request = {} client.get_write_stream(request) @@ -2227,9 +2228,9 @@ def test_finalize_write_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.finalize_write_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.finalize_write_stream] = ( + mock_rpc + ) request = {} client.finalize_write_stream(request) diff --git a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1alpha/test_metastore_partition_service.py b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1alpha/test_metastore_partition_service.py index c83de46b6c84..71b6eaa98cfe 100644 --- a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1alpha/test_metastore_partition_service.py +++ b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1alpha/test_metastore_partition_service.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,16 +40,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.bigquery_storage_v1alpha.services.metastore_partition_service import ( MetastorePartitionServiceAsyncClient, @@ -976,10 +982,9 @@ def test_metastore_partition_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1029,9 @@ def test_metastore_partition_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1067,9 @@ def test_metastore_partition_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1318,9 +1321,7 @@ def test_metastore_partition_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta/test_metastore_partition_service.py b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta/test_metastore_partition_service.py index 585377207037..75f9f1aa7a2a 100644 --- a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta/test_metastore_partition_service.py +++ b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta/test_metastore_partition_service.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,16 +40,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.bigquery_storage_v1beta.services.metastore_partition_service import ( MetastorePartitionServiceAsyncClient, @@ -976,10 +982,9 @@ def test_metastore_partition_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1029,9 @@ def test_metastore_partition_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1067,9 @@ def test_metastore_partition_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1318,9 +1321,7 @@ def test_metastore_partition_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_read.py b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_read.py index 00ce8e8e0213..030d37ec2e3d 100644 --- a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_read.py +++ b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_read.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,15 +40,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.bigquery_storage_v1beta2.services.big_query_read import ( BigQueryReadAsyncClient, @@ -907,10 +913,9 @@ def test_big_query_read_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +960,9 @@ def test_big_query_read_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +998,9 @@ def test_big_query_read_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1238,9 +1241,7 @@ def test_big_query_read_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1360,9 +1361,9 @@ def test_create_read_session_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_read_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_read_session] = ( + mock_rpc + ) request = {} client.create_read_session(request) @@ -2043,9 +2044,9 @@ def test_split_read_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.split_read_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.split_read_stream] = ( + mock_rpc + ) request = {} client.split_read_stream(request) diff --git a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_write.py b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_write.py index ccb5b72af30c..4943d87ba2a8 100644 --- a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_write.py +++ b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_write.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,18 +40,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.oauth2 import service_account import google.protobuf.descriptor_pb2 as descriptor_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.bigquery_storage_v1beta2.services.big_query_write import ( BigQueryWriteAsyncClient, @@ -925,10 +931,9 @@ def test_big_query_write_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +978,9 @@ def test_big_query_write_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1016,9 @@ def test_big_query_write_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1260,9 +1263,7 @@ def test_big_query_write_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1381,9 +1382,9 @@ def test_create_write_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_write_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_write_stream] = ( + mock_rpc + ) request = {} client.create_write_stream(request) @@ -1875,9 +1876,9 @@ def test_get_write_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_write_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_write_stream] = ( + mock_rpc + ) request = {} client.get_write_stream(request) @@ -2205,9 +2206,9 @@ def test_finalize_write_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.finalize_write_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.finalize_write_stream] = ( + mock_rpc + ) request = {} client.finalize_write_stream(request) diff --git a/packages/google-cloud-bigquery-storage/tests/unit/test_read_client_v1.py b/packages/google-cloud-bigquery-storage/tests/unit/test_read_client_v1.py index 0c3e1dc1b40c..dd29d6c19fbc 100644 --- a/packages/google-cloud-bigquery-storage/tests/unit/test_read_client_v1.py +++ b/packages/google-cloud-bigquery-storage/tests/unit/test_read_client_v1.py @@ -16,9 +16,9 @@ from unittest import mock import google.api_core.exceptions +import pytest from google.api_core.gapic_v1 import client_info from google.auth import credentials -import pytest from google.cloud.bigquery_storage_v1 import types diff --git a/packages/google-cloud-bigquery-storage/tests/unit/test_writer_v1.py b/packages/google-cloud-bigquery-storage/tests/unit/test_writer_v1.py index 06ab1c76da55..81aa2bf6e426 100644 --- a/packages/google-cloud-bigquery-storage/tests/unit/test_writer_v1.py +++ b/packages/google-cloud-bigquery-storage/tests/unit/test_writer_v1.py @@ -18,9 +18,9 @@ import unittest from unittest import mock +import pytest from google.api_core import exceptions from google.protobuf import descriptor_pb2 -import pytest from google.cloud.bigquery_storage_v1 import exceptions as bqstorage_exceptions from google.cloud.bigquery_storage_v1 import gapic_version as package_version diff --git a/packages/google-cloud-bigquery-storage/tests/unit/test_writer_v1beta2.py b/packages/google-cloud-bigquery-storage/tests/unit/test_writer_v1beta2.py index 008666c5ec82..d567a329bb8a 100644 --- a/packages/google-cloud-bigquery-storage/tests/unit/test_writer_v1beta2.py +++ b/packages/google-cloud-bigquery-storage/tests/unit/test_writer_v1beta2.py @@ -15,9 +15,9 @@ import time from unittest import mock +import pytest from google.api_core import exceptions from google.protobuf import descriptor_pb2 -import pytest from google.cloud.bigquery_storage_v1beta2 import exceptions as bqstorage_exceptions from google.cloud.bigquery_storage_v1beta2 import types as gapic_types diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/__init__.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/__init__.py index 3348259131e8..7354da8e932b 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/__init__.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.budget_service import BudgetServiceAsyncClient, BudgetServiceClient from .types.budget_model import ( Budget, diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/async_client.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/async_client.py index d475a337bd42..b533323b5f03 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/async_client.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing.budgets_v1 import gapic_version as package_version @@ -118,7 +118,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BudgetServiceAsyncClient: The constructed client. """ - return BudgetServiceClient.from_service_account_info.__func__(BudgetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BudgetServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(BudgetServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +137,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BudgetServiceAsyncClient: The constructed client. """ - return BudgetServiceClient.from_service_account_file.__func__(BudgetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BudgetServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(BudgetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/client.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/client.py index 6a5b50188dd9..72a85f673da6 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/client.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing.budgets_v1 import gapic_version as package_version @@ -620,11 +620,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BudgetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BudgetServiceClient._read_environment_variables() + ) self._client_cert_source = BudgetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -659,8 +657,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BudgetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/pagers.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/pagers.py index c965d4b799c4..9ee372e1b170 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/pagers.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/base.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/base.py index 22dd381c9300..09e5b803c4dc 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/base.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.billing.budgets_v1 import gapic_version as package_version from google.cloud.billing.budgets_v1.types import budget_model, budget_service diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc.py index a253f04ac8cc..a8f65cd97791 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.billing.budgets_v1.types import budget_model, budget_service diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc_asyncio.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc_asyncio.py index e7aa5f420a52..0a06d1359006 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.billing.budgets_v1.types import budget_model, budget_service diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest.py index a5eb871b5239..84a91baf7754 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.billing.budgets_v1.types import budget_model, budget_service diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest_base.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest_base.py index 4941228c1a75..3084176ccd2e 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest_base.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.billing.budgets_v1.types import budget_model, budget_service diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/types/budget_model.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/types/budget_model.py index 6e4535020a7a..4b642b504fe9 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/types/budget_model.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/types/budget_model.py @@ -58,6 +58,7 @@ class CalendarPeriod(proto.Enum): YEAR (3): A year. Year starts on January 1. """ + CALENDAR_PERIOD_UNSPECIFIED = 0 MONTH = 1 QUARTER = 2 @@ -246,6 +247,7 @@ class Basis(proto.Enum): It cannot be set in combination with [Filter.custom_period][google.cloud.billing.budgets.v1.Filter.custom_period]. """ + BASIS_UNSPECIFIED = 0 CURRENT_SPEND = 1 FORECASTED_SPEND = 2 @@ -482,6 +484,7 @@ class CreditTypesTreatment(proto.Enum): gross cost to determine the spend for threshold calculations. """ + CREDIT_TYPES_TREATMENT_UNSPECIFIED = 0 INCLUDE_ALL_CREDITS = 1 EXCLUDE_ALL_CREDITS = 2 diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/__init__.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/__init__.py index d4802f876684..50537ad6605a 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/__init__.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.budget_service import BudgetServiceAsyncClient, BudgetServiceClient from .types.budget_model import ( AllUpdatesRule, diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/async_client.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/async_client.py index 2143fcc2f06c..d8ef7f91a34d 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/async_client.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing.budgets_v1beta1 import gapic_version as package_version @@ -116,7 +116,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BudgetServiceAsyncClient: The constructed client. """ - return BudgetServiceClient.from_service_account_info.__func__(BudgetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BudgetServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(BudgetServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +135,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BudgetServiceAsyncClient: The constructed client. """ - return BudgetServiceClient.from_service_account_file.__func__(BudgetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BudgetServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(BudgetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/client.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/client.py index 7b673aa5d382..88bc1348bc1c 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/client.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing.budgets_v1beta1 import gapic_version as package_version @@ -616,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BudgetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BudgetServiceClient._read_environment_variables() + ) self._client_cert_source = BudgetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -655,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BudgetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/pagers.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/pagers.py index 627a0fd4827c..3f908aea5dac 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/pagers.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/base.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/base.py index 9b187c6e275f..b0f473baf4c9 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/base.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.billing.budgets_v1beta1 import gapic_version as package_version from google.cloud.billing.budgets_v1beta1.types import budget_model, budget_service diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc.py index f58b881d4382..952f7505aaa9 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.billing.budgets_v1beta1.types import budget_model, budget_service diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc_asyncio.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc_asyncio.py index b8a9739a364a..ff64eae54490 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.billing.budgets_v1beta1.types import budget_model, budget_service diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/types/budget_model.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/types/budget_model.py index 367ca8697576..7ec742eff256 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/types/budget_model.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/types/budget_model.py @@ -58,6 +58,7 @@ class CalendarPeriod(proto.Enum): YEAR (3): A year. Year starts on January 1. """ + CALENDAR_PERIOD_UNSPECIFIED = 0 MONTH = 1 QUARTER = 2 @@ -248,6 +249,7 @@ class Basis(proto.Enum): It cannot be set in combination with [Filter.custom_period][google.cloud.billing.budgets.v1beta1.Filter.custom_period]. """ + BASIS_UNSPECIFIED = 0 CURRENT_SPEND = 1 FORECASTED_SPEND = 2 @@ -452,6 +454,7 @@ class CreditTypesTreatment(proto.Enum): gross cost to determine the spend for threshold calculations. """ + CREDIT_TYPES_TREATMENT_UNSPECIFIED = 0 INCLUDE_ALL_CREDITS = 1 EXCLUDE_ALL_CREDITS = 2 diff --git a/packages/google-cloud-billing-budgets/mypy.ini b/packages/google-cloud-billing-budgets/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-billing-budgets/mypy.ini +++ b/packages/google-cloud-billing-budgets/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-billing-budgets/noxfile.py b/packages/google-cloud-billing-budgets/noxfile.py index babdcec91fa4..4f956a39dbc9 100644 --- a/packages/google-cloud-billing-budgets/noxfile.py +++ b/packages/google-cloud-billing-budgets/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1/test_budget_service.py b/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1/test_budget_service.py index 92e7ee068990..3a2c68094e05 100644 --- a/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1/test_budget_service.py +++ b/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1/test_budget_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import google.type.date_pb2 as date_pb2 # type: ignore import google.type.money_pb2 as money_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.billing.budgets_v1.services.budget_service import ( BudgetServiceAsyncClient, @@ -945,10 +950,9 @@ def test_budget_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +997,9 @@ def test_budget_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1035,9 @@ def test_budget_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1282,9 +1284,7 @@ def test_budget_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1beta1/test_budget_service.py b/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1beta1/test_budget_service.py index 4e661da72217..5498fb98b412 100644 --- a/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1beta1/test_budget_service.py +++ b/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1beta1/test_budget_service.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,18 +40,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import google.type.date_pb2 as date_pb2 # type: ignore import google.type.money_pb2 as money_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.billing.budgets_v1beta1.services.budget_service import ( BudgetServiceAsyncClient, @@ -926,10 +932,9 @@ def test_budget_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -974,10 +979,9 @@ def test_budget_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1013,10 +1017,9 @@ def test_budget_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1261,9 +1264,7 @@ def test_budget_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/__init__.py b/packages/google-cloud-billing/google/cloud/billing_v1/__init__.py index 8191db500843..d9a2484e60cd 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/__init__.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_billing import CloudBillingAsyncClient, CloudBillingClient from .services.cloud_catalog import CloudCatalogAsyncClient, CloudCatalogClient from .types.cloud_billing import ( diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/async_client.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/async_client.py index 2dca7c0af658..e678e31d2745 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/async_client.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing_v1 import gapic_version as package_version @@ -126,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudBillingAsyncClient: The constructed client. """ - return CloudBillingClient.from_service_account_info.__func__(CloudBillingAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudBillingClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CloudBillingAsyncClient, 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: CloudBillingAsyncClient: The constructed client. """ - return CloudBillingClient.from_service_account_file.__func__(CloudBillingAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudBillingClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CloudBillingAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/client.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/client.py index 9c387881f2a5..7cbbf8508ac9 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/client.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing_v1 import gapic_version as package_version @@ -661,11 +661,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudBillingClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudBillingClient._read_environment_variables() + ) self._client_cert_source = CloudBillingClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -700,8 +698,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudBillingTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/pagers.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/pagers.py index d8056858e532..603456ba83ff 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/pagers.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/base.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/base.py index 11d5641b2c60..cee1f5fd7beb 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/base.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing_v1 import gapic_version as package_version from google.cloud.billing_v1.types import cloud_billing diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc.py index 65e2c5696288..4a92b6b360a0 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.billing_v1.types import cloud_billing @@ -582,12 +582,12 @@ def update_project_billing_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_project_billing_info" not in self._stubs: - self._stubs[ - "update_project_billing_info" - ] = self._logged_channel.unary_unary( - "/google.cloud.billing.v1.CloudBilling/UpdateProjectBillingInfo", - request_serializer=cloud_billing.UpdateProjectBillingInfoRequest.serialize, - response_deserializer=cloud_billing.ProjectBillingInfo.deserialize, + self._stubs["update_project_billing_info"] = ( + self._logged_channel.unary_unary( + "/google.cloud.billing.v1.CloudBilling/UpdateProjectBillingInfo", + request_serializer=cloud_billing.UpdateProjectBillingInfoRequest.serialize, + response_deserializer=cloud_billing.ProjectBillingInfo.deserialize, + ) ) return self._stubs["update_project_billing_info"] diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc_asyncio.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc_asyncio.py index fdff95c7fe1c..f8b16c3a9938 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc_asyncio.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.billing_v1.types import cloud_billing @@ -594,12 +594,12 @@ def update_project_billing_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_project_billing_info" not in self._stubs: - self._stubs[ - "update_project_billing_info" - ] = self._logged_channel.unary_unary( - "/google.cloud.billing.v1.CloudBilling/UpdateProjectBillingInfo", - request_serializer=cloud_billing.UpdateProjectBillingInfoRequest.serialize, - response_deserializer=cloud_billing.ProjectBillingInfo.deserialize, + self._stubs["update_project_billing_info"] = ( + self._logged_channel.unary_unary( + "/google.cloud.billing.v1.CloudBilling/UpdateProjectBillingInfo", + request_serializer=cloud_billing.UpdateProjectBillingInfoRequest.serialize, + response_deserializer=cloud_billing.ProjectBillingInfo.deserialize, + ) ) return self._stubs["update_project_billing_info"] diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest.py index 578bc32670ea..f9a5c3e5ce53 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -859,9 +859,7 @@ def __call__( """ - http_options = ( - _BaseCloudBillingRestTransport._BaseCreateBillingAccount._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseCreateBillingAccount._get_http_options() request, metadata = self._interceptor.pre_create_billing_account( request, metadata @@ -1013,9 +1011,7 @@ def __call__( """ - http_options = ( - _BaseCloudBillingRestTransport._BaseGetBillingAccount._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseGetBillingAccount._get_http_options() request, metadata = self._interceptor.pre_get_billing_account( request, metadata @@ -1386,9 +1382,7 @@ def __call__( """ - http_options = ( - _BaseCloudBillingRestTransport._BaseGetProjectBillingInfo._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseGetProjectBillingInfo._get_http_options() request, metadata = self._interceptor.pre_get_project_billing_info( request, metadata @@ -1534,9 +1528,7 @@ def __call__( Response message for ``ListBillingAccounts``. """ - http_options = ( - _BaseCloudBillingRestTransport._BaseListBillingAccounts._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseListBillingAccounts._get_http_options() request, metadata = self._interceptor.pre_list_billing_accounts( request, metadata @@ -1682,9 +1674,7 @@ def __call__( Request message for ``ListProjectBillingInfoResponse``. """ - http_options = ( - _BaseCloudBillingRestTransport._BaseListProjectBillingInfo._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseListProjectBillingInfo._get_http_options() request, metadata = self._interceptor.pre_list_project_billing_info( request, metadata @@ -1834,9 +1824,7 @@ def __call__( """ - http_options = ( - _BaseCloudBillingRestTransport._BaseMoveBillingAccount._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseMoveBillingAccount._get_http_options() request, metadata = self._interceptor.pre_move_billing_account( request, metadata @@ -2215,9 +2203,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseCloudBillingRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2370,9 +2356,7 @@ def __call__( """ - http_options = ( - _BaseCloudBillingRestTransport._BaseUpdateBillingAccount._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseUpdateBillingAccount._get_http_options() request, metadata = self._interceptor.pre_update_billing_account( request, metadata @@ -2530,9 +2514,7 @@ def __call__( """ - http_options = ( - _BaseCloudBillingRestTransport._BaseUpdateProjectBillingInfo._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseUpdateProjectBillingInfo._get_http_options() request, metadata = self._interceptor.pre_update_project_billing_info( request, metadata @@ -2689,7 +2671,9 @@ def list_project_billing_info( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListProjectBillingInfo(self._session, self._host, self._interceptor) # type: ignore + return self._ListProjectBillingInfo( + self._session, self._host, self._interceptor + ) # type: ignore @property def move_billing_account( @@ -2739,7 +2723,9 @@ def update_project_billing_info( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateProjectBillingInfo(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateProjectBillingInfo( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest_base.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest_base.py index e0317db9df95..3ce5992483e9 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest_base.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.api_core import gapic_v1, path_template from google.protobuf import json_format from google.cloud.billing_v1.types import cloud_billing diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/async_client.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/async_client.py index fdef6e39b3ba..90df4f9cda80 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/async_client.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing_v1 import gapic_version as package_version @@ -114,7 +114,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudCatalogAsyncClient: The constructed client. """ - return CloudCatalogClient.from_service_account_info.__func__(CloudCatalogAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudCatalogClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CloudCatalogAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +133,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudCatalogAsyncClient: The constructed client. """ - return CloudCatalogClient.from_service_account_file.__func__(CloudCatalogAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudCatalogClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CloudCatalogAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/client.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/client.py index 9aca9f378c8f..aefea94ba17c 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/client.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing_v1 import gapic_version as package_version @@ -631,11 +631,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudCatalogClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudCatalogClient._read_environment_variables() + ) self._client_cert_source = CloudCatalogClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -670,8 +668,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudCatalogTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/pagers.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/pagers.py index 38c75d48f806..bdeabdeec074 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/pagers.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/base.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/base.py index 7365be61a2f8..3595cafa2fc6 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/base.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing_v1 import gapic_version as package_version from google.cloud.billing_v1.types import cloud_catalog diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc.py index 4e558f87a475..c6b33088b49a 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.billing_v1.types import cloud_catalog diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc_asyncio.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc_asyncio.py index 56026f2a147f..b7e8ba1a6a0d 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc_asyncio.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.billing_v1.types import cloud_catalog diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/rest.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/rest.py index 4b489347b3b4..957a55f92f38 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/rest.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/types/cloud_catalog.py b/packages/google-cloud-billing/google/cloud/billing_v1/types/cloud_catalog.py index d25e9094f4c7..2b0cd71d8d41 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/types/cloud_catalog.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/types/cloud_catalog.py @@ -375,6 +375,7 @@ class AggregationLevel(proto.Enum): PROJECT (2): No description available. """ + AGGREGATION_LEVEL_UNSPECIFIED = 0 ACCOUNT = 1 PROJECT = 2 @@ -392,6 +393,7 @@ class AggregationInterval(proto.Enum): MONTHLY (2): No description available. """ + AGGREGATION_INTERVAL_UNSPECIFIED = 0 DAILY = 1 MONTHLY = 2 @@ -442,6 +444,7 @@ class Type(proto.Enum): The sku is associated with multiple regions, e.g. "us-west2" and "us-east1". """ + TYPE_UNSPECIFIED = 0 GLOBAL = 1 REGIONAL = 2 diff --git a/packages/google-cloud-billing/mypy.ini b/packages/google-cloud-billing/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-billing/mypy.ini +++ b/packages/google-cloud-billing/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-billing/noxfile.py b/packages/google-cloud-billing/noxfile.py index 66a1e9d22664..cc9e67c1121c 100644 --- a/packages/google-cloud-billing/noxfile.py +++ b/packages/google-cloud-billing/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_async.py b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_async.py index e946ebd9e611..552184318b7b 100644 --- a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_async.py +++ b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-billing -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START cloudbilling_v1_generated_CloudBilling_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import billing_v1 diff --git a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_sync.py b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_sync.py index e65568f23064..d4134dc23913 100644 --- a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_sync.py +++ b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-billing -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START cloudbilling_v1_generated_CloudBilling_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import billing_v1 diff --git a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_async.py b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_async.py index a3485c349b9a..7cee6a2c05f7 100644 --- a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_async.py +++ b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-billing -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START cloudbilling_v1_generated_CloudBilling_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import billing_v1 diff --git a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_sync.py b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_sync.py index 8e3eb6592333..032d655bc1eb 100644 --- a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_sync.py +++ b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-billing -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START cloudbilling_v1_generated_CloudBilling_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import billing_v1 diff --git a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_async.py b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_async.py index 755cc127c491..b93db658b1d1 100644 --- a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_async.py +++ b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-billing -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START cloudbilling_v1_generated_CloudBilling_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import billing_v1 diff --git a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_sync.py b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_sync.py index 4682744e492f..d2f98c945ad4 100644 --- a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_sync.py +++ b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-billing -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START cloudbilling_v1_generated_CloudBilling_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import billing_v1 diff --git a/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_billing.py b/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_billing.py index cb19315f2d7c..f8a566efd4f2 100644 --- a/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_billing.py +++ b/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_billing.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.options_pb2 as options_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.billing_v1.services.cloud_billing import ( CloudBillingAsyncClient, @@ -931,10 +936,9 @@ def test_cloud_billing_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +983,9 @@ def test_cloud_billing_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1021,9 @@ def test_cloud_billing_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1264,9 +1266,7 @@ def test_cloud_billing_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1393,9 +1393,9 @@ def test_get_billing_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_billing_account] = ( + mock_rpc + ) request = {} client.get_billing_account(request) @@ -1749,9 +1749,9 @@ def test_list_billing_accounts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_billing_accounts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_billing_accounts] = ( + mock_rpc + ) request = {} client.list_billing_accounts(request) @@ -2236,9 +2236,9 @@ def test_update_billing_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_billing_account] = ( + mock_rpc + ) request = {} client.update_billing_account(request) @@ -2609,9 +2609,9 @@ def test_create_billing_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_billing_account] = ( + mock_rpc + ) request = {} client.create_billing_account(request) @@ -4856,9 +4856,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5239,9 +5239,9 @@ def test_move_billing_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_billing_account] = ( + mock_rpc + ) request = {} client.move_billing_account(request) @@ -5437,9 +5437,9 @@ def test_get_billing_account_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_billing_account] = ( + mock_rpc + ) request = {} client.get_billing_account(request) @@ -5618,9 +5618,9 @@ def test_list_billing_accounts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_billing_accounts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_billing_accounts] = ( + mock_rpc + ) request = {} client.list_billing_accounts(request) @@ -5778,9 +5778,9 @@ def test_update_billing_account_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_billing_account] = ( + mock_rpc + ) request = {} client.update_billing_account(request) @@ -5972,9 +5972,9 @@ def test_create_billing_account_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_billing_account] = ( + mock_rpc + ) request = {} client.create_billing_account(request) @@ -7133,9 +7133,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -7326,9 +7326,9 @@ def test_move_billing_account_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_billing_account] = ( + mock_rpc + ) request = {} client.move_billing_account(request) diff --git a/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_catalog.py b/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_catalog.py index 749987538b83..f4b1db023407 100644 --- a/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_catalog.py +++ b/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_catalog.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.billing_v1.services.cloud_catalog import ( CloudCatalogAsyncClient, @@ -927,10 +932,9 @@ def test_cloud_catalog_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +979,9 @@ def test_cloud_catalog_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1017,9 @@ def test_cloud_catalog_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1260,9 +1262,7 @@ def test_cloud_catalog_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/__init__.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/__init__.py index bafce24dc6ee..68327937a6e4 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/__init__.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.binauthz_management_service_v1 import ( BinauthzManagementServiceV1AsyncClient, BinauthzManagementServiceV1Client, diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/async_client.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/async_client.py index 08c64adaa0fc..4c6edeac2c9d 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/async_client.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.binaryauthorization_v1 import gapic_version as package_version @@ -138,7 +138,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BinauthzManagementServiceV1AsyncClient: The constructed client. """ - return BinauthzManagementServiceV1Client.from_service_account_info.__func__(BinauthzManagementServiceV1AsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BinauthzManagementServiceV1Client.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + BinauthzManagementServiceV1AsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +159,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BinauthzManagementServiceV1AsyncClient: The constructed client. """ - return BinauthzManagementServiceV1Client.from_service_account_file.__func__(BinauthzManagementServiceV1AsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BinauthzManagementServiceV1Client.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + BinauthzManagementServiceV1AsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -192,7 +202,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return BinauthzManagementServiceV1Client.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return BinauthzManagementServiceV1Client.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> BinauthzManagementServiceV1Transport: diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/client.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/client.py index 9e0fc77bbd64..0c6edc115f01 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/client.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.binaryauthorization_v1 import gapic_version as package_version @@ -82,13 +82,11 @@ class BinauthzManagementServiceV1ClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BinauthzManagementServiceV1Transport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BinauthzManagementServiceV1Transport]] _transport_registry["grpc"] = BinauthzManagementServiceV1GrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = BinauthzManagementServiceV1GrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + BinauthzManagementServiceV1GrpcAsyncIOTransport + ) _transport_registry["rest"] = BinauthzManagementServiceV1RestTransport def get_transport_class( @@ -651,11 +649,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BinauthzManagementServiceV1Client._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BinauthzManagementServiceV1Client._read_environment_variables() + ) self._client_cert_source = ( BinauthzManagementServiceV1Client._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -692,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BinauthzManagementServiceV1Transport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/pagers.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/pagers.py index 0411a0c028f2..779b2d470f8c 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/pagers.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/__init__.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/__init__.py index 07d00916b53a..ea395d0052e3 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/__init__.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[BinauthzManagementServiceV1Transport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[BinauthzManagementServiceV1Transport]] _transport_registry["grpc"] = BinauthzManagementServiceV1GrpcTransport _transport_registry["grpc_asyncio"] = BinauthzManagementServiceV1GrpcAsyncIOTransport _transport_registry["rest"] = BinauthzManagementServiceV1RestTransport diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/base.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/base.py index ae7cca6da074..58bf8681b5ec 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/base.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.binaryauthorization_v1 import gapic_version as package_version from google.cloud.binaryauthorization_v1.types import resources, service diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/grpc.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/grpc.py index 4d78c28b0b4c..86049138b3a9 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/grpc.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.binaryauthorization_v1.types import resources, service diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/grpc_asyncio.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/grpc_asyncio.py index 4e5fae2a6d1f..1010dc7fabb0 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/grpc_asyncio.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.binaryauthorization_v1.types import resources, service diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/rest.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/rest.py index 47d122b93c00..0f04052872f2 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/rest.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.binaryauthorization_v1.types import resources, service @@ -566,9 +566,7 @@ def __call__( """ - http_options = ( - _BaseBinauthzManagementServiceV1RestTransport._BaseCreateAttestor._get_http_options() - ) + http_options = _BaseBinauthzManagementServiceV1RestTransport._BaseCreateAttestor._get_http_options() request, metadata = self._interceptor.pre_create_attestor(request, metadata) transcoded_request = _BaseBinauthzManagementServiceV1RestTransport._BaseCreateAttestor._get_transcoded_request( @@ -715,9 +713,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBinauthzManagementServiceV1RestTransport._BaseDeleteAttestor._get_http_options() - ) + http_options = _BaseBinauthzManagementServiceV1RestTransport._BaseDeleteAttestor._get_http_options() request, metadata = self._interceptor.pre_delete_attestor(request, metadata) transcoded_request = _BaseBinauthzManagementServiceV1RestTransport._BaseDeleteAttestor._get_transcoded_request( @@ -833,9 +829,7 @@ def __call__( """ - http_options = ( - _BaseBinauthzManagementServiceV1RestTransport._BaseGetAttestor._get_http_options() - ) + http_options = _BaseBinauthzManagementServiceV1RestTransport._BaseGetAttestor._get_http_options() request, metadata = self._interceptor.pre_get_attestor(request, metadata) transcoded_request = _BaseBinauthzManagementServiceV1RestTransport._BaseGetAttestor._get_transcoded_request( @@ -983,9 +977,7 @@ def __call__( """ - http_options = ( - _BaseBinauthzManagementServiceV1RestTransport._BaseGetPolicy._get_http_options() - ) + http_options = _BaseBinauthzManagementServiceV1RestTransport._BaseGetPolicy._get_http_options() request, metadata = self._interceptor.pre_get_policy(request, metadata) transcoded_request = _BaseBinauthzManagementServiceV1RestTransport._BaseGetPolicy._get_transcoded_request( @@ -1133,9 +1125,7 @@ def __call__( """ - http_options = ( - _BaseBinauthzManagementServiceV1RestTransport._BaseListAttestors._get_http_options() - ) + http_options = _BaseBinauthzManagementServiceV1RestTransport._BaseListAttestors._get_http_options() request, metadata = self._interceptor.pre_list_attestors(request, metadata) transcoded_request = _BaseBinauthzManagementServiceV1RestTransport._BaseListAttestors._get_transcoded_request( @@ -1286,9 +1276,7 @@ def __call__( """ - http_options = ( - _BaseBinauthzManagementServiceV1RestTransport._BaseUpdateAttestor._get_http_options() - ) + http_options = _BaseBinauthzManagementServiceV1RestTransport._BaseUpdateAttestor._get_http_options() request, metadata = self._interceptor.pre_update_attestor(request, metadata) transcoded_request = _BaseBinauthzManagementServiceV1RestTransport._BaseUpdateAttestor._get_transcoded_request( @@ -1442,9 +1430,7 @@ def __call__( """ - http_options = ( - _BaseBinauthzManagementServiceV1RestTransport._BaseUpdatePolicy._get_http_options() - ) + http_options = _BaseBinauthzManagementServiceV1RestTransport._BaseUpdatePolicy._get_http_options() request, metadata = self._interceptor.pre_update_policy(request, metadata) transcoded_request = _BaseBinauthzManagementServiceV1RestTransport._BaseUpdatePolicy._get_transcoded_request( diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/rest_base.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/rest_base.py index 8ef972cd3c5c..9d37a19b7d3a 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/rest_base.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.binaryauthorization_v1.types import resources, service diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/async_client.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/async_client.py index d7bb9514cf27..d7287b9e285f 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/async_client.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.binaryauthorization_v1 import gapic_version as package_version @@ -114,7 +114,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SystemPolicyV1AsyncClient: The constructed client. """ - return SystemPolicyV1Client.from_service_account_info.__func__(SystemPolicyV1AsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SystemPolicyV1Client.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SystemPolicyV1AsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +133,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SystemPolicyV1AsyncClient: The constructed client. """ - return SystemPolicyV1Client.from_service_account_file.__func__(SystemPolicyV1AsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SystemPolicyV1Client.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SystemPolicyV1AsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/client.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/client.py index 05cc61f36660..0a767cf014b7 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/client.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.binaryauthorization_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class SystemPolicyV1ClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SystemPolicyV1Transport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SystemPolicyV1Transport]] _transport_registry["grpc"] = SystemPolicyV1GrpcTransport _transport_registry["grpc_asyncio"] = SystemPolicyV1GrpcAsyncIOTransport _transport_registry["rest"] = SystemPolicyV1RestTransport @@ -614,11 +612,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SystemPolicyV1Client._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SystemPolicyV1Client._read_environment_variables() + ) self._client_cert_source = SystemPolicyV1Client._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -653,8 +649,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SystemPolicyV1Transport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/base.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/base.py index 23d498dd1a83..b40769c21e80 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/base.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.binaryauthorization_v1 import gapic_version as package_version from google.cloud.binaryauthorization_v1.types import resources, service diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/grpc.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/grpc.py index af61607117a2..56c27fc99c6f 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/grpc.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.binaryauthorization_v1.types import resources, service diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/grpc_asyncio.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/grpc_asyncio.py index 8a6d5bc0ad5e..b10cd0d4b33e 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/grpc_asyncio.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.binaryauthorization_v1.types import resources, service diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/rest.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/rest.py index ebd3f2a429f4..f375a0731720 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/rest.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -275,9 +275,7 @@ def __call__( """ - http_options = ( - _BaseSystemPolicyV1RestTransport._BaseGetSystemPolicy._get_http_options() - ) + http_options = _BaseSystemPolicyV1RestTransport._BaseGetSystemPolicy._get_http_options() request, metadata = self._interceptor.pre_get_system_policy( request, metadata diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/async_client.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/async_client.py index aebb0f8b05be..856bf7df339f 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/async_client.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.binaryauthorization_v1 import gapic_version as package_version @@ -110,7 +110,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ValidationHelperV1AsyncClient: The constructed client. """ - return ValidationHelperV1Client.from_service_account_info.__func__(ValidationHelperV1AsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ValidationHelperV1Client.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ValidationHelperV1AsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -126,7 +129,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ValidationHelperV1AsyncClient: The constructed client. """ - return ValidationHelperV1Client.from_service_account_file.__func__(ValidationHelperV1AsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ValidationHelperV1Client.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ValidationHelperV1AsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -164,7 +170,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ValidationHelperV1Client.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ValidationHelperV1Client.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ValidationHelperV1Transport: diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/client.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/client.py index eb2834fff487..94553af63fb0 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/client.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.binaryauthorization_v1 import gapic_version as package_version @@ -77,9 +77,7 @@ class ValidationHelperV1ClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ValidationHelperV1Transport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ValidationHelperV1Transport]] _transport_registry["grpc"] = ValidationHelperV1GrpcTransport _transport_registry["grpc_asyncio"] = ValidationHelperV1GrpcAsyncIOTransport _transport_registry["rest"] = ValidationHelperV1RestTransport @@ -601,11 +599,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ValidationHelperV1Client._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ValidationHelperV1Client._read_environment_variables() + ) self._client_cert_source = ValidationHelperV1Client._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +636,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ValidationHelperV1Transport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/__init__.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/__init__.py index ca0a405efc44..693312e39f58 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/__init__.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ValidationHelperV1RestInterceptor, ValidationHelperV1RestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ValidationHelperV1Transport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ValidationHelperV1Transport]] _transport_registry["grpc"] = ValidationHelperV1GrpcTransport _transport_registry["grpc_asyncio"] = ValidationHelperV1GrpcAsyncIOTransport _transport_registry["rest"] = ValidationHelperV1RestTransport diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/base.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/base.py index d3a43590a9c3..71e27d846590 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/base.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.binaryauthorization_v1 import gapic_version as package_version from google.cloud.binaryauthorization_v1.types import service diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/grpc.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/grpc.py index 0439cabd18ad..23dcbc0bcf0b 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/grpc.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.binaryauthorization_v1.types import service @@ -345,12 +345,12 @@ def validate_attestation_occurrence( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "validate_attestation_occurrence" not in self._stubs: - self._stubs[ - "validate_attestation_occurrence" - ] = self._logged_channel.unary_unary( - "/google.cloud.binaryauthorization.v1.ValidationHelperV1/ValidateAttestationOccurrence", - request_serializer=service.ValidateAttestationOccurrenceRequest.serialize, - response_deserializer=service.ValidateAttestationOccurrenceResponse.deserialize, + self._stubs["validate_attestation_occurrence"] = ( + self._logged_channel.unary_unary( + "/google.cloud.binaryauthorization.v1.ValidationHelperV1/ValidateAttestationOccurrence", + request_serializer=service.ValidateAttestationOccurrenceRequest.serialize, + response_deserializer=service.ValidateAttestationOccurrenceResponse.deserialize, + ) ) return self._stubs["validate_attestation_occurrence"] diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/grpc_asyncio.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/grpc_asyncio.py index d8ff7aeb111d..f21b0528c661 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/grpc_asyncio.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.binaryauthorization_v1.types import service @@ -353,12 +353,12 @@ def validate_attestation_occurrence( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "validate_attestation_occurrence" not in self._stubs: - self._stubs[ - "validate_attestation_occurrence" - ] = self._logged_channel.unary_unary( - "/google.cloud.binaryauthorization.v1.ValidationHelperV1/ValidateAttestationOccurrence", - request_serializer=service.ValidateAttestationOccurrenceRequest.serialize, - response_deserializer=service.ValidateAttestationOccurrenceResponse.deserialize, + self._stubs["validate_attestation_occurrence"] = ( + self._logged_channel.unary_unary( + "/google.cloud.binaryauthorization.v1.ValidationHelperV1/ValidateAttestationOccurrence", + request_serializer=service.ValidateAttestationOccurrenceRequest.serialize, + response_deserializer=service.ValidateAttestationOccurrenceResponse.deserialize, + ) ) return self._stubs["validate_attestation_occurrence"] diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/rest.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/rest.py index bb02bafef2a5..5986468d07bb 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/rest.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/validation_helper_v1/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -286,9 +286,7 @@ def __call__( """ - http_options = ( - _BaseValidationHelperV1RestTransport._BaseValidateAttestationOccurrence._get_http_options() - ) + http_options = _BaseValidationHelperV1RestTransport._BaseValidateAttestationOccurrence._get_http_options() request, metadata = self._interceptor.pre_validate_attestation_occurrence( request, metadata @@ -357,11 +355,10 @@ def __call__( resp = self._interceptor.post_validate_attestation_occurrence(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_validate_attestation_occurrence_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_validate_attestation_occurrence_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -397,7 +394,9 @@ def validate_attestation_occurrence( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ValidateAttestationOccurrence(self._session, self._host, self._interceptor) # type: ignore + return self._ValidateAttestationOccurrence( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/types/resources.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/types/resources.py index 3e851cc198ea..d21f30e782d0 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/types/resources.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/types/resources.py @@ -102,6 +102,7 @@ class GlobalPolicyEvaluationMode(proto.Enum): DISABLE (2): Disables system policy evaluation. """ + GLOBAL_POLICY_EVALUATION_MODE_UNSPECIFIED = 0 ENABLE = 1 DISABLE = 2 @@ -119,12 +120,12 @@ class GlobalPolicyEvaluationMode(proto.Enum): number=7, enum=GlobalPolicyEvaluationMode, ) - admission_whitelist_patterns: MutableSequence[ - "AdmissionWhitelistPattern" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="AdmissionWhitelistPattern", + admission_whitelist_patterns: MutableSequence["AdmissionWhitelistPattern"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="AdmissionWhitelistPattern", + ) ) cluster_admission_rules: MutableMapping[str, "AdmissionRule"] = proto.MapField( proto.STRING, @@ -132,29 +133,29 @@ class GlobalPolicyEvaluationMode(proto.Enum): number=3, message="AdmissionRule", ) - kubernetes_namespace_admission_rules: MutableMapping[ - str, "AdmissionRule" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=10, - message="AdmissionRule", + kubernetes_namespace_admission_rules: MutableMapping[str, "AdmissionRule"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=10, + message="AdmissionRule", + ) ) - kubernetes_service_account_admission_rules: MutableMapping[ - str, "AdmissionRule" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=8, - message="AdmissionRule", + kubernetes_service_account_admission_rules: MutableMapping[str, "AdmissionRule"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=8, + message="AdmissionRule", + ) ) - istio_service_identity_admission_rules: MutableMapping[ - str, "AdmissionRule" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=9, - message="AdmissionRule", + istio_service_identity_admission_rules: MutableMapping[str, "AdmissionRule"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=9, + message="AdmissionRule", + ) ) default_admission_rule: "AdmissionRule" = proto.Field( proto.MESSAGE, @@ -238,6 +239,7 @@ class EvaluationMode(proto.Enum): ALWAYS_DENY (3): This rule denies all pod creations. """ + EVALUATION_MODE_UNSPECIFIED = 0 ALWAYS_ALLOW = 1 REQUIRE_ATTESTATION = 2 @@ -258,6 +260,7 @@ class EnforcementMode(proto.Enum): allow the pod creation as if the admission request had specified break-glass. """ + ENFORCEMENT_MODE_UNSPECIFIED = 0 ENFORCED_BLOCK_AND_AUDIT_LOG = 1 DRYRUN_AUDIT_LOG_ONLY = 2 @@ -448,6 +451,7 @@ class SignatureAlgorithm(proto.Enum): ECDSA on the NIST P-521 curve with a SHA512 digest. """ + _pb_options = {"allow_alias": True} SIGNATURE_ALGORITHM_UNSPECIFIED = 0 RSA_PSS_2048_SHA256 = 1 diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/types/service.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/types/service.py index deb30cdf3f95..4203dd340d2a 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/types/service.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/types/service.py @@ -314,6 +314,7 @@ class Result(proto.Enum): The Attestation was not able to verified by the Attestor. """ + RESULT_UNSPECIFIED = 0 VERIFIED = 1 ATTESTATION_NOT_VERIFIABLE = 2 diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/__init__.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/__init__.py index 6bb67cee5fcd..326f38b48787 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/__init__.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.binauthz_management_service_v1_beta1 import ( BinauthzManagementServiceV1Beta1AsyncClient, BinauthzManagementServiceV1Beta1Client, diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/async_client.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/async_client.py index a49b51a15a3d..22c34c08c03f 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/async_client.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.binaryauthorization_v1beta1 import gapic_version as package_version @@ -143,7 +143,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BinauthzManagementServiceV1Beta1AsyncClient: The constructed client. """ - return BinauthzManagementServiceV1Beta1Client.from_service_account_info.__func__(BinauthzManagementServiceV1Beta1AsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BinauthzManagementServiceV1Beta1Client.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + BinauthzManagementServiceV1Beta1AsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +164,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BinauthzManagementServiceV1Beta1AsyncClient: The constructed client. """ - return BinauthzManagementServiceV1Beta1Client.from_service_account_file.__func__(BinauthzManagementServiceV1Beta1AsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BinauthzManagementServiceV1Beta1Client.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + BinauthzManagementServiceV1Beta1AsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -197,7 +207,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return BinauthzManagementServiceV1Beta1Client.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return BinauthzManagementServiceV1Beta1Client.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> BinauthzManagementServiceV1Beta1Transport: diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/client.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/client.py index 76f9ee9605ed..95dc2bc45c5e 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/client.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.binaryauthorization_v1beta1 import gapic_version as package_version @@ -87,13 +87,11 @@ class BinauthzManagementServiceV1Beta1ClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BinauthzManagementServiceV1Beta1Transport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BinauthzManagementServiceV1Beta1Transport]] _transport_registry["grpc"] = BinauthzManagementServiceV1Beta1GrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = BinauthzManagementServiceV1Beta1GrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + BinauthzManagementServiceV1Beta1GrpcAsyncIOTransport + ) _transport_registry["rest"] = BinauthzManagementServiceV1Beta1RestTransport def get_transport_class( @@ -658,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BinauthzManagementServiceV1Beta1Client._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BinauthzManagementServiceV1Beta1Client._read_environment_variables() + ) self._client_cert_source = ( BinauthzManagementServiceV1Beta1Client._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -703,8 +699,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BinauthzManagementServiceV1Beta1Transport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/pagers.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/pagers.py index 34c1345415ea..6918a91f85b6 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/pagers.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/__init__.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/__init__.py index 2183d5a03d02..33184218e075 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/__init__.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/__init__.py @@ -25,13 +25,11 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[BinauthzManagementServiceV1Beta1Transport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[BinauthzManagementServiceV1Beta1Transport]] _transport_registry["grpc"] = BinauthzManagementServiceV1Beta1GrpcTransport -_transport_registry[ - "grpc_asyncio" -] = BinauthzManagementServiceV1Beta1GrpcAsyncIOTransport +_transport_registry["grpc_asyncio"] = ( + BinauthzManagementServiceV1Beta1GrpcAsyncIOTransport +) _transport_registry["rest"] = BinauthzManagementServiceV1Beta1RestTransport __all__ = ( diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/base.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/base.py index eef4bcb41157..f058d1792303 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/base.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.binaryauthorization_v1beta1 import gapic_version as package_version from google.cloud.binaryauthorization_v1beta1.types import resources, service diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/grpc.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/grpc.py index 215818b0180f..8a48a392c6ff 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/grpc.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.binaryauthorization_v1beta1.types import resources, service diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/grpc_asyncio.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/grpc_asyncio.py index 89eb7c5c7ca5..62a0d5efc4eb 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/grpc_asyncio.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.binaryauthorization_v1beta1.types import resources, service diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/rest.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/rest.py index e916ff2f77b4..54a1618e31f1 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/rest.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.binaryauthorization_v1beta1.types import resources, service @@ -568,9 +568,7 @@ def __call__( """ - http_options = ( - _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseCreateAttestor._get_http_options() - ) + http_options = _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseCreateAttestor._get_http_options() request, metadata = self._interceptor.pre_create_attestor(request, metadata) transcoded_request = _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseCreateAttestor._get_transcoded_request( @@ -715,9 +713,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseDeleteAttestor._get_http_options() - ) + http_options = _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseDeleteAttestor._get_http_options() request, metadata = self._interceptor.pre_delete_attestor(request, metadata) transcoded_request = _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseDeleteAttestor._get_transcoded_request( @@ -831,9 +827,7 @@ def __call__( """ - http_options = ( - _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseGetAttestor._get_http_options() - ) + http_options = _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseGetAttestor._get_http_options() request, metadata = self._interceptor.pre_get_attestor(request, metadata) transcoded_request = _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseGetAttestor._get_transcoded_request( @@ -980,9 +974,7 @@ def __call__( """ - http_options = ( - _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseGetPolicy._get_http_options() - ) + http_options = _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseGetPolicy._get_http_options() request, metadata = self._interceptor.pre_get_policy(request, metadata) transcoded_request = _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseGetPolicy._get_transcoded_request( @@ -1130,9 +1122,7 @@ def __call__( """ - http_options = ( - _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseListAttestors._get_http_options() - ) + http_options = _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseListAttestors._get_http_options() request, metadata = self._interceptor.pre_list_attestors(request, metadata) transcoded_request = _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseListAttestors._get_transcoded_request( @@ -1281,9 +1271,7 @@ def __call__( """ - http_options = ( - _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseUpdateAttestor._get_http_options() - ) + http_options = _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseUpdateAttestor._get_http_options() request, metadata = self._interceptor.pre_update_attestor(request, metadata) transcoded_request = _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseUpdateAttestor._get_transcoded_request( @@ -1436,9 +1424,7 @@ def __call__( """ - http_options = ( - _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseUpdatePolicy._get_http_options() - ) + http_options = _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseUpdatePolicy._get_http_options() request, metadata = self._interceptor.pre_update_policy(request, metadata) transcoded_request = _BaseBinauthzManagementServiceV1Beta1RestTransport._BaseUpdatePolicy._get_transcoded_request( diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/rest_base.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/rest_base.py index f5dbb53209bc..18109121bd72 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/rest_base.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/binauthz_management_service_v1_beta1/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.binaryauthorization_v1beta1.types import resources, service diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/async_client.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/async_client.py index 31bbd6edf736..9f5073fd4d2a 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/async_client.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.binaryauthorization_v1beta1 import gapic_version as package_version @@ -114,7 +114,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SystemPolicyV1Beta1AsyncClient: The constructed client. """ - return SystemPolicyV1Beta1Client.from_service_account_info.__func__(SystemPolicyV1Beta1AsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SystemPolicyV1Beta1Client.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SystemPolicyV1Beta1AsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +133,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SystemPolicyV1Beta1AsyncClient: The constructed client. """ - return SystemPolicyV1Beta1Client.from_service_account_file.__func__(SystemPolicyV1Beta1AsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SystemPolicyV1Beta1Client.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SystemPolicyV1Beta1AsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -168,7 +174,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SystemPolicyV1Beta1Client.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SystemPolicyV1Beta1Client.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SystemPolicyV1Beta1Transport: diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/client.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/client.py index 87e77fa873f5..b4c45e422f64 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/client.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.binaryauthorization_v1beta1 import gapic_version as package_version @@ -79,9 +79,7 @@ class SystemPolicyV1Beta1ClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SystemPolicyV1Beta1Transport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SystemPolicyV1Beta1Transport]] _transport_registry["grpc"] = SystemPolicyV1Beta1GrpcTransport _transport_registry["grpc_asyncio"] = SystemPolicyV1Beta1GrpcAsyncIOTransport _transport_registry["rest"] = SystemPolicyV1Beta1RestTransport @@ -618,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SystemPolicyV1Beta1Client._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SystemPolicyV1Beta1Client._read_environment_variables() + ) self._client_cert_source = SystemPolicyV1Beta1Client._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -657,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SystemPolicyV1Beta1Transport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/__init__.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/__init__.py index c8965d1e8e6e..d257c9d84ade 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/__init__.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SystemPolicyV1Beta1RestInterceptor, SystemPolicyV1Beta1RestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SystemPolicyV1Beta1Transport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SystemPolicyV1Beta1Transport]] _transport_registry["grpc"] = SystemPolicyV1Beta1GrpcTransport _transport_registry["grpc_asyncio"] = SystemPolicyV1Beta1GrpcAsyncIOTransport _transport_registry["rest"] = SystemPolicyV1Beta1RestTransport diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/base.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/base.py index ac0f5b36ccad..509a8873e867 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/base.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.binaryauthorization_v1beta1 import gapic_version as package_version from google.cloud.binaryauthorization_v1beta1.types import resources, service diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/grpc.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/grpc.py index 6c030beb297b..da001513718a 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/grpc.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.binaryauthorization_v1beta1.types import resources, service diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/grpc_asyncio.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/grpc_asyncio.py index 50a2170631dc..c00a0d498582 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/grpc_asyncio.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.binaryauthorization_v1beta1.types import resources, service diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/rest.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/rest.py index 1b7d947df402..ff8aa417af7b 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/rest.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/services/system_policy_v1_beta1/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -277,9 +277,7 @@ def __call__( """ - http_options = ( - _BaseSystemPolicyV1Beta1RestTransport._BaseGetSystemPolicy._get_http_options() - ) + http_options = _BaseSystemPolicyV1Beta1RestTransport._BaseGetSystemPolicy._get_http_options() request, metadata = self._interceptor.pre_get_system_policy( request, metadata diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/__init__.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/__init__.py index 94ade31b6bfe..7cdc49dad9c3 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/__init__.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .continuous_validation_logging import ContinuousValidationEvent +from .continuous_validation_logging import ( + ContinuousValidationEvent, +) from .resources import ( AdmissionRule, AdmissionWhitelistPattern, diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/continuous_validation_logging.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/continuous_validation_logging.py index e82c446ecae2..c9eed20ee842 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/continuous_validation_logging.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/continuous_validation_logging.py @@ -80,6 +80,7 @@ class PolicyConformanceVerdict(proto.Enum): VIOLATES_POLICY (1): The pod violates the policy. """ + POLICY_CONFORMANCE_VERDICT_UNSPECIFIED = 0 VIOLATES_POLICY = 1 @@ -118,6 +119,7 @@ class ContainerType(proto.Enum): Ephemeral container defined as specified at https://kubernetes.io/docs/concepts/workloads/pods/ephemeral-containers/ """ + CONTAINER_TYPE_UNSPECIFIED = 0 CONTAINER = 1 INIT_CONTAINER = 2 @@ -134,6 +136,7 @@ class AuditResult(proto.Enum): DENY (2): Image is denied. """ + AUDIT_RESULT_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 @@ -172,6 +175,7 @@ class CheckVerdict(proto.Enum): The check was successfully evaluated and the image did not satisfy the check. """ + CHECK_VERDICT_UNSPECIFIED = 0 NON_CONFORMANT = 1 diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/resources.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/resources.py index a9bd05989146..756266f1b166 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/resources.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/resources.py @@ -100,6 +100,7 @@ class GlobalPolicyEvaluationMode(proto.Enum): DISABLE (2): Disables system policy evaluation. """ + GLOBAL_POLICY_EVALUATION_MODE_UNSPECIFIED = 0 ENABLE = 1 DISABLE = 2 @@ -117,12 +118,12 @@ class GlobalPolicyEvaluationMode(proto.Enum): number=7, enum=GlobalPolicyEvaluationMode, ) - admission_whitelist_patterns: MutableSequence[ - "AdmissionWhitelistPattern" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="AdmissionWhitelistPattern", + admission_whitelist_patterns: MutableSequence["AdmissionWhitelistPattern"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="AdmissionWhitelistPattern", + ) ) cluster_admission_rules: MutableMapping[str, "AdmissionRule"] = proto.MapField( proto.STRING, @@ -130,29 +131,29 @@ class GlobalPolicyEvaluationMode(proto.Enum): number=3, message="AdmissionRule", ) - kubernetes_namespace_admission_rules: MutableMapping[ - str, "AdmissionRule" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=10, - message="AdmissionRule", + kubernetes_namespace_admission_rules: MutableMapping[str, "AdmissionRule"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=10, + message="AdmissionRule", + ) ) - kubernetes_service_account_admission_rules: MutableMapping[ - str, "AdmissionRule" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=8, - message="AdmissionRule", + kubernetes_service_account_admission_rules: MutableMapping[str, "AdmissionRule"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=8, + message="AdmissionRule", + ) ) - istio_service_identity_admission_rules: MutableMapping[ - str, "AdmissionRule" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=9, - message="AdmissionRule", + istio_service_identity_admission_rules: MutableMapping[str, "AdmissionRule"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=9, + message="AdmissionRule", + ) ) default_admission_rule: "AdmissionRule" = proto.Field( proto.MESSAGE, @@ -239,6 +240,7 @@ class EvaluationMode(proto.Enum): ALWAYS_DENY (3): This rule denies all pod creations. """ + EVALUATION_MODE_UNSPECIFIED = 0 ALWAYS_ALLOW = 1 REQUIRE_ATTESTATION = 2 @@ -259,6 +261,7 @@ class EnforcementMode(proto.Enum): allow the pod creation as if the admission request had specified break-glass. """ + ENFORCEMENT_MODE_UNSPECIFIED = 0 ENFORCED_BLOCK_AND_AUDIT_LOG = 1 DRYRUN_AUDIT_LOG_ONLY = 2 @@ -447,6 +450,7 @@ class SignatureAlgorithm(proto.Enum): ECDSA on the NIST P-521 curve with a SHA512 digest. """ + _pb_options = {"allow_alias": True} SIGNATURE_ALGORITHM_UNSPECIFIED = 0 RSA_PSS_2048_SHA256 = 1 diff --git a/packages/google-cloud-binary-authorization/mypy.ini b/packages/google-cloud-binary-authorization/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-binary-authorization/mypy.ini +++ b/packages/google-cloud-binary-authorization/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-binary-authorization/noxfile.py b/packages/google-cloud-binary-authorization/noxfile.py index f06483b605e1..3beaee5eef19 100644 --- a/packages/google-cloud-binary-authorization/noxfile.py +++ b/packages/google-cloud-binary-authorization/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1/test_binauthz_management_service_v1.py b/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1/test_binauthz_management_service_v1.py index 2f8703116a65..ccc6fb1efb94 100644 --- a/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1/test_binauthz_management_service_v1.py +++ b/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1/test_binauthz_management_service_v1.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.binaryauthorization_v1.services.binauthz_management_service_v1 import ( BinauthzManagementServiceV1AsyncClient, @@ -1033,10 +1038,9 @@ def test_binauthz_management_service_v1_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1081,10 +1085,9 @@ def test_binauthz_management_service_v1_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1120,10 +1123,9 @@ def test_binauthz_management_service_v1_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1386,9 +1388,7 @@ def test_binauthz_management_service_v1_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1/test_system_policy_v1.py b/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1/test_system_policy_v1.py index 6869a28c4537..ba2db75501a3 100644 --- a/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1/test_system_policy_v1.py +++ b/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1/test_system_policy_v1.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.binaryauthorization_v1.services.system_policy_v1 import ( SystemPolicyV1AsyncClient, @@ -949,10 +954,9 @@ def test_system_policy_v1_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1001,9 @@ def test_system_policy_v1_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1036,10 +1039,9 @@ def test_system_policy_v1_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1286,9 +1288,7 @@ def test_system_policy_v1_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1406,9 +1406,9 @@ def test_get_system_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_system_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_system_policy] = ( + mock_rpc + ) request = {} client.get_system_policy(request) @@ -1680,9 +1680,9 @@ def test_get_system_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_system_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_system_policy] = ( + mock_rpc + ) request = {} client.get_system_policy(request) diff --git a/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1/test_validation_helper_v1.py b/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1/test_validation_helper_v1.py index 7cb9cde38a5e..15729d1275d7 100644 --- a/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1/test_validation_helper_v1.py +++ b/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1/test_validation_helper_v1.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -981,10 +986,9 @@ def test_validation_helper_v1_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1029,10 +1033,9 @@ def test_validation_helper_v1_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1068,10 +1071,9 @@ def test_validation_helper_v1_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1323,9 +1325,7 @@ def test_validation_helper_v1_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1beta1/test_binauthz_management_service_v1_beta1.py b/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1beta1/test_binauthz_management_service_v1_beta1.py index bda0355b49e8..35a39f316995 100644 --- a/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1beta1/test_binauthz_management_service_v1_beta1.py +++ b/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1beta1/test_binauthz_management_service_v1_beta1.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.binaryauthorization_v1beta1.services.binauthz_management_service_v1_beta1 import ( BinauthzManagementServiceV1Beta1AsyncClient, @@ -1063,10 +1068,9 @@ def test_binauthz_management_service_v1_beta1_client_get_mtls_endpoint_and_cert_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1111,10 +1115,9 @@ def test_binauthz_management_service_v1_beta1_client_get_mtls_endpoint_and_cert_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1150,10 +1153,9 @@ def test_binauthz_management_service_v1_beta1_client_get_mtls_endpoint_and_cert_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1421,9 +1423,7 @@ def test_binauthz_management_service_v1_beta1_client_create_channel_credentials_ google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1beta1/test_system_policy_v1_beta1.py b/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1beta1/test_system_policy_v1_beta1.py index d4813791a876..684864ca6b4d 100644 --- a/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1beta1/test_system_policy_v1_beta1.py +++ b/packages/google-cloud-binary-authorization/tests/unit/gapic/binaryauthorization_v1beta1/test_system_policy_v1_beta1.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.binaryauthorization_v1beta1.services.system_policy_v1_beta1 import ( SystemPolicyV1Beta1AsyncClient, @@ -992,10 +997,9 @@ def test_system_policy_v1_beta1_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1040,10 +1044,9 @@ def test_system_policy_v1_beta1_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1079,10 +1082,9 @@ def test_system_policy_v1_beta1_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1342,9 +1344,7 @@ def test_system_policy_v1_beta1_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1462,9 +1462,9 @@ def test_get_system_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_system_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_system_policy] = ( + mock_rpc + ) request = {} client.get_system_policy(request) @@ -1736,9 +1736,9 @@ def test_get_system_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_system_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_system_policy] = ( + mock_rpc + ) request = {} client.get_system_policy(request) diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/__init__.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/__init__.py index 941d82419843..7ecfef9b20ad 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/__init__.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_build import CloudBuildAsyncClient, CloudBuildClient from .types.cloudbuild import ( ApprovalConfig, diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/async_client.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/async_client.py index b53eeeb4e6b9..1a0d6ff0fe68 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/async_client.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devtools.cloudbuild_v1 import gapic_version as package_version @@ -162,7 +162,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudBuildAsyncClient: The constructed client. """ - return CloudBuildClient.from_service_account_info.__func__(CloudBuildAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudBuildClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CloudBuildAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -178,7 +181,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudBuildAsyncClient: The constructed client. """ - return CloudBuildClient.from_service_account_file.__func__(CloudBuildAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudBuildClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CloudBuildAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/client.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/client.py index a34b8524a969..e63bf42f31ff 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/client.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devtools.cloudbuild_v1 import gapic_version as package_version @@ -899,11 +899,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudBuildClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudBuildClient._read_environment_variables() + ) self._client_cert_source = CloudBuildClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -938,8 +936,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudBuildTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/pagers.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/pagers.py index 2f75d66d0763..e1f8e417a8f9 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/pagers.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/base.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/base.py index a9bb762f82e8..6ebd11b952be 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/base.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.devtools.cloudbuild_v1 import gapic_version as package_version from google.cloud.devtools.cloudbuild_v1.types import cloudbuild diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc.py index 03d04ae6a137..648778a654cb 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.devtools.cloudbuild_v1.types import cloudbuild @@ -894,12 +894,12 @@ def get_default_service_account( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_default_service_account" not in self._stubs: - self._stubs[ - "get_default_service_account" - ] = self._logged_channel.unary_unary( - "/google.devtools.cloudbuild.v1.CloudBuild/GetDefaultServiceAccount", - request_serializer=cloudbuild.GetDefaultServiceAccountRequest.serialize, - response_deserializer=cloudbuild.DefaultServiceAccount.deserialize, + self._stubs["get_default_service_account"] = ( + self._logged_channel.unary_unary( + "/google.devtools.cloudbuild.v1.CloudBuild/GetDefaultServiceAccount", + request_serializer=cloudbuild.GetDefaultServiceAccountRequest.serialize, + response_deserializer=cloudbuild.DefaultServiceAccount.deserialize, + ) ) return self._stubs["get_default_service_account"] diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc_asyncio.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc_asyncio.py index e624d08b7945..58fe81736430 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc_asyncio.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.devtools.cloudbuild_v1.types import cloudbuild @@ -925,12 +925,12 @@ def get_default_service_account( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_default_service_account" not in self._stubs: - self._stubs[ - "get_default_service_account" - ] = self._logged_channel.unary_unary( - "/google.devtools.cloudbuild.v1.CloudBuild/GetDefaultServiceAccount", - request_serializer=cloudbuild.GetDefaultServiceAccountRequest.serialize, - response_deserializer=cloudbuild.DefaultServiceAccount.deserialize, + self._stubs["get_default_service_account"] = ( + self._logged_channel.unary_unary( + "/google.devtools.cloudbuild.v1.CloudBuild/GetDefaultServiceAccount", + request_serializer=cloudbuild.GetDefaultServiceAccountRequest.serialize, + response_deserializer=cloudbuild.DefaultServiceAccount.deserialize, + ) ) return self._stubs["get_default_service_account"] diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest.py index b52c1dea7b0c..a1ca48576788 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.devtools.cloudbuild_v1.types import cloudbuild @@ -2673,9 +2673,7 @@ def __call__( The default service account used for ``Builds``. """ - http_options = ( - _BaseCloudBuildRestTransport._BaseGetDefaultServiceAccount._get_http_options() - ) + http_options = _BaseCloudBuildRestTransport._BaseGetDefaultServiceAccount._get_http_options() request, metadata = self._interceptor.pre_get_default_service_account( request, metadata @@ -3431,9 +3429,7 @@ def __call__( """ - http_options = ( - _BaseCloudBuildRestTransport._BaseReceiveTriggerWebhook._get_http_options() - ) + http_options = _BaseCloudBuildRestTransport._BaseReceiveTriggerWebhook._get_http_options() request, metadata = self._interceptor.pre_receive_trigger_webhook( request, metadata @@ -4223,7 +4219,9 @@ def get_default_service_account( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetDefaultServiceAccount(self._session, self._host, self._interceptor) # type: ignore + return self._GetDefaultServiceAccount( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_worker_pool( diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest_base.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest_base.py index b818903b7ac5..0cfbacb7a5ce 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest_base.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.devtools.cloudbuild_v1.types import cloudbuild diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/types/cloudbuild.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/types/cloudbuild.py index 0a7d8780248f..d0f9b184f560 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/types/cloudbuild.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/types/cloudbuild.py @@ -249,6 +249,7 @@ class SourceFetcher(proto.Enum): Use the Cloud Storage Fetcher tool to download the source file. """ + SOURCE_FETCHER_UNSPECIFIED = 0 GSUTIL = 1 GCS_FETCHER = 2 @@ -1265,6 +1266,7 @@ class Status(proto.Enum): Build was enqueued for longer than the value of ``queue_ttl``. """ + STATUS_UNKNOWN = 0 PENDING = 10 QUEUED = 1 @@ -1303,6 +1305,7 @@ class Priority(proto.Enum): e.g. alerts that a feature used in the build is pending removal """ + PRIORITY_UNSPECIFIED = 0 INFO = 1 WARNING = 2 @@ -1350,6 +1353,7 @@ class FailureType(proto.Enum): FETCH_SOURCE_FAILED (6): The source fetching has failed. """ + FAILURE_TYPE_UNSPECIFIED = 0 PUSH_FAILED = 1 PUSH_IMAGE_NOT_FOUND = 2 @@ -2126,6 +2130,7 @@ class HashType(proto.Enum): SHA512 (4): Use a sha512 hash. """ + NONE = 0 SHA256 = 1 MD5 = 2 @@ -2466,6 +2471,7 @@ class State(proto.Enum): Build was cancelled while it was still pending approval. """ + STATE_UNSPECIFIED = 0 PENDING = 1 APPROVED = 2 @@ -2546,6 +2552,7 @@ class Decision(proto.Enum): REJECTED (2): Build is rejected. """ + DECISION_UNSPECIFIED = 0 APPROVED = 1 REJECTED = 2 @@ -2697,6 +2704,7 @@ class RepoType(proto.Enum): GITLAB (4): A GitLab-hosted repo. """ + UNKNOWN = 0 CLOUD_SOURCE_REPOSITORIES = 1 GITHUB = 2 @@ -3018,6 +3026,7 @@ class RepositoryType(proto.Enum): GITLAB_ENTERPRISE (3): The SCM repo is GITLAB Enterprise. """ + REPOSITORY_TYPE_UNSPECIFIED = 0 GITHUB = 1 GITHUB_ENTERPRISE = 2 @@ -3148,6 +3157,7 @@ class State(proto.Enum): Some of the subscription's field are misconfigured. """ + STATE_UNSPECIFIED = 0 OK = 1 SUBSCRIPTION_DELETED = 2 @@ -3206,6 +3216,7 @@ class State(proto.Enum): SECRET_DELETED (2): The secret provided in auth_method has been deleted. """ + STATE_UNSPECIFIED = 0 OK = 1 SECRET_DELETED = 2 @@ -3286,6 +3297,7 @@ class CommentControl(proto.Enum): with write permissions or above must comment ``/gcbrun`` in order to fire a build. """ + COMMENTS_DISABLED = 0 COMMENTS_ENABLED = 1 COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY = 2 @@ -3650,6 +3662,7 @@ class VerifyOption(proto.Enum): VERIFIED (1): Build must be verified. """ + NOT_VERIFIED = 0 VERIFIED = 1 @@ -3672,6 +3685,7 @@ class MachineType(proto.Enum): E2_MEDIUM (7): E2 machine with 1 CPU. """ + UNSPECIFIED = 0 N1_HIGHCPU_8 = 1 N1_HIGHCPU_32 = 2 @@ -3692,6 +3706,7 @@ class SubstitutionOption(proto.Enum): Do not fail the build if error in substitutions checks. """ + MUST_MATCH = 0 ALLOW_LOOSE = 1 @@ -3711,6 +3726,7 @@ class LogStreamingOption(proto.Enum): Storage; they will be written when the build is completed. """ + STREAM_DEFAULT = 0 STREAM_ON = 1 STREAM_OFF = 2 @@ -3738,6 +3754,7 @@ class LoggingMode(proto.Enum): Turn off all logging. No build logs will be captured. """ + LOGGING_UNSPECIFIED = 0 LEGACY = 1 GCS_ONLY = 2 @@ -3761,6 +3778,7 @@ class DefaultLogsBucketBehavior(proto.Enum): Bucket is located in a Google-owned project and is not regionalized. """ + DEFAULT_LOGS_BUCKET_BEHAVIOR_UNSPECIFIED = 0 REGIONAL_USER_OWNED_BUCKET = 1 LEGACY_BUCKET = 2 @@ -4110,6 +4128,7 @@ class State(proto.Enum): UPDATING (5): ``WorkerPool`` is being updated; new builds cannot be run. """ + STATE_UNSPECIFIED = 0 CREATING = 1 RUNNING = 2 @@ -4263,6 +4282,7 @@ class EgressOption(proto.Enum): If set, workers are created with a public address which allows for public internet egress. """ + EGRESS_OPTION_UNSPECIFIED = 0 NO_PUBLIC_EGRESS = 1 PUBLIC_EGRESS = 2 diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/__init__.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/__init__.py index 91989338b72a..17eb7b29fd55 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/__init__.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.repository_manager import ( RepositoryManagerAsyncClient, RepositoryManagerClient, diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/async_client.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/async_client.py index a2a31505e2fd..6ab90aaf5fca 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/async_client.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devtools.cloudbuild_v2 import gapic_version as package_version @@ -46,13 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.devtools.cloudbuild_v2.services.repository_manager import pagers from google.cloud.devtools.cloudbuild_v2.types import cloudbuild, repositories @@ -131,7 +133,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RepositoryManagerAsyncClient: The constructed client. """ - return RepositoryManagerClient.from_service_account_info.__func__(RepositoryManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + RepositoryManagerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(RepositoryManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +152,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RepositoryManagerAsyncClient: The constructed client. """ - return RepositoryManagerClient.from_service_account_file.__func__(RepositoryManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + RepositoryManagerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(RepositoryManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/client.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/client.py index 18f5e6348ac2..538d48914f68 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/client.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devtools.cloudbuild_v2 import gapic_version as package_version @@ -63,13 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.devtools.cloudbuild_v2.services.repository_manager import pagers from google.cloud.devtools.cloudbuild_v2.types import cloudbuild, repositories @@ -88,9 +90,7 @@ class RepositoryManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RepositoryManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RepositoryManagerTransport]] _transport_registry["grpc"] = RepositoryManagerGrpcTransport _transport_registry["grpc_asyncio"] = RepositoryManagerGrpcAsyncIOTransport _transport_registry["rest"] = RepositoryManagerRestTransport @@ -706,11 +706,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RepositoryManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RepositoryManagerClient._read_environment_variables() + ) self._client_cert_source = RepositoryManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -745,8 +743,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RepositoryManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/pagers.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/pagers.py index b95005eabb3d..73b2be46805d 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/pagers.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -457,7 +457,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/base.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/base.py index 50880e188dbd..4114f7afbadc 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/base.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devtools.cloudbuild_v2 import gapic_version as package_version from google.cloud.devtools.cloudbuild_v2.types import repositories @@ -470,7 +472,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc.py index d4086a17bd9d..baf585f843f8 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.devtools.cloudbuild_v2.types import repositories @@ -689,12 +691,12 @@ def fetch_linkable_repositories( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_linkable_repositories" not in self._stubs: - self._stubs[ - "fetch_linkable_repositories" - ] = self._logged_channel.unary_unary( - "/google.devtools.cloudbuild.v2.RepositoryManager/FetchLinkableRepositories", - request_serializer=repositories.FetchLinkableRepositoriesRequest.serialize, - response_deserializer=repositories.FetchLinkableRepositoriesResponse.deserialize, + self._stubs["fetch_linkable_repositories"] = ( + self._logged_channel.unary_unary( + "/google.devtools.cloudbuild.v2.RepositoryManager/FetchLinkableRepositories", + request_serializer=repositories.FetchLinkableRepositoriesRequest.serialize, + response_deserializer=repositories.FetchLinkableRepositoriesResponse.deserialize, + ) ) return self._stubs["fetch_linkable_repositories"] diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc_asyncio.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc_asyncio.py index db0c4a57245f..b3ad07d22445 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.devtools.cloudbuild_v2.types import repositories @@ -715,12 +717,12 @@ def fetch_linkable_repositories( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_linkable_repositories" not in self._stubs: - self._stubs[ - "fetch_linkable_repositories" - ] = self._logged_channel.unary_unary( - "/google.devtools.cloudbuild.v2.RepositoryManager/FetchLinkableRepositories", - request_serializer=repositories.FetchLinkableRepositoriesRequest.serialize, - response_deserializer=repositories.FetchLinkableRepositoriesResponse.deserialize, + self._stubs["fetch_linkable_repositories"] = ( + self._logged_channel.unary_unary( + "/google.devtools.cloudbuild.v2.RepositoryManager/FetchLinkableRepositories", + request_serializer=repositories.FetchLinkableRepositoriesRequest.serialize, + response_deserializer=repositories.FetchLinkableRepositoriesResponse.deserialize, + ) ) return self._stubs["fetch_linkable_repositories"] diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest.py index 1d5887e37b18..2e076e1638d4 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1192,9 +1194,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseBatchCreateRepositories._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseBatchCreateRepositories._get_http_options() request, metadata = self._interceptor.pre_batch_create_repositories( request, metadata @@ -1348,9 +1348,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseCreateConnection._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseCreateConnection._get_http_options() request, metadata = self._interceptor.pre_create_connection( request, metadata @@ -1502,9 +1500,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseCreateRepository._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseCreateRepository._get_http_options() request, metadata = self._interceptor.pre_create_repository( request, metadata @@ -1655,9 +1651,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseDeleteConnection._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseDeleteConnection._get_http_options() request, metadata = self._interceptor.pre_delete_connection( request, metadata @@ -1803,9 +1797,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseDeleteRepository._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseDeleteRepository._get_http_options() request, metadata = self._interceptor.pre_delete_repository( request, metadata @@ -1947,9 +1939,7 @@ def __call__( Response for fetching git refs """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseFetchGitRefs._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseFetchGitRefs._get_http_options() request, metadata = self._interceptor.pre_fetch_git_refs(request, metadata) transcoded_request = _BaseRepositoryManagerRestTransport._BaseFetchGitRefs._get_transcoded_request( @@ -2098,9 +2088,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseFetchLinkableRepositories._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseFetchLinkableRepositories._get_http_options() request, metadata = self._interceptor.pre_fetch_linkable_repositories( request, metadata @@ -2252,9 +2240,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseFetchReadToken._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseFetchReadToken._get_http_options() request, metadata = self._interceptor.pre_fetch_read_token( request, metadata @@ -2410,9 +2396,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseFetchReadWriteToken._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseFetchReadWriteToken._get_http_options() request, metadata = self._interceptor.pre_fetch_read_write_token( request, metadata @@ -2570,9 +2554,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseGetConnection._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseGetConnection._get_http_options() request, metadata = self._interceptor.pre_get_connection(request, metadata) transcoded_request = _BaseRepositoryManagerRestTransport._BaseGetConnection._get_transcoded_request( @@ -2718,9 +2700,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseGetRepository._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseGetRepository._get_http_options() request, metadata = self._interceptor.pre_get_repository(request, metadata) transcoded_request = _BaseRepositoryManagerRestTransport._BaseGetRepository._get_transcoded_request( @@ -2866,9 +2846,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseListConnections._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseListConnections._get_http_options() request, metadata = self._interceptor.pre_list_connections( request, metadata @@ -3018,9 +2996,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseListRepositories._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseListRepositories._get_http_options() request, metadata = self._interceptor.pre_list_repositories( request, metadata @@ -3171,9 +3147,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseUpdateConnection._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseUpdateConnection._get_http_options() request, metadata = self._interceptor.pre_update_connection( request, metadata @@ -3274,7 +3248,9 @@ def batch_create_repositories( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchCreateRepositories(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateRepositories( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_connection( @@ -3327,7 +3303,9 @@ def fetch_linkable_repositories( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchLinkableRepositories(self._session, self._host, self._interceptor) # type: ignore + return self._FetchLinkableRepositories( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_read_token( @@ -3451,9 +3429,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRepositoryManagerRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -3592,9 +3568,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRepositoryManagerRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -3739,9 +3713,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -3885,9 +3857,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -4007,9 +3977,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseRepositoryManagerRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest_base.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest_base.py index d57d488a556a..533cad4f1835 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest_base.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/__init__.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/__init__.py index b9a329fffb45..3dfb3f8988c4 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/__init__.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .cloudbuild import OperationMetadata, RunWorkflowCustomOperationMetadata +from .cloudbuild import ( + OperationMetadata, + RunWorkflowCustomOperationMetadata, +) from .repositories import ( BatchCreateRepositoriesRequest, BatchCreateRepositoriesResponse, diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/repositories.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/repositories.py index 088b1e950c6c..ccfd05c8e15f 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/repositories.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/repositories.py @@ -236,6 +236,7 @@ class Stage(proto.Enum): COMPLETE (10): Installation process has been completed. """ + STAGE_UNSPECIFIED = 0 PENDING_CREATE_APP = 1 PENDING_USER_OAUTH = 2 @@ -1206,6 +1207,7 @@ class RefType(proto.Enum): BRANCH (2): To fetch branches. """ + REF_TYPE_UNSPECIFIED = 0 TAG = 1 BRANCH = 2 diff --git a/packages/google-cloud-build/mypy.ini b/packages/google-cloud-build/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-build/mypy.ini +++ b/packages/google-cloud-build/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-build/noxfile.py b/packages/google-cloud-build/noxfile.py index 713a0e3df06b..b31ac81e78cf 100644 --- a/packages/google-cloud-build/noxfile.py +++ b/packages/google-cloud-build/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v1/test_cloud_build.py b/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v1/test_cloud_build.py index d19184a009ec..535276fb42dd 100644 --- a/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v1/test_cloud_build.py +++ b/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v1/test_cloud_build.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,15 @@ HAS_GOOGLE_AUTH_AIO = False import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,20 +61,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.cloud.devtools.cloudbuild_v1.services.cloud_build import ( CloudBuildAsyncClient, @@ -934,10 +934,9 @@ def test_cloud_build_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -982,10 +981,9 @@ def test_cloud_build_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1021,10 +1019,9 @@ def test_cloud_build_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1257,9 +1254,7 @@ def test_cloud_build_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3370,9 +3365,9 @@ def test_create_build_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_build_trigger] = ( + mock_rpc + ) request = {} client.create_build_trigger(request) @@ -3705,9 +3700,9 @@ def test_get_build_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_build_trigger] = ( + mock_rpc + ) request = {} client.get_build_trigger(request) @@ -4023,9 +4018,9 @@ def test_list_build_triggers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_build_triggers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_build_triggers] = ( + mock_rpc + ) request = {} client.list_build_triggers(request) @@ -4499,9 +4494,9 @@ def test_delete_build_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_build_trigger] = ( + mock_rpc + ) request = {} client.delete_build_trigger(request) @@ -4809,9 +4804,9 @@ def test_update_build_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_build_trigger] = ( + mock_rpc + ) request = {} client.update_build_trigger(request) @@ -5122,9 +5117,9 @@ def test_run_build_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_build_trigger] = ( + mock_rpc + ) request = {} client.run_build_trigger(request) @@ -5683,9 +5678,9 @@ def test_create_worker_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_worker_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_worker_pool] = ( + mock_rpc + ) request = {} client.create_worker_pool(request) @@ -6263,9 +6258,9 @@ def test_delete_worker_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_worker_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_worker_pool] = ( + mock_rpc + ) request = {} client.delete_worker_pool(request) @@ -6539,9 +6534,9 @@ def test_update_worker_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_worker_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_worker_pool] = ( + mock_rpc + ) request = {} client.update_worker_pool(request) @@ -6832,9 +6827,9 @@ def test_list_worker_pools_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_worker_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_worker_pools] = ( + mock_rpc + ) request = {} client.list_worker_pools(request) @@ -8722,9 +8717,9 @@ def test_create_build_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_build_trigger] = ( + mock_rpc + ) request = {} client.create_build_trigger(request) @@ -8915,9 +8910,9 @@ def test_get_build_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_build_trigger] = ( + mock_rpc + ) request = {} client.get_build_trigger(request) @@ -9115,9 +9110,9 @@ def test_list_build_triggers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_build_triggers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_build_triggers] = ( + mock_rpc + ) request = {} client.list_build_triggers(request) @@ -9375,9 +9370,9 @@ def test_delete_build_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_build_trigger] = ( + mock_rpc + ) request = {} client.delete_build_trigger(request) @@ -9570,9 +9565,9 @@ def test_update_build_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_build_trigger] = ( + mock_rpc + ) request = {} client.update_build_trigger(request) @@ -9770,9 +9765,9 @@ def test_run_build_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_build_trigger] = ( + mock_rpc + ) request = {} client.run_build_trigger(request) @@ -10011,9 +10006,9 @@ def test_create_worker_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_worker_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_worker_pool] = ( + mock_rpc + ) request = {} client.create_worker_pool(request) @@ -10411,9 +10406,9 @@ def test_delete_worker_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_worker_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_worker_pool] = ( + mock_rpc + ) request = {} client.delete_worker_pool(request) @@ -10611,9 +10606,9 @@ def test_update_worker_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_worker_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_worker_pool] = ( + mock_rpc + ) request = {} client.update_worker_pool(request) @@ -10807,9 +10802,9 @@ def test_list_worker_pools_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_worker_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_worker_pools] = ( + mock_rpc + ) request = {} client.list_worker_pools(request) diff --git a/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v2/test_repository_manager.py b/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v2/test_repository_manager.py index 3d05bd75e63c..a8f11e4703ff 100644 --- a/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v2/test_repository_manager.py +++ b/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v2/test_repository_manager.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.devtools.cloudbuild_v2.services.repository_manager import ( RepositoryManagerAsyncClient, @@ -995,10 +997,9 @@ def test_repository_manager_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1044,9 @@ def test_repository_manager_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1082,9 @@ def test_repository_manager_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1337,9 +1336,7 @@ def test_repository_manager_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1449,9 +1446,9 @@ def test_create_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -2148,9 +2145,9 @@ def test_list_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -2668,9 +2665,9 @@ def test_update_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) @@ -3023,9 +3020,9 @@ def test_delete_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -3368,9 +3365,9 @@ def test_create_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -4430,9 +4427,9 @@ def test_list_repositories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -4970,9 +4967,9 @@ def test_delete_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -5319,9 +5316,9 @@ def test_fetch_read_write_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_write_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_write_token] = ( + mock_rpc + ) request = {} client.fetch_read_write_token(request) @@ -5655,9 +5652,9 @@ def test_fetch_read_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_token] = ( + mock_rpc + ) request = {} client.fetch_read_token(request) @@ -6702,9 +6699,9 @@ def test_create_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -7090,9 +7087,9 @@ def test_list_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -7348,9 +7345,9 @@ def test_update_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) @@ -7546,9 +7543,9 @@ def test_delete_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -7742,9 +7739,9 @@ def test_create_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -8327,9 +8324,9 @@ def test_list_repositories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -8591,9 +8588,9 @@ def test_delete_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -8790,9 +8787,9 @@ def test_fetch_read_write_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_write_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_write_token] = ( + mock_rpc + ) request = {} client.fetch_read_write_token(request) @@ -8973,9 +8970,9 @@ def test_fetch_read_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_token] = ( + mock_rpc + ) request = {} client.fetch_read_token(request) diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/__init__.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/__init__.py index 244a07238ba0..2ffce14f2317 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/__init__.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.usage_service import UsageServiceAsyncClient, UsageServiceClient from .types.allocation import Allocation from .types.future_reservation import FutureReservation diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/async_client.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/async_client.py index 2e71424e2e33..7e430312b3b5 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/async_client.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.capacityplanner_v1beta import gapic_version as package_version @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: UsageServiceAsyncClient: The constructed client. """ - return UsageServiceClient.from_service_account_info.__func__(UsageServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + UsageServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(UsageServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: UsageServiceAsyncClient: The constructed client. """ - return UsageServiceClient.from_service_account_file.__func__(UsageServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + UsageServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(UsageServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/client.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/client.py index 461d3cc21747..4ad7654c8aa3 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/client.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.capacityplanner_v1beta import gapic_version as package_version @@ -644,11 +644,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UsageServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UsageServiceClient._read_environment_variables() + ) self._client_cert_source = UsageServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -683,8 +681,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UsageServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/base.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/base.py index 9da401542175..e3c59e99d1df 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/base.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.capacityplanner_v1beta import gapic_version as package_version from google.cloud.capacityplanner_v1beta.types import usage_service diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc.py index 19564ed80eee..adc97d8fc873 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.capacityplanner_v1beta.types import usage_service diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc_asyncio.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc_asyncio.py index b96df6b75b1e..f169d043227e 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.capacityplanner_v1beta.types import usage_service diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/rest.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/rest.py index 75dbd2eb2c3b..d7217f802f55 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/rest.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -753,9 +753,7 @@ def __call__( """ - http_options = ( - _BaseUsageServiceRestTransport._BaseExportReservationsUsage._get_http_options() - ) + http_options = _BaseUsageServiceRestTransport._BaseExportReservationsUsage._get_http_options() request, metadata = self._interceptor.pre_export_reservations_usage( request, metadata @@ -906,9 +904,7 @@ def __call__( """ - http_options = ( - _BaseUsageServiceRestTransport._BaseExportUsageHistories._get_http_options() - ) + http_options = _BaseUsageServiceRestTransport._BaseExportUsageHistories._get_http_options() request, metadata = self._interceptor.pre_export_usage_histories( request, metadata @@ -1207,9 +1203,7 @@ def __call__( The ``QueryReservations`` response. """ - http_options = ( - _BaseUsageServiceRestTransport._BaseQueryReservations._get_http_options() - ) + http_options = _BaseUsageServiceRestTransport._BaseQueryReservations._get_http_options() request, metadata = self._interceptor.pre_query_reservations( request, metadata @@ -1356,9 +1350,7 @@ def __call__( The ``QueryUsageHistories`` response. """ - http_options = ( - _BaseUsageServiceRestTransport._BaseQueryUsageHistories._get_http_options() - ) + http_options = _BaseUsageServiceRestTransport._BaseQueryUsageHistories._get_http_options() request, metadata = self._interceptor.pre_query_usage_histories( request, metadata @@ -1471,7 +1463,9 @@ def export_reservations_usage( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ExportReservationsUsage(self._session, self._host, self._interceptor) # type: ignore + return self._ExportReservationsUsage( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_usage_histories( diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/__init__.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/__init__.py index 1d75a7a9d3d1..c3c457e9b497 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/__init__.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/__init__.py @@ -13,9 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .allocation import Allocation -from .future_reservation import FutureReservation -from .location import LocationIdentifier, LocationLevel +from .allocation import ( + Allocation, +) +from .future_reservation import ( + FutureReservation, +) +from .location import ( + LocationIdentifier, + LocationLevel, +) from .resource import ( ResourceAttribute, ResourceContainer, diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/allocation.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/allocation.py index cdc74159af95..85a6811dc5c4 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/allocation.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/allocation.py @@ -82,6 +82,7 @@ class Status(proto.Enum): UPDATING (5): Reservation is currently being resized. """ + STATUS_UNSPECIFIED = 0 INVALID = 1 CREATING = 2 @@ -176,6 +177,7 @@ class DiskInterface(proto.Enum): ISCSI (4): ISCSI disk interface. """ + DISK_INTERFACE_UNSPECIFIED = 0 SCSI = 1 NVME = 2 @@ -264,6 +266,7 @@ class ShareType(proto.Enum): Shared-reservation is open to direct child projects of specific folders. """ + SHARE_TYPE_UNSPECIFIED = 0 ORGANIZATION = 1 SPECIFIC_PROJECTS = 2 diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/future_reservation.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/future_reservation.py index df489d882790..126955e11e04 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/future_reservation.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/future_reservation.py @@ -204,6 +204,7 @@ class ProcurementStatus(proto.Enum): the Future Reservation will be restored to the last known good state. """ + PROCUREMENT_STATUS_UNSPECIFIED = 0 PENDING_APPROVAL = 1 APPROVED = 2 diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/location.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/location.py index 971b3c6ef48c..a2ebf28601e5 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/location.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/location.py @@ -47,6 +47,7 @@ class LocationLevel(proto.Enum): MULTI_REGION (6): Multiple regions. """ + LOCATION_LEVEL_UNSPECIFIED = 0 REGION = 1 ZONE = 2 diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/resource.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/resource.py index 81253f285db6..d680e66c6fd1 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/resource.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/resource.py @@ -76,6 +76,7 @@ class Unit(proto.Enum): KOPS (18): No description available. """ + UNIT_UNSPECIFIED = 0 UNIT_COUNT = 1 KB = 2 @@ -123,6 +124,7 @@ class Type(proto.Enum): ORG (3): No description available. """ + TYPE_UNSPECIFIED = 0 PROJECT = 1 FOLDER = 2 diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/usage_service.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/usage_service.py index eaf442b9bea9..921b8511accb 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/usage_service.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/usage_service.py @@ -388,6 +388,7 @@ class ReservationType(proto.Enum): RESERVATION_TYPE_ALL (3): All reservations. """ + RESERVATION_TYPE_UNSPECIFIED = 0 RESERVATION_TYPE_ALLOCATION = 1 RESERVATION_TYPE_FUTURE_RESERVATION = 2 @@ -406,6 +407,7 @@ class ShareType(proto.Enum): Shared-reservation is open to specific projects. """ + SHARE_TYPE_UNSPECIFIED = 0 SHARE_TYPE_LOCAL = 1 SHARE_TYPE_SPECIFIC_PROJECTS = 2 @@ -427,6 +429,7 @@ class OwnershipType(proto.Enum): Container (project/folder/organization), but not owned by them. """ + OWNERSHIP_TYPE_UNSPECIFIED = 0 OWNERSHIP_TYPE_OWNED = 1 OWNERSHIP_TYPE_SHARED_BY_OTHERS = 2 @@ -448,6 +451,7 @@ class ReservationDataLevel(proto.Enum): limited fields which are useful for Capacity Planning. """ + RESERVATION_DATA_LEVEL_UNSPECIFIED = 0 RESERVATION_DATA_LEVEL_AGGREGATED = 1 RESERVATION_DATA_LEVEL_PER_RESERVATION = 2 @@ -604,6 +608,7 @@ class ForecastType(proto.Enum): Yearly Seasonality model provides generic seasonality beyond BFCM. """ + FORECAST_TYPE_UNSPECIFIED = 0 STATISTICAL = 1 STATISTICAL_WITH_BFCM = 2 @@ -625,6 +630,7 @@ class Bounds(proto.Enum): The time series represents the lower bound of the forecast. """ + BOUNDS_UNSPECIFIED = 0 LOWER_BOUND = 1 MEDIAN = 2 @@ -649,6 +655,7 @@ class PredictionInterval(proto.Enum): ``PREDICTION_INTERVAL_50`` means that the ``UPPER_BOUND`` will represent the 75th precentile. """ + PREDICTION_INTERVAL_UNSPECIFIED = 0 PREDICTION_INTERVAL_90 = 1 PREDICTION_INTERVAL_50 = 2 @@ -718,6 +725,7 @@ class AggregationMethod(proto.Enum): Time series values represent the 99th percentile of the sampled values. """ + AGGREGATION_METHOD_UNSPECIFIED = 0 MEDIAN = 1 PEAK = 2 @@ -794,6 +802,7 @@ class LocationType(proto.Enum): Time series values represent usage aggregated at the zone level. """ + LOCATION_TYPE_UNSPECIFIED = 0 REGIONAL = 1 ZONAL = 2 @@ -891,12 +900,12 @@ class ReservationData(proto.Message): number=5, message="TimeSeries", ) - future_reservations: MutableSequence[ - future_reservation.FutureReservation - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=future_reservation.FutureReservation, + future_reservations: MutableSequence[future_reservation.FutureReservation] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=future_reservation.FutureReservation, + ) ) allocations: MutableSequence[allocation.Allocation] = proto.RepeatedField( proto.MESSAGE, @@ -1286,6 +1295,7 @@ class ShareType(proto.Enum): Shared-reservation is open to specific projects. """ + SHARE_TYPE_UNSPECIFIED = 0 SHARE_TYPE_LOCAL = 1 SHARE_TYPE_SPECIFIC_PROJECTS = 2 @@ -1471,6 +1481,7 @@ class PartitionKey(proto.Enum): additional timestamp column representing when the request was received. """ + PARTITION_KEY_UNSPECIFIED = 0 REQUEST_TIME = 1 @@ -1494,6 +1505,7 @@ class WriteDisposition(proto.Enum): If the table already exists and contains data, an error is returned. """ + WRITE_DISPOSITION_UNSPECIFIED = 0 WRITE_APPEND = 1 WRITE_TRUNCATE = 2 @@ -1513,6 +1525,7 @@ class CreateDisposition(proto.Enum): If the table does not exist, an error will be returned. """ + CREATE_DISPOSITION_UNSPECIFIED = 0 CREATE_IF_NEEDED = 1 CREATE_NEVER = 2 diff --git a/packages/google-cloud-capacityplanner/mypy.ini b/packages/google-cloud-capacityplanner/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-capacityplanner/mypy.ini +++ b/packages/google-cloud-capacityplanner/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-capacityplanner/noxfile.py b/packages/google-cloud-capacityplanner/noxfile.py index c581eeab4ef0..5dac790843a0 100644 --- a/packages/google-cloud-capacityplanner/noxfile.py +++ b/packages/google-cloud-capacityplanner/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-capacityplanner/tests/unit/gapic/capacityplanner_v1beta/test_usage_service.py b/packages/google-cloud-capacityplanner/tests/unit/gapic/capacityplanner_v1beta/test_usage_service.py index 29766521f6db..631aecdde582 100644 --- a/packages/google-cloud-capacityplanner/tests/unit/gapic/capacityplanner_v1beta/test_usage_service.py +++ b/packages/google-cloud-capacityplanner/tests/unit/gapic/capacityplanner_v1beta/test_usage_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,16 +56,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.capacityplanner_v1beta.services.usage_service import ( UsageServiceAsyncClient, @@ -936,10 +936,9 @@ def test_usage_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +983,9 @@ def test_usage_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1021,9 @@ def test_usage_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1269,9 +1266,7 @@ def test_usage_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1395,9 +1390,9 @@ def test_query_usage_histories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_usage_histories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_usage_histories] = ( + mock_rpc + ) request = {} client.query_usage_histories(request) @@ -1896,9 +1891,9 @@ def test_query_reservations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_reservations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_reservations] = ( + mock_rpc + ) request = {} client.query_reservations(request) @@ -2242,9 +2237,9 @@ def test_export_usage_histories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_usage_histories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_usage_histories] = ( + mock_rpc + ) request = {} client.export_usage_histories(request) @@ -2506,9 +2501,9 @@ def test_export_forecasts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_forecasts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_forecasts] = ( + mock_rpc + ) request = {} client.export_forecasts(request) @@ -2962,9 +2957,9 @@ def test_query_usage_histories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_usage_histories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_usage_histories] = ( + mock_rpc + ) request = {} client.query_usage_histories(request) @@ -3232,9 +3227,9 @@ def test_query_reservations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_reservations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_reservations] = ( + mock_rpc + ) request = {} client.query_reservations(request) @@ -3472,9 +3467,9 @@ def test_export_usage_histories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_usage_histories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_usage_histories] = ( + mock_rpc + ) request = {} client.export_usage_histories(request) @@ -3609,9 +3604,9 @@ def test_export_forecasts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_forecasts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_forecasts] = ( + mock_rpc + ) request = {} client.export_forecasts(request) diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/__init__.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/__init__.py index 073b8f0cf6da..8e89455479cb 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/__init__.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.certificate_manager import ( CertificateManagerAsyncClient, CertificateManagerClient, diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/async_client.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/async_client.py index 9f7c29cf31aa..03d0ed5f9bd2 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/async_client.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.certificate_manager_v1 import gapic_version as package_version @@ -46,21 +46,23 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.certificate_manager_v1.services.certificate_manager import pagers -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config from .client import CertificateManagerClient from .transports.base import DEFAULT_CLIENT_INFO, CertificateManagerTransport @@ -186,7 +188,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CertificateManagerAsyncClient: The constructed client. """ - return CertificateManagerClient.from_service_account_info.__func__(CertificateManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CertificateManagerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CertificateManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -202,7 +207,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CertificateManagerAsyncClient: The constructed client. """ - return CertificateManagerClient.from_service_account_file.__func__(CertificateManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CertificateManagerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CertificateManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -240,7 +248,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CertificateManagerClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CertificateManagerClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CertificateManagerTransport: diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/client.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/client.py index 045879d7a6ad..f2171cb1f8f9 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/client.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.certificate_manager_v1 import gapic_version as package_version @@ -63,21 +63,23 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.certificate_manager_v1.services.certificate_manager import pagers -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config from .transports.base import DEFAULT_CLIENT_INFO, CertificateManagerTransport from .transports.grpc import CertificateManagerGrpcTransport @@ -93,9 +95,7 @@ class CertificateManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CertificateManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CertificateManagerTransport]] _transport_registry["grpc"] = CertificateManagerGrpcTransport _transport_registry["grpc_asyncio"] = CertificateManagerGrpcAsyncIOTransport _transport_registry["rest"] = CertificateManagerRestTransport @@ -803,11 +803,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CertificateManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CertificateManagerClient._read_environment_variables() + ) self._client_cert_source = CertificateManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -842,8 +840,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CertificateManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/pagers.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/pagers.py index a3f314b8f931..09dfcb923687 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/pagers.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -147,7 +147,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -307,7 +307,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -389,7 +389,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -467,7 +467,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -549,7 +549,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -627,7 +627,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -711,7 +711,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -798,7 +798,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -886,7 +886,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -962,7 +962,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/__init__.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/__init__.py index 27a1788e2e7a..3c46675f0143 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/__init__.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import CertificateManagerRestInterceptor, CertificateManagerRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CertificateManagerTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CertificateManagerTransport]] _transport_registry["grpc"] = CertificateManagerGrpcTransport _transport_registry["grpc_asyncio"] = CertificateManagerGrpcAsyncIOTransport _transport_registry["rest"] = CertificateManagerRestTransport diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/base.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/base.py index 2898383e522c..b8eeb0c0d9b6 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/base.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/base.py @@ -17,24 +17,26 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.certificate_manager_v1 import gapic_version as package_version -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -870,13 +872,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc.py index aad5e868a617..6b8a729d24a4 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc.py @@ -16,27 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config from .base import DEFAULT_CLIENT_INFO, CertificateManagerTransport @@ -685,12 +687,12 @@ def list_certificate_map_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_map_entries" not in self._stubs: - self._stubs[ - "list_certificate_map_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateMapEntries", - request_serializer=certificate_manager.ListCertificateMapEntriesRequest.serialize, - response_deserializer=certificate_manager.ListCertificateMapEntriesResponse.deserialize, + self._stubs["list_certificate_map_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateMapEntries", + request_serializer=certificate_manager.ListCertificateMapEntriesRequest.serialize, + response_deserializer=certificate_manager.ListCertificateMapEntriesResponse.deserialize, + ) ) return self._stubs["list_certificate_map_entries"] @@ -745,12 +747,12 @@ def create_certificate_map_entry( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_certificate_map_entry" not in self._stubs: - self._stubs[ - "create_certificate_map_entry" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateMapEntry", - request_serializer=certificate_manager.CreateCertificateMapEntryRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_certificate_map_entry"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateMapEntry", + request_serializer=certificate_manager.CreateCertificateMapEntryRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_certificate_map_entry"] @@ -775,12 +777,12 @@ def update_certificate_map_entry( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_certificate_map_entry" not in self._stubs: - self._stubs[ - "update_certificate_map_entry" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/UpdateCertificateMapEntry", - request_serializer=certificate_manager.UpdateCertificateMapEntryRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_certificate_map_entry"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/UpdateCertificateMapEntry", + request_serializer=certificate_manager.UpdateCertificateMapEntryRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_certificate_map_entry"] @@ -805,12 +807,12 @@ def delete_certificate_map_entry( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_certificate_map_entry" not in self._stubs: - self._stubs[ - "delete_certificate_map_entry" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateMapEntry", - request_serializer=certificate_manager.DeleteCertificateMapEntryRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_certificate_map_entry"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateMapEntry", + request_serializer=certificate_manager.DeleteCertificateMapEntryRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_certificate_map_entry"] @@ -982,12 +984,12 @@ def list_certificate_issuance_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_issuance_configs" not in self._stubs: - self._stubs[ - "list_certificate_issuance_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateIssuanceConfigs", - request_serializer=certificate_issuance_config.ListCertificateIssuanceConfigsRequest.serialize, - response_deserializer=certificate_issuance_config.ListCertificateIssuanceConfigsResponse.deserialize, + self._stubs["list_certificate_issuance_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateIssuanceConfigs", + request_serializer=certificate_issuance_config.ListCertificateIssuanceConfigsRequest.serialize, + response_deserializer=certificate_issuance_config.ListCertificateIssuanceConfigsResponse.deserialize, + ) ) return self._stubs["list_certificate_issuance_configs"] @@ -1014,12 +1016,12 @@ def get_certificate_issuance_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_certificate_issuance_config" not in self._stubs: - self._stubs[ - "get_certificate_issuance_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/GetCertificateIssuanceConfig", - request_serializer=certificate_issuance_config.GetCertificateIssuanceConfigRequest.serialize, - response_deserializer=certificate_issuance_config.CertificateIssuanceConfig.deserialize, + self._stubs["get_certificate_issuance_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/GetCertificateIssuanceConfig", + request_serializer=certificate_issuance_config.GetCertificateIssuanceConfigRequest.serialize, + response_deserializer=certificate_issuance_config.CertificateIssuanceConfig.deserialize, + ) ) return self._stubs["get_certificate_issuance_config"] @@ -1047,12 +1049,12 @@ def create_certificate_issuance_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_certificate_issuance_config" not in self._stubs: - self._stubs[ - "create_certificate_issuance_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateIssuanceConfig", - request_serializer=gcc_certificate_issuance_config.CreateCertificateIssuanceConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_certificate_issuance_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateIssuanceConfig", + request_serializer=gcc_certificate_issuance_config.CreateCertificateIssuanceConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_certificate_issuance_config"] @@ -1079,12 +1081,12 @@ def delete_certificate_issuance_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_certificate_issuance_config" not in self._stubs: - self._stubs[ - "delete_certificate_issuance_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateIssuanceConfig", - request_serializer=certificate_issuance_config.DeleteCertificateIssuanceConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_certificate_issuance_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateIssuanceConfig", + request_serializer=certificate_issuance_config.DeleteCertificateIssuanceConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_certificate_issuance_config"] diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc_asyncio.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc_asyncio.py index a8765269549d..5facfe547702 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,18 +31,17 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config from .base import DEFAULT_CLIENT_INFO, CertificateManagerTransport from .grpc import CertificateManagerGrpcTransport @@ -700,12 +702,12 @@ def list_certificate_map_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_map_entries" not in self._stubs: - self._stubs[ - "list_certificate_map_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateMapEntries", - request_serializer=certificate_manager.ListCertificateMapEntriesRequest.serialize, - response_deserializer=certificate_manager.ListCertificateMapEntriesResponse.deserialize, + self._stubs["list_certificate_map_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateMapEntries", + request_serializer=certificate_manager.ListCertificateMapEntriesRequest.serialize, + response_deserializer=certificate_manager.ListCertificateMapEntriesResponse.deserialize, + ) ) return self._stubs["list_certificate_map_entries"] @@ -761,12 +763,12 @@ def create_certificate_map_entry( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_certificate_map_entry" not in self._stubs: - self._stubs[ - "create_certificate_map_entry" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateMapEntry", - request_serializer=certificate_manager.CreateCertificateMapEntryRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_certificate_map_entry"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateMapEntry", + request_serializer=certificate_manager.CreateCertificateMapEntryRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_certificate_map_entry"] @@ -792,12 +794,12 @@ def update_certificate_map_entry( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_certificate_map_entry" not in self._stubs: - self._stubs[ - "update_certificate_map_entry" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/UpdateCertificateMapEntry", - request_serializer=certificate_manager.UpdateCertificateMapEntryRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_certificate_map_entry"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/UpdateCertificateMapEntry", + request_serializer=certificate_manager.UpdateCertificateMapEntryRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_certificate_map_entry"] @@ -823,12 +825,12 @@ def delete_certificate_map_entry( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_certificate_map_entry" not in self._stubs: - self._stubs[ - "delete_certificate_map_entry" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateMapEntry", - request_serializer=certificate_manager.DeleteCertificateMapEntryRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_certificate_map_entry"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateMapEntry", + request_serializer=certificate_manager.DeleteCertificateMapEntryRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_certificate_map_entry"] @@ -1003,12 +1005,12 @@ def list_certificate_issuance_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_issuance_configs" not in self._stubs: - self._stubs[ - "list_certificate_issuance_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateIssuanceConfigs", - request_serializer=certificate_issuance_config.ListCertificateIssuanceConfigsRequest.serialize, - response_deserializer=certificate_issuance_config.ListCertificateIssuanceConfigsResponse.deserialize, + self._stubs["list_certificate_issuance_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateIssuanceConfigs", + request_serializer=certificate_issuance_config.ListCertificateIssuanceConfigsRequest.serialize, + response_deserializer=certificate_issuance_config.ListCertificateIssuanceConfigsResponse.deserialize, + ) ) return self._stubs["list_certificate_issuance_configs"] @@ -1035,12 +1037,12 @@ def get_certificate_issuance_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_certificate_issuance_config" not in self._stubs: - self._stubs[ - "get_certificate_issuance_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/GetCertificateIssuanceConfig", - request_serializer=certificate_issuance_config.GetCertificateIssuanceConfigRequest.serialize, - response_deserializer=certificate_issuance_config.CertificateIssuanceConfig.deserialize, + self._stubs["get_certificate_issuance_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/GetCertificateIssuanceConfig", + request_serializer=certificate_issuance_config.GetCertificateIssuanceConfigRequest.serialize, + response_deserializer=certificate_issuance_config.CertificateIssuanceConfig.deserialize, + ) ) return self._stubs["get_certificate_issuance_config"] @@ -1068,12 +1070,12 @@ def create_certificate_issuance_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_certificate_issuance_config" not in self._stubs: - self._stubs[ - "create_certificate_issuance_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateIssuanceConfig", - request_serializer=gcc_certificate_issuance_config.CreateCertificateIssuanceConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_certificate_issuance_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateIssuanceConfig", + request_serializer=gcc_certificate_issuance_config.CreateCertificateIssuanceConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_certificate_issuance_config"] @@ -1100,12 +1102,12 @@ def delete_certificate_issuance_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_certificate_issuance_config" not in self._stubs: - self._stubs[ - "delete_certificate_issuance_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateIssuanceConfig", - request_serializer=certificate_issuance_config.DeleteCertificateIssuanceConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_certificate_issuance_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateIssuanceConfig", + request_serializer=certificate_issuance_config.DeleteCertificateIssuanceConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_certificate_issuance_config"] diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest.py index 15a2916ba242..97e0b593a6c1 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest.py @@ -16,27 +16,29 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseCertificateManagerRestTransport @@ -2139,9 +2141,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseCreateCertificate._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseCreateCertificate._get_http_options() request, metadata = self._interceptor.pre_create_certificate( request, metadata @@ -2297,15 +2297,12 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseCreateCertificateIssuanceConfig._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseCreateCertificateIssuanceConfig._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_certificate_issuance_config( - request, metadata + request, metadata = ( + self._interceptor.pre_create_certificate_issuance_config( + request, metadata + ) ) transcoded_request = _BaseCertificateManagerRestTransport._BaseCreateCertificateIssuanceConfig._get_transcoded_request( http_options, request @@ -2369,11 +2366,10 @@ def __call__( resp = self._interceptor.post_create_certificate_issuance_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_certificate_issuance_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_certificate_issuance_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2457,9 +2453,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseCreateCertificateMap._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseCreateCertificateMap._get_http_options() request, metadata = self._interceptor.pre_create_certificate_map( request, metadata @@ -2614,9 +2608,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseCreateCertificateMapEntry._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseCreateCertificateMapEntry._get_http_options() request, metadata = self._interceptor.pre_create_certificate_map_entry( request, metadata @@ -2768,9 +2760,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseCreateDnsAuthorization._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseCreateDnsAuthorization._get_http_options() request, metadata = self._interceptor.pre_create_dns_authorization( request, metadata @@ -2924,9 +2914,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseCreateTrustConfig._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseCreateTrustConfig._get_http_options() request, metadata = self._interceptor.pre_create_trust_config( request, metadata @@ -3077,9 +3065,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseDeleteCertificate._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseDeleteCertificate._get_http_options() request, metadata = self._interceptor.pre_delete_certificate( request, metadata @@ -3229,15 +3215,12 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseDeleteCertificateIssuanceConfig._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseDeleteCertificateIssuanceConfig._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_certificate_issuance_config( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_certificate_issuance_config( + request, metadata + ) ) transcoded_request = _BaseCertificateManagerRestTransport._BaseDeleteCertificateIssuanceConfig._get_transcoded_request( http_options, request @@ -3296,11 +3279,10 @@ def __call__( resp = self._interceptor.post_delete_certificate_issuance_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_certificate_issuance_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_certificate_issuance_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3383,9 +3365,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseDeleteCertificateMap._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseDeleteCertificateMap._get_http_options() request, metadata = self._interceptor.pre_delete_certificate_map( request, metadata @@ -3534,9 +3514,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseDeleteCertificateMapEntry._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseDeleteCertificateMapEntry._get_http_options() request, metadata = self._interceptor.pre_delete_certificate_map_entry( request, metadata @@ -3682,9 +3660,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseDeleteDnsAuthorization._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseDeleteDnsAuthorization._get_http_options() request, metadata = self._interceptor.pre_delete_dns_authorization( request, metadata @@ -3832,9 +3808,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseDeleteTrustConfig._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseDeleteTrustConfig._get_http_options() request, metadata = self._interceptor.pre_delete_trust_config( request, metadata @@ -3977,9 +3951,7 @@ def __call__( Defines TLS certificate. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetCertificate._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetCertificate._get_http_options() request, metadata = self._interceptor.pre_get_certificate(request, metadata) transcoded_request = _BaseCertificateManagerRestTransport._BaseGetCertificate._get_transcoded_request( @@ -4125,9 +4097,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetCertificateIssuanceConfig._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetCertificateIssuanceConfig._get_http_options() request, metadata = self._interceptor.pre_get_certificate_issuance_config( request, metadata @@ -4191,11 +4161,10 @@ def __call__( resp = self._interceptor.post_get_certificate_issuance_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_certificate_issuance_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_certificate_issuance_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4281,9 +4250,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetCertificateMap._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetCertificateMap._get_http_options() request, metadata = self._interceptor.pre_get_certificate_map( request, metadata @@ -4430,9 +4397,7 @@ def __call__( Defines a certificate map entry. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetCertificateMapEntry._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetCertificateMapEntry._get_http_options() request, metadata = self._interceptor.pre_get_certificate_map_entry( request, metadata @@ -4584,9 +4549,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetDnsAuthorization._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetDnsAuthorization._get_http_options() request, metadata = self._interceptor.pre_get_dns_authorization( request, metadata @@ -4735,9 +4698,7 @@ def __call__( Defines a trust config. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetTrustConfig._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetTrustConfig._get_http_options() request, metadata = self._interceptor.pre_get_trust_config( request, metadata @@ -4888,9 +4849,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListCertificateIssuanceConfigs._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListCertificateIssuanceConfigs._get_http_options() request, metadata = self._interceptor.pre_list_certificate_issuance_configs( request, metadata @@ -4958,11 +4917,10 @@ def __call__( resp = self._interceptor.post_list_certificate_issuance_configs(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_certificate_issuance_configs_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_certificate_issuance_configs_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5045,9 +5003,7 @@ def __call__( Response for the ``ListCertificateMapEntries`` method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListCertificateMapEntries._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListCertificateMapEntries._get_http_options() request, metadata = self._interceptor.pre_list_certificate_map_entries( request, metadata @@ -5196,9 +5152,7 @@ def __call__( Response for the ``ListCertificateMaps`` method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListCertificateMaps._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListCertificateMaps._get_http_options() request, metadata = self._interceptor.pre_list_certificate_maps( request, metadata @@ -5349,9 +5303,7 @@ def __call__( Response for the ``ListCertificates`` method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListCertificates._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListCertificates._get_http_options() request, metadata = self._interceptor.pre_list_certificates( request, metadata @@ -5498,9 +5450,7 @@ def __call__( Response for the ``ListDnsAuthorizations`` method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListDnsAuthorizations._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListDnsAuthorizations._get_http_options() request, metadata = self._interceptor.pre_list_dns_authorizations( request, metadata @@ -5651,9 +5601,7 @@ def __call__( Response for the ``ListTrustConfigs`` method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListTrustConfigs._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListTrustConfigs._get_http_options() request, metadata = self._interceptor.pre_list_trust_configs( request, metadata @@ -5804,9 +5752,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseUpdateCertificate._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseUpdateCertificate._get_http_options() request, metadata = self._interceptor.pre_update_certificate( request, metadata @@ -5958,9 +5904,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseUpdateCertificateMap._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseUpdateCertificateMap._get_http_options() request, metadata = self._interceptor.pre_update_certificate_map( request, metadata @@ -6115,9 +6059,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseUpdateCertificateMapEntry._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseUpdateCertificateMapEntry._get_http_options() request, metadata = self._interceptor.pre_update_certificate_map_entry( request, metadata @@ -6269,9 +6211,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseUpdateDnsAuthorization._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseUpdateDnsAuthorization._get_http_options() request, metadata = self._interceptor.pre_update_dns_authorization( request, metadata @@ -6425,9 +6365,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseUpdateTrustConfig._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseUpdateTrustConfig._get_http_options() request, metadata = self._interceptor.pre_update_trust_config( request, metadata @@ -6539,7 +6477,9 @@ def create_certificate_issuance_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateCertificateIssuanceConfig(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCertificateIssuanceConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_certificate_map( @@ -6559,7 +6499,9 @@ def create_certificate_map_entry( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateCertificateMapEntry(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCertificateMapEntry( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_dns_authorization( @@ -6569,7 +6511,9 @@ def create_dns_authorization( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateDnsAuthorization(self._session, self._host, self._interceptor) # type: ignore + return self._CreateDnsAuthorization( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_trust_config( @@ -6600,7 +6544,9 @@ def delete_certificate_issuance_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteCertificateIssuanceConfig(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteCertificateIssuanceConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_certificate_map( @@ -6620,7 +6566,9 @@ def delete_certificate_map_entry( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteCertificateMapEntry(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteCertificateMapEntry( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_dns_authorization( @@ -6630,7 +6578,9 @@ def delete_dns_authorization( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteDnsAuthorization(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteDnsAuthorization( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_trust_config( @@ -6659,7 +6609,9 @@ def get_certificate_issuance_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetCertificateIssuanceConfig(self._session, self._host, self._interceptor) # type: ignore + return self._GetCertificateIssuanceConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_certificate_map( @@ -6681,7 +6633,9 @@ def get_certificate_map_entry( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetCertificateMapEntry(self._session, self._host, self._interceptor) # type: ignore + return self._GetCertificateMapEntry( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_dns_authorization( @@ -6711,7 +6665,9 @@ def list_certificate_issuance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListCertificateIssuanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListCertificateIssuanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_certificate_map_entries( @@ -6722,7 +6678,9 @@ def list_certificate_map_entries( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListCertificateMapEntries(self._session, self._host, self._interceptor) # type: ignore + return self._ListCertificateMapEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_certificate_maps( @@ -6795,7 +6753,9 @@ def update_certificate_map_entry( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateCertificateMapEntry(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCertificateMapEntry( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_dns_authorization( @@ -6805,7 +6765,9 @@ def update_dns_authorization( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateDnsAuthorization(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDnsAuthorization( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_trust_config( @@ -6875,9 +6837,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseCertificateManagerRestTransport._BaseGetLocation._get_transcoded_request( @@ -7016,9 +6976,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseCertificateManagerRestTransport._BaseListLocations._get_transcoded_request( @@ -7155,9 +7113,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -7275,9 +7231,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -7393,9 +7347,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCertificateManagerRestTransport._BaseGetOperation._get_transcoded_request( @@ -7534,9 +7486,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCertificateManagerRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest_base.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest_base.py index efa80ec971c0..24caba953e9e 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest_base.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest_base.py @@ -22,13 +22,15 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config from .base import DEFAULT_CLIENT_INFO, CertificateManagerTransport diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_issuance_config.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_issuance_config.py index 47f1034e5ae2..df69724112be 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_issuance_config.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_issuance_config.py @@ -103,12 +103,12 @@ class ListCertificateIssuanceConfigsResponse(proto.Message): def raw_page(self): return self - certificate_issuance_configs: MutableSequence[ - "CertificateIssuanceConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CertificateIssuanceConfig", + certificate_issuance_configs: MutableSequence["CertificateIssuanceConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CertificateIssuanceConfig", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -232,6 +232,7 @@ class KeyAlgorithm(proto.Enum): ECDSA_P256 (4): Specifies ECDSA with curve P256. """ + KEY_ALGORITHM_UNSPECIFIED = 0 RSA_2048 = 1 ECDSA_P256 = 4 diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_manager.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_manager.py index 7dd54294714e..0fbcd91efed0 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_manager.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_manager.py @@ -70,6 +70,7 @@ class ServingState(proto.Enum): Update is in progress. Some frontends may serve this configuration. """ + SERVING_STATE_UNSPECIFIED = 0 ACTIVE = 1 PENDING = 2 @@ -486,12 +487,12 @@ class ListCertificateMapEntriesResponse(proto.Message): def raw_page(self): return self - certificate_map_entries: MutableSequence[ - "CertificateMapEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CertificateMapEntry", + certificate_map_entries: MutableSequence["CertificateMapEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CertificateMapEntry", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -890,6 +891,7 @@ class Scope(proto.Enum): Google Cloud regions. See https://cloud.google.com/compute/docs/regions-zones. """ + DEFAULT = 0 EDGE_CACHE = 1 ALL_REGIONS = 2 @@ -972,6 +974,7 @@ class State(proto.Enum): The certificate management is working, and a certificate has been provisioned. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 FAILED = 2 @@ -1008,6 +1011,7 @@ class Reason(proto.Enum): internal rate limits of the system. Provisioning may take longer to complete. """ + REASON_UNSPECIFIED = 0 AUTHORIZATION_ISSUE = 1 RATE_LIMITED = 2 @@ -1064,6 +1068,7 @@ class State(proto.Enum): ``failure_reason`` and ``details`` fields for more information. """ + STATE_UNSPECIFIED = 0 AUTHORIZING = 1 AUTHORIZED = 6 @@ -1088,6 +1093,7 @@ class FailureReason(proto.Enum): domain, e.g. for certificates per top-level private domain. """ + FAILURE_REASON_UNSPECIFIED = 0 CONFIG = 1 CAA = 2 @@ -1285,12 +1291,12 @@ class IpConfig(proto.Message): number=3, oneof="target_proxy", ) - ip_configs: MutableSequence[ - "CertificateMap.GclbTarget.IpConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="CertificateMap.GclbTarget.IpConfig", + ip_configs: MutableSequence["CertificateMap.GclbTarget.IpConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="CertificateMap.GclbTarget.IpConfig", + ) ) name: str = proto.Field( @@ -1385,6 +1391,7 @@ class Matcher(proto.Enum): wasn't specified in the request or SNI couldn't be found in the map. """ + MATCHER_UNSPECIFIED = 0 PRIMARY = 1 @@ -1484,6 +1491,7 @@ class Type(proto.Enum): management of Google-managed certificates with DNS authorization across multiple projects. """ + TYPE_UNSPECIFIED = 0 FIXED_RECORD = 1 PER_PROJECT_RECORD = 2 diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/trust_config.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/trust_config.py index d72ec19e750b..d3923356483a 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/trust_config.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/trust_config.py @@ -312,12 +312,12 @@ class TrustStore(proto.Message): number=1, message="TrustConfig.TrustAnchor", ) - intermediate_cas: MutableSequence[ - "TrustConfig.IntermediateCA" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="TrustConfig.IntermediateCA", + intermediate_cas: MutableSequence["TrustConfig.IntermediateCA"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="TrustConfig.IntermediateCA", + ) ) name: str = proto.Field( diff --git a/packages/google-cloud-certificate-manager/mypy.ini b/packages/google-cloud-certificate-manager/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-certificate-manager/mypy.ini +++ b/packages/google-cloud-certificate-manager/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-certificate-manager/noxfile.py b/packages/google-cloud-certificate-manager/noxfile.py index 1ba6ac8992a0..e3e445a94139 100644 --- a/packages/google-cloud-certificate-manager/noxfile.py +++ b/packages/google-cloud-certificate-manager/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_async.py b/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_async.py index 5c33cd9f47fe..86df2e0d8ee2 100644 --- a/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_async.py +++ b/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_async.py @@ -40,9 +40,7 @@ async def sample_create_certificate_issuance_config(): # Initialize request argument(s) certificate_issuance_config = certificate_manager_v1.CertificateIssuanceConfig() - certificate_issuance_config.certificate_authority_config.certificate_authority_service_config.ca_pool = ( - "ca_pool_value" - ) + certificate_issuance_config.certificate_authority_config.certificate_authority_service_config.ca_pool = "ca_pool_value" certificate_issuance_config.rotation_window_percentage = 2788 certificate_issuance_config.key_algorithm = "ECDSA_P256" diff --git a/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_sync.py b/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_sync.py index d2f260e50ee8..ee2b52639614 100644 --- a/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_sync.py +++ b/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_sync.py @@ -40,9 +40,7 @@ def sample_create_certificate_issuance_config(): # Initialize request argument(s) certificate_issuance_config = certificate_manager_v1.CertificateIssuanceConfig() - certificate_issuance_config.certificate_authority_config.certificate_authority_service_config.ca_pool = ( - "ca_pool_value" - ) + certificate_issuance_config.certificate_authority_config.certificate_authority_service_config.ca_pool = "ca_pool_value" certificate_issuance_config.rotation_window_percentage = 2788 certificate_issuance_config.key_algorithm = "ECDSA_P256" diff --git a/packages/google-cloud-certificate-manager/tests/unit/gapic/certificate_manager_v1/test_certificate_manager.py b/packages/google-cloud-certificate-manager/tests/unit/gapic/certificate_manager_v1/test_certificate_manager.py index ecfee076ee9b..aea76cb9b553 100644 --- a/packages/google-cloud-certificate-manager/tests/unit/gapic/certificate_manager_v1/test_certificate_manager.py +++ b/packages/google-cloud-certificate-manager/tests/unit/gapic/certificate_manager_v1/test_certificate_manager.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.cloud.certificate_manager_v1.services.certificate_manager import ( CertificateManagerAsyncClient, @@ -73,13 +73,15 @@ pagers, transports, ) -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1003,10 +1005,9 @@ def test_certificate_manager_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1051,10 +1052,9 @@ def test_certificate_manager_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1090,10 +1090,9 @@ def test_certificate_manager_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1345,9 +1344,7 @@ def test_certificate_manager_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1466,9 +1463,9 @@ def test_list_certificates_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_certificates] = ( + mock_rpc + ) request = {} client.list_certificates(request) @@ -2351,9 +2348,9 @@ def test_create_certificate_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_certificate] = ( + mock_rpc + ) request = {} client.create_certificate(request) @@ -2713,9 +2710,9 @@ def test_update_certificate_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_certificate] = ( + mock_rpc + ) request = {} client.update_certificate(request) @@ -3069,9 +3066,9 @@ def test_delete_certificate_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_certificate] = ( + mock_rpc + ) request = {} client.delete_certificate(request) @@ -3427,9 +3424,9 @@ def test_list_certificate_maps_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_certificate_maps - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_certificate_maps] = ( + mock_rpc + ) request = {} client.list_certificate_maps(request) @@ -3975,9 +3972,9 @@ def test_get_certificate_map_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_certificate_map] = ( + mock_rpc + ) request = {} client.get_certificate_map(request) @@ -4319,9 +4316,9 @@ def test_create_certificate_map_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_certificate_map] = ( + mock_rpc + ) request = {} client.create_certificate_map(request) @@ -4682,9 +4679,9 @@ def test_update_certificate_map_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_certificate_map] = ( + mock_rpc + ) request = {} client.update_certificate_map(request) @@ -5039,9 +5036,9 @@ def test_delete_certificate_map_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_certificate_map] = ( + mock_rpc + ) request = {} client.delete_certificate_map(request) @@ -7954,9 +7951,9 @@ def test_get_dns_authorization_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_dns_authorization - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_dns_authorization] = ( + mock_rpc + ) request = {} client.get_dns_authorization(request) @@ -11051,9 +11048,9 @@ def test_list_trust_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_trust_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_trust_configs] = ( + mock_rpc + ) request = {} client.list_trust_configs(request) @@ -11594,9 +11591,9 @@ def test_get_trust_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_trust_config] = ( + mock_rpc + ) request = {} client.get_trust_config(request) @@ -11928,9 +11925,9 @@ def test_create_trust_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_trust_config] = ( + mock_rpc + ) request = {} client.create_trust_config(request) @@ -12290,9 +12287,9 @@ def test_update_trust_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_trust_config] = ( + mock_rpc + ) request = {} client.update_trust_config(request) @@ -12648,9 +12645,9 @@ def test_delete_trust_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_trust_config] = ( + mock_rpc + ) request = {} client.delete_trust_config(request) @@ -12926,9 +12923,9 @@ def test_list_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_certificates] = ( + mock_rpc + ) request = {} client.list_certificates(request) @@ -13370,9 +13367,9 @@ def test_create_certificate_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_certificate] = ( + mock_rpc + ) request = {} client.create_certificate(request) @@ -13580,9 +13577,9 @@ def test_update_certificate_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_certificate] = ( + mock_rpc + ) request = {} client.update_certificate(request) @@ -13773,9 +13770,9 @@ def test_delete_certificate_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_certificate] = ( + mock_rpc + ) request = {} client.delete_certificate(request) @@ -13957,9 +13954,9 @@ def test_list_certificate_maps_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_certificate_maps - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_certificate_maps] = ( + mock_rpc + ) request = {} client.list_certificate_maps(request) @@ -14223,9 +14220,9 @@ def test_get_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_certificate_map] = ( + mock_rpc + ) request = {} client.get_certificate_map(request) @@ -14408,9 +14405,9 @@ def test_create_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_certificate_map] = ( + mock_rpc + ) request = {} client.create_certificate_map(request) @@ -14619,9 +14616,9 @@ def test_update_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_certificate_map] = ( + mock_rpc + ) request = {} client.update_certificate_map(request) @@ -14813,9 +14810,9 @@ def test_delete_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_certificate_map] = ( + mock_rpc + ) request = {} client.delete_certificate_map(request) @@ -16332,9 +16329,9 @@ def test_get_dns_authorization_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_dns_authorization - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_dns_authorization] = ( + mock_rpc + ) request = {} client.get_dns_authorization(request) @@ -17637,9 +17634,9 @@ def test_create_certificate_issuance_config_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "certificateIssuanceConfigId" - ] = "certificate_issuance_config_id_value" + jsonified_request["certificateIssuanceConfigId"] = ( + "certificate_issuance_config_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() @@ -18000,9 +17997,9 @@ def test_list_trust_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_trust_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_trust_configs] = ( + mock_rpc + ) request = {} client.list_trust_configs(request) @@ -18262,9 +18259,9 @@ def test_get_trust_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_trust_config] = ( + mock_rpc + ) request = {} client.get_trust_config(request) @@ -18446,9 +18443,9 @@ def test_create_trust_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_trust_config] = ( + mock_rpc + ) request = {} client.create_trust_config(request) @@ -18656,9 +18653,9 @@ def test_update_trust_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_trust_config] = ( + mock_rpc + ) request = {} client.update_trust_config(request) @@ -18849,9 +18846,9 @@ def test_delete_trust_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_trust_config] = ( + mock_rpc + ) request = {} client.delete_trust_config(request) diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/__init__.py b/packages/google-cloud-channel/google/cloud/channel_v1/__init__.py index 9f411215e31f..3abadca6274d 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/__init__.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_channel_reports_service import ( CloudChannelReportsServiceAsyncClient, CloudChannelReportsServiceClient, diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/async_client.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/async_client.py index 72d5ca2ec34a..11fed93866d8 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/async_client.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.channel_v1 import gapic_version as package_version @@ -139,7 +139,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudChannelReportsServiceAsyncClient: The constructed client. """ - return CloudChannelReportsServiceClient.from_service_account_info.__func__(CloudChannelReportsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudChannelReportsServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + CloudChannelReportsServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +160,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudChannelReportsServiceAsyncClient: The constructed client. """ - return CloudChannelReportsServiceClient.from_service_account_file.__func__(CloudChannelReportsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudChannelReportsServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + CloudChannelReportsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -193,7 +203,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudChannelReportsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudChannelReportsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudChannelReportsServiceTransport: diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/client.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/client.py index d3342890c50f..b9f21f1ae9a9 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/client.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.channel_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class CloudChannelReportsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudChannelReportsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudChannelReportsServiceTransport]] _transport_registry["grpc"] = CloudChannelReportsServiceGrpcTransport _transport_registry["grpc_asyncio"] = CloudChannelReportsServiceGrpcAsyncIOTransport @@ -651,11 +649,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudChannelReportsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudChannelReportsServiceClient._read_environment_variables() + ) self._client_cert_source = ( CloudChannelReportsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -692,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudChannelReportsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/pagers.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/pagers.py index 6c81d8435a85..6d3f5caab795 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/pagers.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/__init__.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/__init__.py index 466e15153ea7..710e81dcb066 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/__init__.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import CloudChannelReportsServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudChannelReportsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudChannelReportsServiceTransport]] _transport_registry["grpc"] = CloudChannelReportsServiceGrpcTransport _transport_registry["grpc_asyncio"] = CloudChannelReportsServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/base.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/base.py index b2791b5de22e..a68e908dd7ce 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/base.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.channel_v1 import gapic_version as package_version from google.cloud.channel_v1.types import reports_service @@ -245,13 +245,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc.py index 6112cfb4647d..6ad65e05702a 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.channel_v1.types import reports_service diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc_asyncio.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc_asyncio.py index a5fb68d6ce49..db9820124ef7 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.channel_v1.types import reports_service diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/async_client.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/async_client.py index f5e991cb328a..be35fbe5dfa1 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/async_client.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.channel_v1 import gapic_version as package_version @@ -46,10 +46,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.channel_v1.services.cloud_channel_service import pagers from google.cloud.channel_v1.types import ( @@ -190,7 +190,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudChannelServiceAsyncClient: The constructed client. """ - return CloudChannelServiceClient.from_service_account_info.__func__(CloudChannelServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudChannelServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CloudChannelServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -206,7 +209,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudChannelServiceAsyncClient: The constructed client. """ - return CloudChannelServiceClient.from_service_account_file.__func__(CloudChannelServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudChannelServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CloudChannelServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -244,7 +250,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudChannelServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudChannelServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudChannelServiceTransport: diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/client.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/client.py index ce05f139f75f..e69c2d33b88b 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/client.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.channel_v1 import gapic_version as package_version @@ -63,10 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.channel_v1.services.cloud_channel_service import pagers from google.cloud.channel_v1.types import ( @@ -95,9 +95,7 @@ class CloudChannelServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudChannelServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudChannelServiceTransport]] _transport_registry["grpc"] = CloudChannelServiceGrpcTransport _transport_registry["grpc_asyncio"] = CloudChannelServiceGrpcAsyncIOTransport @@ -847,11 +845,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudChannelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudChannelServiceClient._read_environment_variables() + ) self._client_cert_source = CloudChannelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -886,8 +882,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudChannelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/pagers.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/pagers.py index f143b116c5a3..612fcefbbe42 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/pagers.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/pagers.py @@ -76,7 +76,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -152,7 +152,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -308,7 +308,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -388,7 +388,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -464,7 +464,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -544,7 +544,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -620,7 +620,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -700,7 +700,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -776,7 +776,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -856,7 +856,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -932,7 +932,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1014,7 +1014,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1092,7 +1092,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1174,7 +1174,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1250,7 +1250,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1330,7 +1330,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1406,7 +1406,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1486,7 +1486,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1562,7 +1562,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1642,7 +1642,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1718,7 +1718,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1798,7 +1798,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1874,7 +1874,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1954,7 +1954,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2030,7 +2030,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2110,7 +2110,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2186,7 +2186,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2266,7 +2266,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2342,7 +2342,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2422,7 +2422,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2498,7 +2498,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/__init__.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/__init__.py index 73ed6663903f..5d2ea401bfb9 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/__init__.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import CloudChannelServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudChannelServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudChannelServiceTransport]] _transport_registry["grpc"] = CloudChannelServiceGrpcTransport _transport_registry["grpc_asyncio"] = CloudChannelServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/base.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/base.py index 81baa659bf68..530fb094dc72 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/base.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.channel_v1 import gapic_version as package_version from google.cloud.channel_v1.types import ( @@ -961,13 +961,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc.py index 45f9b878af86..788c03bdba83 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.channel_v1.types import ( channel_partner_links, @@ -487,12 +487,12 @@ def check_cloud_identity_accounts_exist( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "check_cloud_identity_accounts_exist" not in self._stubs: - self._stubs[ - "check_cloud_identity_accounts_exist" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CheckCloudIdentityAccountsExist", - request_serializer=service.CheckCloudIdentityAccountsExistRequest.serialize, - response_deserializer=service.CheckCloudIdentityAccountsExistResponse.deserialize, + self._stubs["check_cloud_identity_accounts_exist"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CheckCloudIdentityAccountsExist", + request_serializer=service.CheckCloudIdentityAccountsExistRequest.serialize, + response_deserializer=service.CheckCloudIdentityAccountsExistResponse.deserialize, + ) ) return self._stubs["check_cloud_identity_accounts_exist"] @@ -1451,12 +1451,12 @@ def transfer_entitlements_to_google( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "transfer_entitlements_to_google" not in self._stubs: - self._stubs[ - "transfer_entitlements_to_google" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/TransferEntitlementsToGoogle", - request_serializer=service.TransferEntitlementsToGoogleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["transfer_entitlements_to_google"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/TransferEntitlementsToGoogle", + request_serializer=service.TransferEntitlementsToGoogleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["transfer_entitlements_to_google"] @@ -1496,12 +1496,12 @@ def list_channel_partner_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_channel_partner_links" not in self._stubs: - self._stubs[ - "list_channel_partner_links" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerLinks", - request_serializer=service.ListChannelPartnerLinksRequest.serialize, - response_deserializer=service.ListChannelPartnerLinksResponse.deserialize, + self._stubs["list_channel_partner_links"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerLinks", + request_serializer=service.ListChannelPartnerLinksRequest.serialize, + response_deserializer=service.ListChannelPartnerLinksResponse.deserialize, + ) ) return self._stubs["list_channel_partner_links"] @@ -1594,12 +1594,12 @@ def create_channel_partner_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_channel_partner_link" not in self._stubs: - self._stubs[ - "create_channel_partner_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerLink", - request_serializer=service.CreateChannelPartnerLinkRequest.serialize, - response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + self._stubs["create_channel_partner_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerLink", + request_serializer=service.CreateChannelPartnerLinkRequest.serialize, + response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + ) ) return self._stubs["create_channel_partner_link"] @@ -1649,12 +1649,12 @@ def update_channel_partner_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_channel_partner_link" not in self._stubs: - self._stubs[ - "update_channel_partner_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerLink", - request_serializer=service.UpdateChannelPartnerLinkRequest.serialize, - response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + self._stubs["update_channel_partner_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerLink", + request_serializer=service.UpdateChannelPartnerLinkRequest.serialize, + response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + ) ) return self._stubs["update_channel_partner_link"] @@ -1694,12 +1694,12 @@ def get_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_customer_repricing_config" not in self._stubs: - self._stubs[ - "get_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/GetCustomerRepricingConfig", - request_serializer=service.GetCustomerRepricingConfigRequest.serialize, - response_deserializer=repricing.CustomerRepricingConfig.deserialize, + self._stubs["get_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/GetCustomerRepricingConfig", + request_serializer=service.GetCustomerRepricingConfigRequest.serialize, + response_deserializer=repricing.CustomerRepricingConfig.deserialize, + ) ) return self._stubs["get_customer_repricing_config"] @@ -1750,12 +1750,12 @@ def list_customer_repricing_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_customer_repricing_configs" not in self._stubs: - self._stubs[ - "list_customer_repricing_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListCustomerRepricingConfigs", - request_serializer=service.ListCustomerRepricingConfigsRequest.serialize, - response_deserializer=service.ListCustomerRepricingConfigsResponse.deserialize, + self._stubs["list_customer_repricing_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListCustomerRepricingConfigs", + request_serializer=service.ListCustomerRepricingConfigsRequest.serialize, + response_deserializer=service.ListCustomerRepricingConfigsResponse.deserialize, + ) ) return self._stubs["list_customer_repricing_configs"] @@ -1828,12 +1828,12 @@ def create_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_customer_repricing_config" not in self._stubs: - self._stubs[ - "create_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CreateCustomerRepricingConfig", - request_serializer=service.CreateCustomerRepricingConfigRequest.serialize, - response_deserializer=repricing.CustomerRepricingConfig.deserialize, + self._stubs["create_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CreateCustomerRepricingConfig", + request_serializer=service.CreateCustomerRepricingConfigRequest.serialize, + response_deserializer=repricing.CustomerRepricingConfig.deserialize, + ) ) return self._stubs["create_customer_repricing_config"] @@ -1892,12 +1892,12 @@ def update_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_customer_repricing_config" not in self._stubs: - self._stubs[ - "update_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/UpdateCustomerRepricingConfig", - request_serializer=service.UpdateCustomerRepricingConfigRequest.serialize, - response_deserializer=repricing.CustomerRepricingConfig.deserialize, + self._stubs["update_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/UpdateCustomerRepricingConfig", + request_serializer=service.UpdateCustomerRepricingConfigRequest.serialize, + response_deserializer=repricing.CustomerRepricingConfig.deserialize, + ) ) return self._stubs["update_customer_repricing_config"] @@ -1938,12 +1938,12 @@ def delete_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_customer_repricing_config" not in self._stubs: - self._stubs[ - "delete_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/DeleteCustomerRepricingConfig", - request_serializer=service.DeleteCustomerRepricingConfigRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/DeleteCustomerRepricingConfig", + request_serializer=service.DeleteCustomerRepricingConfigRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_customer_repricing_config"] @@ -1985,12 +1985,12 @@ def get_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "get_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/GetChannelPartnerRepricingConfig", - request_serializer=service.GetChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + self._stubs["get_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/GetChannelPartnerRepricingConfig", + request_serializer=service.GetChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + ) ) return self._stubs["get_channel_partner_repricing_config"] @@ -2040,12 +2040,12 @@ def list_channel_partner_repricing_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_channel_partner_repricing_configs" not in self._stubs: - self._stubs[ - "list_channel_partner_repricing_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerRepricingConfigs", - request_serializer=service.ListChannelPartnerRepricingConfigsRequest.serialize, - response_deserializer=service.ListChannelPartnerRepricingConfigsResponse.deserialize, + self._stubs["list_channel_partner_repricing_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerRepricingConfigs", + request_serializer=service.ListChannelPartnerRepricingConfigsRequest.serialize, + response_deserializer=service.ListChannelPartnerRepricingConfigsResponse.deserialize, + ) ) return self._stubs["list_channel_partner_repricing_configs"] @@ -2117,12 +2117,12 @@ def create_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "create_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerRepricingConfig", - request_serializer=service.CreateChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + self._stubs["create_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerRepricingConfig", + request_serializer=service.CreateChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + ) ) return self._stubs["create_channel_partner_repricing_config"] @@ -2181,12 +2181,12 @@ def update_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "update_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerRepricingConfig", - request_serializer=service.UpdateChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + self._stubs["update_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerRepricingConfig", + request_serializer=service.UpdateChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + ) ) return self._stubs["update_channel_partner_repricing_config"] @@ -2229,12 +2229,12 @@ def delete_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "delete_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/DeleteChannelPartnerRepricingConfig", - request_serializer=service.DeleteChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/DeleteChannelPartnerRepricingConfig", + request_serializer=service.DeleteChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_channel_partner_repricing_config"] @@ -2322,12 +2322,12 @@ def list_sku_group_billable_skus( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_sku_group_billable_skus" not in self._stubs: - self._stubs[ - "list_sku_group_billable_skus" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListSkuGroupBillableSkus", - request_serializer=service.ListSkuGroupBillableSkusRequest.serialize, - response_deserializer=service.ListSkuGroupBillableSkusResponse.deserialize, + self._stubs["list_sku_group_billable_skus"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListSkuGroupBillableSkus", + request_serializer=service.ListSkuGroupBillableSkusRequest.serialize, + response_deserializer=service.ListSkuGroupBillableSkusResponse.deserialize, + ) ) return self._stubs["list_sku_group_billable_skus"] @@ -2577,12 +2577,12 @@ def query_eligible_billing_accounts( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_eligible_billing_accounts" not in self._stubs: - self._stubs[ - "query_eligible_billing_accounts" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/QueryEligibleBillingAccounts", - request_serializer=service.QueryEligibleBillingAccountsRequest.serialize, - response_deserializer=service.QueryEligibleBillingAccountsResponse.deserialize, + self._stubs["query_eligible_billing_accounts"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/QueryEligibleBillingAccounts", + request_serializer=service.QueryEligibleBillingAccountsRequest.serialize, + response_deserializer=service.QueryEligibleBillingAccountsResponse.deserialize, + ) ) return self._stubs["query_eligible_billing_accounts"] diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc_asyncio.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc_asyncio.py index 0e1801da06b1..ac0774aedb87 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.channel_v1.types import ( channel_partner_links, @@ -497,12 +497,12 @@ def check_cloud_identity_accounts_exist( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "check_cloud_identity_accounts_exist" not in self._stubs: - self._stubs[ - "check_cloud_identity_accounts_exist" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CheckCloudIdentityAccountsExist", - request_serializer=service.CheckCloudIdentityAccountsExistRequest.serialize, - response_deserializer=service.CheckCloudIdentityAccountsExistResponse.deserialize, + self._stubs["check_cloud_identity_accounts_exist"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CheckCloudIdentityAccountsExist", + request_serializer=service.CheckCloudIdentityAccountsExistRequest.serialize, + response_deserializer=service.CheckCloudIdentityAccountsExistResponse.deserialize, + ) ) return self._stubs["check_cloud_identity_accounts_exist"] @@ -1484,12 +1484,12 @@ def transfer_entitlements_to_google( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "transfer_entitlements_to_google" not in self._stubs: - self._stubs[ - "transfer_entitlements_to_google" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/TransferEntitlementsToGoogle", - request_serializer=service.TransferEntitlementsToGoogleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["transfer_entitlements_to_google"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/TransferEntitlementsToGoogle", + request_serializer=service.TransferEntitlementsToGoogleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["transfer_entitlements_to_google"] @@ -1529,12 +1529,12 @@ def list_channel_partner_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_channel_partner_links" not in self._stubs: - self._stubs[ - "list_channel_partner_links" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerLinks", - request_serializer=service.ListChannelPartnerLinksRequest.serialize, - response_deserializer=service.ListChannelPartnerLinksResponse.deserialize, + self._stubs["list_channel_partner_links"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerLinks", + request_serializer=service.ListChannelPartnerLinksRequest.serialize, + response_deserializer=service.ListChannelPartnerLinksResponse.deserialize, + ) ) return self._stubs["list_channel_partner_links"] @@ -1628,12 +1628,12 @@ def create_channel_partner_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_channel_partner_link" not in self._stubs: - self._stubs[ - "create_channel_partner_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerLink", - request_serializer=service.CreateChannelPartnerLinkRequest.serialize, - response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + self._stubs["create_channel_partner_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerLink", + request_serializer=service.CreateChannelPartnerLinkRequest.serialize, + response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + ) ) return self._stubs["create_channel_partner_link"] @@ -1683,12 +1683,12 @@ def update_channel_partner_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_channel_partner_link" not in self._stubs: - self._stubs[ - "update_channel_partner_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerLink", - request_serializer=service.UpdateChannelPartnerLinkRequest.serialize, - response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + self._stubs["update_channel_partner_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerLink", + request_serializer=service.UpdateChannelPartnerLinkRequest.serialize, + response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + ) ) return self._stubs["update_channel_partner_link"] @@ -1729,12 +1729,12 @@ def get_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_customer_repricing_config" not in self._stubs: - self._stubs[ - "get_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/GetCustomerRepricingConfig", - request_serializer=service.GetCustomerRepricingConfigRequest.serialize, - response_deserializer=repricing.CustomerRepricingConfig.deserialize, + self._stubs["get_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/GetCustomerRepricingConfig", + request_serializer=service.GetCustomerRepricingConfigRequest.serialize, + response_deserializer=repricing.CustomerRepricingConfig.deserialize, + ) ) return self._stubs["get_customer_repricing_config"] @@ -1785,12 +1785,12 @@ def list_customer_repricing_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_customer_repricing_configs" not in self._stubs: - self._stubs[ - "list_customer_repricing_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListCustomerRepricingConfigs", - request_serializer=service.ListCustomerRepricingConfigsRequest.serialize, - response_deserializer=service.ListCustomerRepricingConfigsResponse.deserialize, + self._stubs["list_customer_repricing_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListCustomerRepricingConfigs", + request_serializer=service.ListCustomerRepricingConfigsRequest.serialize, + response_deserializer=service.ListCustomerRepricingConfigsResponse.deserialize, + ) ) return self._stubs["list_customer_repricing_configs"] @@ -1863,12 +1863,12 @@ def create_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_customer_repricing_config" not in self._stubs: - self._stubs[ - "create_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CreateCustomerRepricingConfig", - request_serializer=service.CreateCustomerRepricingConfigRequest.serialize, - response_deserializer=repricing.CustomerRepricingConfig.deserialize, + self._stubs["create_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CreateCustomerRepricingConfig", + request_serializer=service.CreateCustomerRepricingConfigRequest.serialize, + response_deserializer=repricing.CustomerRepricingConfig.deserialize, + ) ) return self._stubs["create_customer_repricing_config"] @@ -1927,12 +1927,12 @@ def update_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_customer_repricing_config" not in self._stubs: - self._stubs[ - "update_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/UpdateCustomerRepricingConfig", - request_serializer=service.UpdateCustomerRepricingConfigRequest.serialize, - response_deserializer=repricing.CustomerRepricingConfig.deserialize, + self._stubs["update_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/UpdateCustomerRepricingConfig", + request_serializer=service.UpdateCustomerRepricingConfigRequest.serialize, + response_deserializer=repricing.CustomerRepricingConfig.deserialize, + ) ) return self._stubs["update_customer_repricing_config"] @@ -1975,12 +1975,12 @@ def delete_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_customer_repricing_config" not in self._stubs: - self._stubs[ - "delete_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/DeleteCustomerRepricingConfig", - request_serializer=service.DeleteCustomerRepricingConfigRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/DeleteCustomerRepricingConfig", + request_serializer=service.DeleteCustomerRepricingConfigRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_customer_repricing_config"] @@ -2022,12 +2022,12 @@ def get_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "get_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/GetChannelPartnerRepricingConfig", - request_serializer=service.GetChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + self._stubs["get_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/GetChannelPartnerRepricingConfig", + request_serializer=service.GetChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + ) ) return self._stubs["get_channel_partner_repricing_config"] @@ -2077,12 +2077,12 @@ def list_channel_partner_repricing_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_channel_partner_repricing_configs" not in self._stubs: - self._stubs[ - "list_channel_partner_repricing_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerRepricingConfigs", - request_serializer=service.ListChannelPartnerRepricingConfigsRequest.serialize, - response_deserializer=service.ListChannelPartnerRepricingConfigsResponse.deserialize, + self._stubs["list_channel_partner_repricing_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerRepricingConfigs", + request_serializer=service.ListChannelPartnerRepricingConfigsRequest.serialize, + response_deserializer=service.ListChannelPartnerRepricingConfigsResponse.deserialize, + ) ) return self._stubs["list_channel_partner_repricing_configs"] @@ -2154,12 +2154,12 @@ def create_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "create_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerRepricingConfig", - request_serializer=service.CreateChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + self._stubs["create_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerRepricingConfig", + request_serializer=service.CreateChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + ) ) return self._stubs["create_channel_partner_repricing_config"] @@ -2218,12 +2218,12 @@ def update_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "update_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerRepricingConfig", - request_serializer=service.UpdateChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + self._stubs["update_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerRepricingConfig", + request_serializer=service.UpdateChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + ) ) return self._stubs["update_channel_partner_repricing_config"] @@ -2266,12 +2266,12 @@ def delete_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "delete_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/DeleteChannelPartnerRepricingConfig", - request_serializer=service.DeleteChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/DeleteChannelPartnerRepricingConfig", + request_serializer=service.DeleteChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_channel_partner_repricing_config"] @@ -2361,12 +2361,12 @@ def list_sku_group_billable_skus( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_sku_group_billable_skus" not in self._stubs: - self._stubs[ - "list_sku_group_billable_skus" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListSkuGroupBillableSkus", - request_serializer=service.ListSkuGroupBillableSkusRequest.serialize, - response_deserializer=service.ListSkuGroupBillableSkusResponse.deserialize, + self._stubs["list_sku_group_billable_skus"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListSkuGroupBillableSkus", + request_serializer=service.ListSkuGroupBillableSkusRequest.serialize, + response_deserializer=service.ListSkuGroupBillableSkusResponse.deserialize, + ) ) return self._stubs["list_sku_group_billable_skus"] @@ -2622,12 +2622,12 @@ def query_eligible_billing_accounts( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_eligible_billing_accounts" not in self._stubs: - self._stubs[ - "query_eligible_billing_accounts" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/QueryEligibleBillingAccounts", - request_serializer=service.QueryEligibleBillingAccountsRequest.serialize, - response_deserializer=service.QueryEligibleBillingAccountsResponse.deserialize, + self._stubs["query_eligible_billing_accounts"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/QueryEligibleBillingAccounts", + request_serializer=service.QueryEligibleBillingAccountsRequest.serialize, + response_deserializer=service.QueryEligibleBillingAccountsResponse.deserialize, + ) ) return self._stubs["query_eligible_billing_accounts"] diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/__init__.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/__init__.py index 51d7b4f5feca..2b54684ee63e 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/__init__.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/__init__.py @@ -13,15 +13,27 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .billing_accounts import BillingAccount +from .billing_accounts import ( + BillingAccount, +) from .channel_partner_links import ( ChannelPartnerLink, ChannelPartnerLinkState, ChannelPartnerLinkView, ) -from .common import AdminUser, CloudIdentityInfo, EduData, Value -from .customers import ContactInfo, Customer -from .entitlement_changes import EntitlementChange +from .common import ( + AdminUser, + CloudIdentityInfo, + EduData, + Value, +) +from .customers import ( + ContactInfo, + Customer, +) +from .entitlement_changes import ( + EntitlementChange, +) from .entitlements import ( AssociationInfo, CommitmentSettings, @@ -52,8 +64,16 @@ PromotionalOrderType, ResourceType, ) -from .operations import OperationMetadata -from .products import MarketingInfo, Media, MediaType, Product, Sku +from .operations import ( + OperationMetadata, +) +from .products import ( + MarketingInfo, + Media, + MediaType, + Product, + Sku, +) from .reports_service import ( Column, DateRange, @@ -161,7 +181,11 @@ UpdateCustomerRepricingConfigRequest, UpdateCustomerRequest, ) -from .subscriber_event import CustomerEvent, EntitlementEvent, SubscriberEvent +from .subscriber_event import ( + CustomerEvent, + EntitlementEvent, + SubscriberEvent, +) __all__ = ( "BillingAccount", diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/channel_partner_links.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/channel_partner_links.py index 431a1cae551a..dd207db5b28c 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/channel_partner_links.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/channel_partner_links.py @@ -47,6 +47,7 @@ class ChannelPartnerLinkView(proto.Enum): FULL (2): Includes all fields. """ + UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -71,6 +72,7 @@ class ChannelPartnerLinkState(proto.Enum): Status when the reseller is suspended by Google or distributor. """ + CHANNEL_PARTNER_LINK_STATE_UNSPECIFIED = 0 INVITED = 1 ACTIVE = 2 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/common.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/common.py index d30f477a91d5..be428c6060e7 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/common.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/common.py @@ -55,6 +55,7 @@ class InstituteType(proto.Enum): UNIVERSITY (2): Higher Education Universities & Colleges """ + INSTITUTE_TYPE_UNSPECIFIED = 0 K12 = 1 UNIVERSITY = 2 @@ -80,6 +81,7 @@ class InstituteSize(proto.Enum): SIZE_10001_OR_MORE (7): 10,001 + """ + INSTITUTE_SIZE_UNSPECIFIED = 0 SIZE_1_100 = 1 SIZE_101_500 = 2 @@ -148,6 +150,7 @@ class CustomerType(proto.Enum): Team customer which needs email verification to use services. """ + CUSTOMER_TYPE_UNSPECIFIED = 0 DOMAIN = 1 TEAM = 2 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/customers.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/customers.py index d4494ee1c6a9..7f19a298a23a 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/customers.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/customers.py @@ -111,6 +111,7 @@ class CustomerAttestationState(proto.Enum): information provided is correct. Contact information of customer will be mandatory. """ + CUSTOMER_ATTESTATION_STATE_UNSPECIFIED = 0 EXEMPT = 1 NON_EXEMPT_AND_INFO_VERIFIED = 2 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlement_changes.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlement_changes.py index 31df586998bd..eedd31af2c11 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlement_changes.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlement_changes.py @@ -126,6 +126,7 @@ class ChangeType(proto.Enum): TRIAL_STARTED (15): Entitlement started trial. """ + CHANGE_TYPE_UNSPECIFIED = 0 CREATED = 1 PRICE_PLAN_SWITCHED = 3 @@ -157,6 +158,7 @@ class OperatorType(proto.Enum): RESELLER (4): Reseller user. """ + OPERATOR_TYPE_UNSPECIFIED = 0 CUSTOMER_SERVICE_REPRESENTATIVE = 1 SYSTEM = 2 @@ -180,6 +182,7 @@ class CancellationReason(proto.Enum): while still keeping other entitlement(s) with the reseller. """ + CANCELLATION_REASON_UNSPECIFIED = 0 SERVICE_TERMINATED = 1 RELATIONSHIP_ENDED = 2 @@ -205,6 +208,7 @@ class ActivationReason(proto.Enum): cancellation, added a payment plan to a trial entitlement, etc.) """ + ACTIVATION_REASON_UNSPECIFIED = 0 RESELLER_REVOKED_SUSPENSION = 1 CUSTOMER_ACCEPTED_PENDING_TOS = 2 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlements.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlements.py index c6437ba5cafe..2ae46ca9e255 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlements.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlements.py @@ -130,6 +130,7 @@ class ProvisioningState(proto.Enum): SUSPENDED (5): The entitlement is currently suspended. """ + PROVISIONING_STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 5 @@ -156,6 +157,7 @@ class SuspensionReason(proto.Enum): Other reasons (internal reasons, abuse, etc.). """ + SUSPENSION_REASON_UNSPECIFIED = 0 RESELLER_INITIATED = 1 TRIAL_ENDED = 2 @@ -467,6 +469,7 @@ class Reason(proto.Enum): this Product. See https://support.google.com/channelservices/answer/9759265 """ + REASON_UNSPECIFIED = 0 PENDING_TOS_ACCEPTANCE = 1 SKU_NOT_ELIGIBLE = 2 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/offers.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/offers.py index 0632182c862c..59c18e891e93 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/offers.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/offers.py @@ -63,6 +63,7 @@ class PromotionalOrderType(proto.Enum): Orders for modifying an existing customer's promotion on the same SKU. """ + PROMOTIONAL_TYPE_UNSPECIFIED = 0 NEW_UPGRADE = 1 TRANSFER = 2 @@ -86,6 +87,7 @@ class PaymentPlan(proto.Enum): OFFLINE (5): Price and ordering not available through API. """ + PAYMENT_PLAN_UNSPECIFIED = 0 COMMITMENT = 1 FLEXIBLE = 2 @@ -107,6 +109,7 @@ class PaymentType(proto.Enum): Postpay. Reseller is charged at the end of the Payment cycle. """ + PAYMENT_TYPE_UNSPECIFIED = 0 PREPAY = 1 POSTPAY = 2 @@ -143,6 +146,7 @@ class ResourceType(proto.Enum): For Google Cloud subscriptions like Anthos or SAP. """ + RESOURCE_TYPE_UNSPECIFIED = 0 SEAT = 1 MAU = 2 @@ -166,6 +170,7 @@ class PeriodType(proto.Enum): YEAR (3): Year. """ + PERIOD_TYPE_UNSPECIFIED = 0 DAY = 1 MONTH = 2 @@ -189,6 +194,7 @@ class DiscountType(proto.Enum): DEAL_CODE (5): Deal code discount. """ + DISCOUNT_TYPE_UNSPECIFIED = 0 REGIONAL_DISCOUNT = 1 PROMOTIONAL_DISCOUNT = 2 @@ -324,6 +330,7 @@ class ParameterType(proto.Enum): BOOLEAN (4): Boolean type. """ + PARAMETER_TYPE_UNSPECIFIED = 0 INT64 = 1 STRING = 2 @@ -394,19 +401,19 @@ class CustomerConstraints(proto.Message): proto.STRING, number=1, ) - allowed_customer_types: MutableSequence[ - common.CloudIdentityInfo.CustomerType - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum=common.CloudIdentityInfo.CustomerType, - ) - promotional_order_types: MutableSequence[ - "PromotionalOrderType" - ] = proto.RepeatedField( - proto.ENUM, - number=3, - enum="PromotionalOrderType", + allowed_customer_types: MutableSequence[common.CloudIdentityInfo.CustomerType] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum=common.CloudIdentityInfo.CustomerType, + ) + ) + promotional_order_types: MutableSequence["PromotionalOrderType"] = ( + proto.RepeatedField( + proto.ENUM, + number=3, + enum="PromotionalOrderType", + ) ) diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/operations.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/operations.py index 86176fec55ae..e897436b8ab4 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/operations.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/operations.py @@ -77,6 +77,7 @@ class OperationType(proto.Enum): Long Running Operation was triggered by ProvisionCloudIdentity. """ + OPERATION_TYPE_UNSPECIFIED = 0 CREATE_ENTITLEMENT = 1 CHANGE_RENEWAL_SETTINGS = 3 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/products.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/products.py index fe519becb708..fa7f4f9d53ef 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/products.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/products.py @@ -40,6 +40,7 @@ class MediaType(proto.Enum): MEDIA_TYPE_IMAGE (1): Type of image. """ + MEDIA_TYPE_UNSPECIFIED = 0 MEDIA_TYPE_IMAGE = 1 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/reports_service.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/reports_service.py index e6ce52bb7af0..af74ada16fa7 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/reports_service.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/reports_service.py @@ -392,6 +392,7 @@ class DataType(proto.Enum): DATE_TIME (6): ReportValues for this column will use date_time_value. """ + DATA_TYPE_UNSPECIFIED = 0 STRING = 1 INT = 2 @@ -599,6 +600,7 @@ class State(proto.Enum): FAILED (4): Report failed. """ + STATE_UNSPECIFIED = 0 STARTED = 1 WRITING = 2 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/repricing.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/repricing.py index 7663c023faff..19cadc655d31 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/repricing.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/repricing.py @@ -55,6 +55,7 @@ class RebillingBasis(proto.Enum): the customer would see if they viewed the bill in the Google Cloud Console. """ + REBILLING_BASIS_UNSPECIFIED = 0 COST_AT_LIST = 1 DIRECT_CUSTOMER_COST = 2 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/service.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/service.py index a5fa18e0bab6..fe38533840f6 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/service.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/service.py @@ -20,17 +20,15 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore +from google.cloud.channel_v1.types import billing_accounts, common, repricing from google.cloud.channel_v1.types import ( channel_partner_links as gcc_channel_partner_links, ) -from google.cloud.channel_v1.types import entitlement_changes as gcc_entitlement_changes -from google.cloud.channel_v1.types import billing_accounts -from google.cloud.channel_v1.types import common from google.cloud.channel_v1.types import customers as gcc_customers +from google.cloud.channel_v1.types import entitlement_changes as gcc_entitlement_changes from google.cloud.channel_v1.types import entitlements as gcc_entitlements from google.cloud.channel_v1.types import offers as gcc_offers from google.cloud.channel_v1.types import products as gcc_products -from google.cloud.channel_v1.types import repricing __protobuf__ = proto.module( package="google.cloud.channel.v1", @@ -213,12 +211,12 @@ class CheckCloudIdentityAccountsExistResponse(proto.Message): the domain. """ - cloud_identity_accounts: MutableSequence[ - "CloudIdentityCustomerAccount" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CloudIdentityCustomerAccount", + cloud_identity_accounts: MutableSequence["CloudIdentityCustomerAccount"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CloudIdentityCustomerAccount", + ) ) @@ -676,12 +674,12 @@ class ListTransferableSkusResponse(proto.Message): def raw_page(self): return self - transferable_skus: MutableSequence[ - gcc_entitlements.TransferableSku - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcc_entitlements.TransferableSku, + transferable_skus: MutableSequence[gcc_entitlements.TransferableSku] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcc_entitlements.TransferableSku, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1099,12 +1097,12 @@ class ListCustomerRepricingConfigsResponse(proto.Message): def raw_page(self): return self - customer_repricing_configs: MutableSequence[ - repricing.CustomerRepricingConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=repricing.CustomerRepricingConfig, + customer_repricing_configs: MutableSequence[repricing.CustomerRepricingConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=repricing.CustomerRepricingConfig, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -2341,6 +2339,7 @@ class ChangeType(proto.Enum): SKU is a downgrade on the current entitlement. """ + CHANGE_TYPE_UNSPECIFIED = 0 UPGRADE = 1 DOWNGRADE = 2 @@ -2663,12 +2662,12 @@ class SkuPurchaseGroup(proto.Message): proto.STRING, number=1, ) - billing_account_purchase_infos: MutableSequence[ - "BillingAccountPurchaseInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="BillingAccountPurchaseInfo", + billing_account_purchase_infos: MutableSequence["BillingAccountPurchaseInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="BillingAccountPurchaseInfo", + ) ) @@ -2939,12 +2938,12 @@ class ListEntitlementChangesResponse(proto.Message): def raw_page(self): return self - entitlement_changes: MutableSequence[ - gcc_entitlement_changes.EntitlementChange - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcc_entitlement_changes.EntitlementChange, + entitlement_changes: MutableSequence[gcc_entitlement_changes.EntitlementChange] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcc_entitlement_changes.EntitlementChange, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/subscriber_event.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/subscriber_event.py index 4c08d87fd64f..3c7606a8f422 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/subscriber_event.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/subscriber_event.py @@ -54,6 +54,7 @@ class Type(proto.Enum): Primary domain of the customer has been verified. """ + TYPE_UNSPECIFIED = 0 PRIMARY_DOMAIN_CHANGED = 1 PRIMARY_DOMAIN_VERIFIED = 2 @@ -122,6 +123,7 @@ class Type(proto.Enum): LICENSE_CAP_CHANGED (13): License cap was changed for the entitlement. """ + TYPE_UNSPECIFIED = 0 CREATED = 1 PRICE_PLAN_SWITCHED = 3 diff --git a/packages/google-cloud-channel/mypy.ini b/packages/google-cloud-channel/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-channel/mypy.ini +++ b/packages/google-cloud-channel/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-channel/noxfile.py b/packages/google-cloud-channel/noxfile.py index c71c71424157..d1f200ed8c36 100644 --- a/packages/google-cloud-channel/noxfile.py +++ b/packages/google-cloud-channel/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_reports_service.py b/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_reports_service.py index 937b2e2b1b0a..706738b68ada 100644 --- a/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_reports_service.py +++ b/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_reports_service.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +40,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,18 +55,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.type.date_pb2 as date_pb2 # type: ignore -import google.type.datetime_pb2 as datetime_pb2 # type: ignore from google.cloud.channel_v1.services.cloud_channel_reports_service import ( CloudChannelReportsServiceAsyncClient, @@ -1000,10 +1001,9 @@ def test_cloud_channel_reports_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1048,10 +1048,9 @@ def test_cloud_channel_reports_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1087,10 +1086,9 @@ def test_cloud_channel_reports_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1342,9 +1340,7 @@ def test_cloud_channel_reports_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1710,9 +1706,9 @@ def test_fetch_report_results_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_report_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_report_results] = ( + mock_rpc + ) request = {} client.fetch_report_results(request) diff --git a/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_service.py b/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_service.py index ba612068ebb9..9c8a24eb202c 100644 --- a/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_service.py +++ b/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_service.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +40,17 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore +import google.type.decimal_pb2 as decimal_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,22 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore -import google.type.decimal_pb2 as decimal_pb2 # type: ignore -import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.cloud.channel_v1.services.cloud_channel_service import ( CloudChannelServiceAsyncClient, @@ -987,10 +988,9 @@ def test_cloud_channel_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1035,9 @@ def test_cloud_channel_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1074,10 +1073,9 @@ def test_cloud_channel_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1326,9 +1324,7 @@ def test_cloud_channel_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3902,9 +3898,9 @@ def test_list_entitlements_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entitlements - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entitlements] = ( + mock_rpc + ) request = {} client.list_entitlements(request) @@ -4370,9 +4366,9 @@ def test_list_transferable_skus_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transferable_skus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transferable_skus] = ( + mock_rpc + ) request = {} client.list_transferable_skus(request) @@ -5575,9 +5571,9 @@ def test_create_entitlement_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entitlement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entitlement] = ( + mock_rpc + ) request = {} client.create_entitlement(request) @@ -5836,9 +5832,9 @@ def test_change_parameters_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.change_parameters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.change_parameters] = ( + mock_rpc + ) request = {} client.change_parameters(request) @@ -6614,9 +6610,9 @@ def test_start_paid_service_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_paid_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_paid_service] = ( + mock_rpc + ) request = {} client.start_paid_service(request) @@ -6875,9 +6871,9 @@ def test_suspend_entitlement_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_entitlement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_entitlement] = ( + mock_rpc + ) request = {} client.suspend_entitlement(request) @@ -7136,9 +7132,9 @@ def test_cancel_entitlement_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_entitlement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_entitlement] = ( + mock_rpc + ) request = {} client.cancel_entitlement(request) @@ -7397,9 +7393,9 @@ def test_activate_entitlement_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.activate_entitlement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.activate_entitlement] = ( + mock_rpc + ) request = {} client.activate_entitlement(request) @@ -7661,9 +7657,9 @@ def test_transfer_entitlements_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.transfer_entitlements - ] = mock_rpc + client._transport._wrapped_methods[client._transport.transfer_entitlements] = ( + mock_rpc + ) request = {} client.transfer_entitlements(request) @@ -15911,9 +15907,9 @@ def test_list_purchasable_skus_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_purchasable_skus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_purchasable_skus] = ( + mock_rpc + ) request = {} client.list_purchasable_skus(request) @@ -17085,9 +17081,9 @@ def test_register_subscriber_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.register_subscriber - ] = mock_rpc + client._transport._wrapped_methods[client._transport.register_subscriber] = ( + mock_rpc + ) request = {} client.register_subscriber(request) @@ -17345,9 +17341,9 @@ def test_unregister_subscriber_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.unregister_subscriber - ] = mock_rpc + client._transport._wrapped_methods[client._transport.unregister_subscriber] = ( + mock_rpc + ) request = {} client.unregister_subscriber(request) @@ -17602,9 +17598,9 @@ def test_list_subscribers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_subscribers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_subscribers] = ( + mock_rpc + ) request = {} client.list_subscribers(request) diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/__init__.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/__init__.py index aa822e99ded8..e51581438276 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/__init__.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_access_control_service import ( DataAccessControlServiceAsyncClient, DataAccessControlServiceClient, diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/async_client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/async_client.py index df9e8ccf0396..f4e8e3e38e0b 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/async_client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -45,9 +45,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.chronicle_v1.services.data_access_control_service import pagers from google.cloud.chronicle_v1.types import data_access_control @@ -136,7 +136,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataAccessControlServiceAsyncClient: The constructed client. """ - return DataAccessControlServiceClient.from_service_account_info.__func__(DataAccessControlServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataAccessControlServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataAccessControlServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -152,7 +155,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataAccessControlServiceAsyncClient: The constructed client. """ - return DataAccessControlServiceClient.from_service_account_file.__func__(DataAccessControlServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataAccessControlServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + DataAccessControlServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -190,7 +198,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataAccessControlServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataAccessControlServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataAccessControlServiceTransport: diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/client.py index 1855cd556fb5..5f86d5e292c0 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -62,9 +62,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.chronicle_v1.services.data_access_control_service import pagers from google.cloud.chronicle_v1.types import data_access_control @@ -83,9 +83,7 @@ class DataAccessControlServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataAccessControlServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataAccessControlServiceTransport]] _transport_registry["grpc"] = DataAccessControlServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataAccessControlServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataAccessControlServiceRestTransport @@ -659,11 +657,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataAccessControlServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataAccessControlServiceClient._read_environment_variables() + ) self._client_cert_source = ( DataAccessControlServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -700,8 +696,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataAccessControlServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/pagers.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/pagers.py index 691eb92361c8..4f8af239ccf0 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/pagers.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -305,7 +305,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/__init__.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/__init__.py index b3d2a688a4a8..31bf01f3458c 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/__init__.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataAccessControlServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataAccessControlServiceTransport]] _transport_registry["grpc"] = DataAccessControlServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataAccessControlServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataAccessControlServiceRestTransport diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/base.py index e8b1bf0c259a..4e3f631edd04 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.chronicle_v1 import gapic_version as package_version from google.cloud.chronicle_v1.types import data_access_control @@ -393,13 +393,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc.py index e5eaf73d7021..254c494f03bc 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.chronicle_v1.types import data_access_control diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc_asyncio.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc_asyncio.py index f3a3da008563..72e806f45951 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.chronicle_v1.types import data_access_control diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest.py index 787546d8207e..eeeb89ba9386 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.chronicle_v1.types import data_access_control @@ -836,9 +836,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseCreateDataAccessLabel._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseCreateDataAccessLabel._get_http_options() request, metadata = self._interceptor.pre_create_data_access_label( request, metadata @@ -995,9 +993,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseCreateDataAccessScope._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseCreateDataAccessScope._get_http_options() request, metadata = self._interceptor.pre_create_data_access_scope( request, metadata @@ -1146,9 +1142,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseDeleteDataAccessLabel._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseDeleteDataAccessLabel._get_http_options() request, metadata = self._interceptor.pre_delete_data_access_label( request, metadata @@ -1256,9 +1250,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseDeleteDataAccessScope._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseDeleteDataAccessScope._get_http_options() request, metadata = self._interceptor.pre_delete_data_access_scope( request, metadata @@ -1372,9 +1364,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseGetDataAccessLabel._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseGetDataAccessLabel._get_http_options() request, metadata = self._interceptor.pre_get_data_access_label( request, metadata @@ -1527,9 +1517,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseGetDataAccessScope._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseGetDataAccessScope._get_http_options() request, metadata = self._interceptor.pre_get_data_access_scope( request, metadata @@ -1681,9 +1669,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseListDataAccessLabels._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseListDataAccessLabels._get_http_options() request, metadata = self._interceptor.pre_list_data_access_labels( request, metadata @@ -1835,9 +1821,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseListDataAccessScopes._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseListDataAccessScopes._get_http_options() request, metadata = self._interceptor.pre_list_data_access_scopes( request, metadata @@ -1990,9 +1974,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseUpdateDataAccessLabel._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseUpdateDataAccessLabel._get_http_options() request, metadata = self._interceptor.pre_update_data_access_label( request, metadata @@ -2149,9 +2131,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseUpdateDataAccessScope._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseUpdateDataAccessScope._get_http_options() request, metadata = self._interceptor.pre_update_data_access_scope( request, metadata @@ -2408,9 +2388,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2530,9 +2508,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2650,9 +2626,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataAccessControlServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2793,9 +2767,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataAccessControlServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest_base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest_base.py index 5901af8eed4e..9bd7d0e65fcc 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest_base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.chronicle_v1.types import data_access_control diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/async_client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/async_client.py index 171e220c288c..ac1b6a70f41b 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/async_client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -45,9 +45,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.chronicle_v1.services.entity_service import pagers from google.cloud.chronicle_v1.types import entity @@ -118,7 +118,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EntityServiceAsyncClient: The constructed client. """ - return EntityServiceClient.from_service_account_info.__func__(EntityServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EntityServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EntityServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +137,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EntityServiceAsyncClient: The constructed client. """ - return EntityServiceClient.from_service_account_file.__func__(EntityServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EntityServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EntityServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/client.py index 7de3912281e6..d16afa81e708 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -62,9 +62,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.chronicle_v1.services.entity_service import pagers from google.cloud.chronicle_v1.types import entity @@ -625,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EntityServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EntityServiceClient._read_environment_variables() + ) self._client_cert_source = EntityServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EntityServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/pagers.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/pagers.py index cf3a07b89446..71d4c575fc7b 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/pagers.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/base.py index 4f1e9642c2ad..ad4e07823be3 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.chronicle_v1 import gapic_version as package_version from google.cloud.chronicle_v1.types import entity @@ -281,13 +281,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc.py index 32b7a47985dc..acaf5dcf3575 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.chronicle_v1.types import entity diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc_asyncio.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc_asyncio.py index 4b594647af54..cccde9e213e0 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.chronicle_v1.types import entity diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest.py index 3a3625848e16..a9abe4a6a192 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.chronicle_v1.types import entity diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest_base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest_base.py index 5f3f6c25f7a9..ed3c8bea1819 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest_base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.chronicle_v1.types import entity diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/async_client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/async_client.py index 7bbb6337a72a..4af1dfba2eed 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/async_client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -117,7 +117,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: InstanceServiceAsyncClient: The constructed client. """ - return InstanceServiceClient.from_service_account_info.__func__(InstanceServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + InstanceServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(InstanceServiceAsyncClient, 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: InstanceServiceAsyncClient: The constructed client. """ - return InstanceServiceClient.from_service_account_file.__func__(InstanceServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + InstanceServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(InstanceServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/client.py index 4000169fa174..459aa599fc4a 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -80,9 +80,7 @@ class InstanceServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceServiceTransport]] _transport_registry["grpc"] = InstanceServiceGrpcTransport _transport_registry["grpc_asyncio"] = InstanceServiceGrpcAsyncIOTransport _transport_registry["rest"] = InstanceServiceRestTransport @@ -626,11 +624,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceServiceClient._read_environment_variables() + ) self._client_cert_source = InstanceServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +661,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/base.py index fc7c6565c636..f9aaf3982ff8 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version from google.cloud.chronicle_v1.types import instance @@ -215,13 +215,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc.py index 4f37e008d9f8..fa53ff6db62e 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.chronicle_v1.types import instance diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc_asyncio.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc_asyncio.py index 07861d9dd529..5ad003b8b197 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.chronicle_v1.types import instance diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/rest.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/rest.py index e598078744c0..e27467ec92a7 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/rest.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -525,9 +525,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseInstanceServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseInstanceServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -644,9 +642,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseInstanceServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseInstanceServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -901,9 +897,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseInstanceServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseInstanceServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseInstanceServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/async_client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/async_client.py index 7cf076cbca3f..62f34217416a 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/async_client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -45,13 +45,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.chronicle_v1.services.reference_list_service import pagers -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from .client import ReferenceListServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ReferenceListServiceTransport @@ -123,7 +123,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ReferenceListServiceAsyncClient: The constructed client. """ - return ReferenceListServiceClient.from_service_account_info.__func__(ReferenceListServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ReferenceListServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ReferenceListServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +142,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ReferenceListServiceAsyncClient: The constructed client. """ - return ReferenceListServiceClient.from_service_account_file.__func__(ReferenceListServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ReferenceListServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ReferenceListServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -177,7 +183,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ReferenceListServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ReferenceListServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ReferenceListServiceTransport: diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/client.py index bf9bc3d6b48d..bdffa01e29d2 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -62,13 +62,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.chronicle_v1.services.reference_list_service import pagers -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from .transports.base import DEFAULT_CLIENT_INFO, ReferenceListServiceTransport from .transports.grpc import ReferenceListServiceGrpcTransport @@ -84,9 +84,7 @@ class ReferenceListServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ReferenceListServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ReferenceListServiceTransport]] _transport_registry["grpc"] = ReferenceListServiceGrpcTransport _transport_registry["grpc_asyncio"] = ReferenceListServiceGrpcAsyncIOTransport _transport_registry["rest"] = ReferenceListServiceRestTransport @@ -634,11 +632,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReferenceListServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReferenceListServiceClient._read_environment_variables() + ) self._client_cert_source = ReferenceListServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -673,8 +669,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReferenceListServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/pagers.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/pagers.py index 99cc566cc5c7..69718ac61cb2 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/pagers.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/__init__.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/__init__.py index 4873910335ae..5dcd8cbdd655 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/__init__.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ReferenceListServiceRestInterceptor, ReferenceListServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ReferenceListServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ReferenceListServiceTransport]] _transport_registry["grpc"] = ReferenceListServiceGrpcTransport _transport_registry["grpc_asyncio"] = ReferenceListServiceGrpcAsyncIOTransport _transport_registry["rest"] = ReferenceListServiceRestTransport diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/base.py index 0402ecfd7f09..a3f5aaf69794 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/base.py @@ -17,18 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -276,13 +276,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc.py index 76583ba93787..79f266ee2179 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc.py @@ -16,21 +16,21 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from .base import DEFAULT_CLIENT_INFO, ReferenceListServiceTransport diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc_asyncio.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc_asyncio.py index 1d98b3c0f023..db9d4c4c0cab 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,13 +30,10 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from .base import DEFAULT_CLIENT_INFO, ReferenceListServiceTransport from .grpc import ReferenceListServiceGrpcTransport diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest.py index 4ea4a43d50bf..be673689e286 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest.py @@ -16,21 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseReferenceListServiceRestTransport @@ -559,9 +559,7 @@ def __call__( """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseCreateReferenceList._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseCreateReferenceList._get_http_options() request, metadata = self._interceptor.pre_create_reference_list( request, metadata @@ -720,9 +718,7 @@ def __call__( """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseGetReferenceList._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseGetReferenceList._get_http_options() request, metadata = self._interceptor.pre_get_reference_list( request, metadata @@ -872,9 +868,7 @@ def __call__( """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseListReferenceLists._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseListReferenceLists._get_http_options() request, metadata = self._interceptor.pre_list_reference_lists( request, metadata @@ -1028,9 +1022,7 @@ def __call__( """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseUpdateReferenceList._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseUpdateReferenceList._get_http_options() request, metadata = self._interceptor.pre_update_reference_list( request, metadata @@ -1228,9 +1220,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1348,9 +1338,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1466,9 +1454,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseReferenceListServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1607,9 +1593,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseReferenceListServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest_base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest_base.py index 8bae1e70e493..6f1160ede561 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest_base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest_base.py @@ -21,8 +21,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from .base import DEFAULT_CLIENT_INFO, ReferenceListServiceTransport diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/async_client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/async_client.py index d0d67fb43b2d..a06600a8c7a8 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/async_client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -47,10 +47,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_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 google.type.interval_pb2 as interval_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.chronicle_v1.services.rule_service import pagers from google.cloud.chronicle_v1.types import rule @@ -132,7 +132,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RuleServiceAsyncClient: The constructed client. """ - return RuleServiceClient.from_service_account_info.__func__(RuleServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + RuleServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(RuleServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +151,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RuleServiceAsyncClient: The constructed client. """ - return RuleServiceClient.from_service_account_file.__func__(RuleServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + RuleServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(RuleServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/client.py index 9296f7f369f3..497d3842d96e 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -64,10 +64,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_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 google.type.interval_pb2 as interval_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.chronicle_v1.services.rule_service import pagers from google.cloud.chronicle_v1.types import rule @@ -727,11 +727,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RuleServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RuleServiceClient._read_environment_variables() + ) self._client_cert_source = RuleServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -766,8 +764,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RuleServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/pagers.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/pagers.py index 8affd608a3a4..50c9ddc24e3f 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/pagers.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/base.py index b9a354f35629..94b95e641109 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.chronicle_v1 import gapic_version as package_version from google.cloud.chronicle_v1.types import rule @@ -428,13 +428,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc.py index cde262e23814..71e41a3ec547 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.chronicle_v1.types import rule from google.cloud.chronicle_v1.types import rule as gcc_rule diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc_asyncio.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc_asyncio.py index c8b30df136ba..6f01668b757e 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.chronicle_v1.types import rule from google.cloud.chronicle_v1.types import rule as gcc_rule diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest.py index 4d793735f2ae..43a7fe435369 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.chronicle_v1.types import rule @@ -1996,9 +1996,7 @@ def __call__( """ - http_options = ( - _BaseRuleServiceRestTransport._BaseListRuleDeployments._get_http_options() - ) + http_options = _BaseRuleServiceRestTransport._BaseListRuleDeployments._get_http_options() request, metadata = self._interceptor.pre_list_rule_deployments( request, metadata @@ -2603,9 +2601,7 @@ def __call__( """ - http_options = ( - _BaseRuleServiceRestTransport._BaseUpdateRuleDeployment._get_http_options() - ) + http_options = _BaseRuleServiceRestTransport._BaseUpdateRuleDeployment._get_http_options() request, metadata = self._interceptor.pre_update_rule_deployment( request, metadata diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest_base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest_base.py index 2ebfa03bd6c6..eddfd2de8392 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest_base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.chronicle_v1.types import rule from google.cloud.chronicle_v1.types import rule as gcc_rule diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/__init__.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/__init__.py index 399355c9fd56..00886c66dedf 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/__init__.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/__init__.py @@ -41,7 +41,10 @@ Watchlist, WatchlistUserPreferences, ) -from .instance import GetInstanceRequest, Instance +from .instance import ( + GetInstanceRequest, + Instance, +) from .reference_list import ( CreateReferenceListRequest, GetReferenceListRequest, diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/data_access_control.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/data_access_control.py index 22edafe0f7e7..58b3cc872e95 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/data_access_control.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/data_access_control.py @@ -520,19 +520,19 @@ class DataAccessScope(proto.Message): proto.STRING, number=1, ) - allowed_data_access_labels: MutableSequence[ - "DataAccessLabelReference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="DataAccessLabelReference", - ) - denied_data_access_labels: MutableSequence[ - "DataAccessLabelReference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="DataAccessLabelReference", + allowed_data_access_labels: MutableSequence["DataAccessLabelReference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="DataAccessLabelReference", + ) + ) + denied_data_access_labels: MutableSequence["DataAccessLabelReference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="DataAccessLabelReference", + ) ) display_name: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/reference_list.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/reference_list.py index 66d07ec40bc3..77274eb6b6a9 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/reference_list.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/reference_list.py @@ -54,6 +54,7 @@ class ReferenceListSyntaxType(proto.Enum): REFERENCE_LIST_SYNTAX_TYPE_CIDR (3): List contains only CIDR patterns. """ + REFERENCE_LIST_SYNTAX_TYPE_UNSPECIFIED = 0 REFERENCE_LIST_SYNTAX_TYPE_PLAIN_TEXT_STRING = 1 REFERENCE_LIST_SYNTAX_TYPE_REGEX = 2 @@ -79,6 +80,7 @@ class ReferenceListView(proto.Enum): metadata, content lines, associated rule counts. This is the default view for GetReferenceList. """ + REFERENCE_LIST_VIEW_UNSPECIFIED = 0 REFERENCE_LIST_VIEW_BASIC = 1 REFERENCE_LIST_VIEW_FULL = 2 diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/rule.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/rule.py index 360ba642dd96..6dcd1a898268 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/rule.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/rule.py @@ -70,6 +70,7 @@ class RunFrequency(proto.Enum): DAILY (3): Executes once per day. """ + RUN_FREQUENCY_UNSPECIFIED = 0 LIVE = 1 HOURLY = 2 @@ -90,6 +91,7 @@ class RuleType(proto.Enum): Rule checks for correlation between multiple events """ + RULE_TYPE_UNSPECIFIED = 0 SINGLE_EVENT = 1 MULTI_EVENT = 2 @@ -120,6 +122,7 @@ class RuleView(proto.Enum): Returned fields include: revision_id and revision_create_time. """ + RULE_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -221,6 +224,7 @@ class CompilationState(proto.Enum): This is possible if a backwards-incompatible change was made to the compiler. """ + COMPILATION_STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -292,12 +296,12 @@ class CompilationState(proto.Enum): proto.STRING, number=16, ) - compilation_diagnostics: MutableSequence[ - "CompilationDiagnostic" - ] = proto.RepeatedField( - proto.MESSAGE, - number=17, - message="CompilationDiagnostic", + compilation_diagnostics: MutableSequence["CompilationDiagnostic"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=17, + message="CompilationDiagnostic", + ) ) near_real_time_live_rule_eligible: bool = proto.Field( proto.BOOL, @@ -376,6 +380,7 @@ class ExecutionState(proto.Enum): PAUSED (3): Paused rules are not executed at all. """ + EXECUTION_STATE_UNSPECIFIED = 0 DEFAULT = 1 LIMITED = 2 @@ -468,6 +473,7 @@ class State(proto.Enum): FAILED (4): Failed state. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 DONE = 2 @@ -1056,6 +1062,7 @@ class Severity(proto.Enum): ERROR (2): A compilation error. """ + SEVERITY_UNSPECIFIED = 0 WARNING = 1 ERROR = 2 diff --git a/packages/google-cloud-chronicle/mypy.ini b/packages/google-cloud-chronicle/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-chronicle/mypy.ini +++ b/packages/google-cloud-chronicle/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-chronicle/noxfile.py b/packages/google-cloud-chronicle/noxfile.py index db0eb71ead15..fe0b6546af70 100644 --- a/packages/google-cloud-chronicle/noxfile.py +++ b/packages/google-cloud-chronicle/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_data_access_control_service.py b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_data_access_control_service.py index a0390722de2e..1f3297229075 100644 --- a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_data_access_control_service.py +++ b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_data_access_control_service.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,17 +44,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.chronicle_v1.services.data_access_control_service import ( DataAccessControlServiceAsyncClient, @@ -1007,10 +1012,9 @@ def test_data_access_control_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1055,10 +1059,9 @@ def test_data_access_control_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1094,10 +1097,9 @@ def test_data_access_control_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1358,9 +1360,7 @@ def test_data_access_control_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1873,9 +1873,9 @@ def test_get_data_access_label_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_access_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_access_label] = ( + mock_rpc + ) request = {} client.get_data_access_label(request) @@ -3875,9 +3875,9 @@ def test_get_data_access_scope_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_access_scope - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_access_scope] = ( + mock_rpc + ) request = {} client.get_data_access_scope(request) @@ -5635,9 +5635,9 @@ def test_get_data_access_label_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_access_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_access_label] = ( + mock_rpc + ) request = {} client.get_data_access_label(request) @@ -6677,9 +6677,9 @@ def test_get_data_access_scope_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_access_scope - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_access_scope] = ( + mock_rpc + ) request = {} client.get_data_access_scope(request) diff --git a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_entity_service.py b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_entity_service.py index f60c800b9f5f..02809183dda4 100644 --- a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_entity_service.py +++ b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_entity_service.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,17 +44,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.chronicle_v1.services.entity_service import ( EntityServiceAsyncClient, @@ -945,10 +950,9 @@ def test_entity_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +997,9 @@ def test_entity_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1035,9 @@ def test_entity_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1282,9 +1284,7 @@ def test_entity_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2251,9 +2251,9 @@ def test_create_watchlist_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_watchlist - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_watchlist] = ( + mock_rpc + ) request = {} client.create_watchlist(request) @@ -2600,9 +2600,9 @@ def test_update_watchlist_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_watchlist - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_watchlist] = ( + mock_rpc + ) request = {} client.update_watchlist(request) @@ -2934,9 +2934,9 @@ def test_delete_watchlist_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_watchlist - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_watchlist] = ( + mock_rpc + ) request = {} client.delete_watchlist(request) @@ -3634,9 +3634,9 @@ def test_create_watchlist_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_watchlist - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_watchlist] = ( + mock_rpc + ) request = {} client.create_watchlist(request) @@ -3831,9 +3831,9 @@ def test_update_watchlist_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_watchlist - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_watchlist] = ( + mock_rpc + ) request = {} client.update_watchlist(request) @@ -4015,9 +4015,9 @@ def test_delete_watchlist_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_watchlist - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_watchlist] = ( + mock_rpc + ) request = {} client.delete_watchlist(request) diff --git a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_instance_service.py b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_instance_service.py index fcd250ed91b6..fcd77ed55c36 100644 --- a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_instance_service.py +++ b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_instance_service.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,11 +44,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -970,10 +975,9 @@ def test_instance_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1022,9 @@ def test_instance_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1060,9 @@ def test_instance_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1307,9 +1309,7 @@ def test_instance_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_reference_list_service.py b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_reference_list_service.py index 4081d835784f..38cb9f93667f 100644 --- a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_reference_list_service.py +++ b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_reference_list_service.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,17 +44,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.chronicle_v1.services.reference_list_service import ( ReferenceListServiceAsyncClient, @@ -62,8 +67,8 @@ pagers, transports, ) -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -997,10 +1002,9 @@ def test_reference_list_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1049,9 @@ def test_reference_list_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1084,10 +1087,9 @@ def test_reference_list_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1347,9 +1349,7 @@ def test_reference_list_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1475,9 +1475,9 @@ def test_get_reference_list_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_reference_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_reference_list] = ( + mock_rpc + ) request = {} client.get_reference_list(request) @@ -1831,9 +1831,9 @@ def test_list_reference_lists_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_reference_lists - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_reference_lists] = ( + mock_rpc + ) request = {} client.list_reference_lists(request) @@ -2391,9 +2391,9 @@ def test_create_reference_list_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_reference_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_reference_list] = ( + mock_rpc + ) request = {} client.create_reference_list(request) @@ -2776,9 +2776,9 @@ def test_update_reference_list_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_reference_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_reference_list] = ( + mock_rpc + ) request = {} client.update_reference_list(request) @@ -3073,9 +3073,9 @@ def test_get_reference_list_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_reference_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_reference_list] = ( + mock_rpc + ) request = {} client.get_reference_list(request) @@ -3259,9 +3259,9 @@ def test_list_reference_lists_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_reference_lists - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_reference_lists] = ( + mock_rpc + ) request = {} client.list_reference_lists(request) @@ -3526,9 +3526,9 @@ def test_create_reference_list_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_reference_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_reference_list] = ( + mock_rpc + ) request = {} client.create_reference_list(request) @@ -3740,9 +3740,9 @@ def test_update_reference_list_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_reference_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_reference_list] = ( + mock_rpc + ) request = {} client.update_reference_list(request) diff --git a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_rule_service.py b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_rule_service.py index 66161af76ccc..620fdf044788 100644 --- a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_rule_service.py +++ b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_rule_service.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,18 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.interval_pb2 as interval_pb2 # type: ignore from google.cloud.chronicle_v1.services.rule_service import ( RuleServiceAsyncClient, @@ -937,10 +937,9 @@ def test_rule_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_rule_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_rule_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1260,9 +1257,7 @@ def test_rule_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3310,9 +3305,9 @@ def test_list_rule_revisions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_rule_revisions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_rule_revisions] = ( + mock_rpc + ) request = {} client.list_rule_revisions(request) @@ -3844,9 +3839,9 @@ def test_create_retrohunt_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_retrohunt - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_retrohunt] = ( + mock_rpc + ) request = {} client.create_retrohunt(request) @@ -5054,9 +5049,9 @@ def test_get_rule_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_rule_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_rule_deployment] = ( + mock_rpc + ) request = {} client.get_rule_deployment(request) @@ -5410,9 +5405,9 @@ def test_list_rule_deployments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_rule_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_rule_deployments] = ( + mock_rpc + ) request = {} client.list_rule_deployments(request) @@ -5964,9 +5959,9 @@ def test_update_rule_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_rule_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_rule_deployment] = ( + mock_rpc + ) request = {} client.update_rule_deployment(request) @@ -7241,9 +7236,9 @@ def test_list_rule_revisions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_rule_revisions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_rule_revisions] = ( + mock_rpc + ) request = {} client.list_rule_revisions(request) @@ -7503,9 +7498,9 @@ def test_create_retrohunt_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_retrohunt - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_retrohunt] = ( + mock_rpc + ) request = {} client.create_retrohunt(request) @@ -8133,9 +8128,9 @@ def test_get_rule_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_rule_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_rule_deployment] = ( + mock_rpc + ) request = {} client.get_rule_deployment(request) @@ -8318,9 +8313,9 @@ def test_list_rule_deployments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_rule_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_rule_deployments] = ( + mock_rpc + ) request = {} client.list_rule_deployments(request) @@ -8583,9 +8578,9 @@ def test_update_rule_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_rule_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_rule_deployment] = ( + mock_rpc + ) request = {} client.update_rule_deployment(request) diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/__init__.py index eb8e14b670ab..3208f1618be8 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_controls_partner_core import ( CloudControlsPartnerCoreAsyncClient, CloudControlsPartnerCoreClient, diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/async_client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/async_client.py index 566300f0c42e..b50b097c6529 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/async_client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1 import gapic_version as package_version @@ -158,7 +158,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudControlsPartnerCoreAsyncClient: The constructed client. """ - return CloudControlsPartnerCoreClient.from_service_account_info.__func__(CloudControlsPartnerCoreAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudControlsPartnerCoreClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CloudControlsPartnerCoreAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -174,7 +177,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudControlsPartnerCoreAsyncClient: The constructed client. """ - return CloudControlsPartnerCoreClient.from_service_account_file.__func__(CloudControlsPartnerCoreAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudControlsPartnerCoreClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + CloudControlsPartnerCoreAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -212,7 +220,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudControlsPartnerCoreClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudControlsPartnerCoreClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudControlsPartnerCoreTransport: diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/client.py index 1fd8a77359fe..2c1af5775759 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1 import gapic_version as package_version @@ -90,9 +90,7 @@ class CloudControlsPartnerCoreClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] _transport_registry["grpc"] = CloudControlsPartnerCoreGrpcTransport _transport_registry["grpc_asyncio"] = CloudControlsPartnerCoreGrpcAsyncIOTransport _transport_registry["rest"] = CloudControlsPartnerCoreRestTransport @@ -756,11 +754,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudControlsPartnerCoreClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudControlsPartnerCoreClient._read_environment_variables() + ) self._client_cert_source = ( CloudControlsPartnerCoreClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -797,8 +793,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudControlsPartnerCoreTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/pagers.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/pagers.py index 251cae2b4a67..107607ad627c 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/pagers.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -147,7 +147,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -385,7 +385,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -467,7 +467,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/__init__.py index 7e12015112d7..ef4b94fbb7f7 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] _transport_registry["grpc"] = CloudControlsPartnerCoreGrpcTransport _transport_registry["grpc_asyncio"] = CloudControlsPartnerCoreGrpcAsyncIOTransport _transport_registry["rest"] = CloudControlsPartnerCoreRestTransport diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/base.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/base.py index 02385e0622a2..28b243ecc164 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/base.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1 import gapic_version as package_version from google.cloud.cloudcontrolspartner_v1.types import ( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc.py index 00eb122e1f3c..ea5bc98c2bbe 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.cloudcontrolspartner_v1.types import ( access_approval_requests, @@ -517,12 +517,12 @@ def list_access_approval_requests( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_access_approval_requests" not in self._stubs: - self._stubs[ - "list_access_approval_requests" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudcontrolspartner.v1.CloudControlsPartnerCore/ListAccessApprovalRequests", - request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, - response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + self._stubs["list_access_approval_requests"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudcontrolspartner.v1.CloudControlsPartnerCore/ListAccessApprovalRequests", + request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, + response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + ) ) return self._stubs["list_access_approval_requests"] diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc_asyncio.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc_asyncio.py index a4b26766d748..936173fa0180 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudcontrolspartner_v1.types import ( access_approval_requests, @@ -530,12 +530,12 @@ def list_access_approval_requests( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_access_approval_requests" not in self._stubs: - self._stubs[ - "list_access_approval_requests" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudcontrolspartner.v1.CloudControlsPartnerCore/ListAccessApprovalRequests", - request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, - response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + self._stubs["list_access_approval_requests"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudcontrolspartner.v1.CloudControlsPartnerCore/ListAccessApprovalRequests", + request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, + response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + ) ) return self._stubs["list_access_approval_requests"] diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest.py index 4254be8ce3e3..38fb53b700b6 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.cloudcontrolspartner_v1.types import ( @@ -809,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseCreateCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseCreateCustomer._get_http_options() request, metadata = self._interceptor.pre_create_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseCreateCustomer._get_transcoded_request( @@ -957,9 +955,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseDeleteCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseDeleteCustomer._get_http_options() request, metadata = self._interceptor.pre_delete_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseDeleteCustomer._get_transcoded_request( @@ -1072,9 +1068,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetCustomer._get_http_options() request, metadata = self._interceptor.pre_get_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseGetCustomer._get_transcoded_request( @@ -1220,9 +1214,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetEkmConnections._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetEkmConnections._get_http_options() request, metadata = self._interceptor.pre_get_ekm_connections( request, metadata @@ -1369,9 +1361,7 @@ def __call__( Message describing Partner resource """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartner._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartner._get_http_options() request, metadata = self._interceptor.pre_get_partner(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartner._get_transcoded_request( @@ -1517,9 +1507,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartnerPermissions._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartnerPermissions._get_http_options() request, metadata = self._interceptor.pre_get_partner_permissions( request, metadata @@ -1670,9 +1658,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetWorkload._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetWorkload._get_http_options() request, metadata = self._interceptor.pre_get_workload(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseGetWorkload._get_transcoded_request( @@ -1821,9 +1807,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseListAccessApprovalRequests._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseListAccessApprovalRequests._get_http_options() request, metadata = self._interceptor.pre_list_access_approval_requests( request, metadata @@ -1889,11 +1873,10 @@ def __call__( resp = self._interceptor.post_list_access_approval_requests(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_access_approval_requests_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_access_approval_requests_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1977,9 +1960,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseListCustomers._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseListCustomers._get_http_options() request, metadata = self._interceptor.pre_list_customers(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseListCustomers._get_transcoded_request( @@ -2126,9 +2107,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseListWorkloads._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseListWorkloads._get_http_options() request, metadata = self._interceptor.pre_list_workloads(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseListWorkloads._get_transcoded_request( @@ -2278,9 +2257,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseUpdateCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseUpdateCustomer._get_http_options() request, metadata = self._interceptor.pre_update_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseUpdateCustomer._get_transcoded_request( @@ -2443,7 +2420,9 @@ def list_access_approval_requests( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListAccessApprovalRequests(self._session, self._host, self._interceptor) # type: ignore + return self._ListAccessApprovalRequests( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_customers( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest_base.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest_base.py index bf8d51c5cc75..404953da76c9 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest_base.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1.types import ( access_approval_requests, diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/async_client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/async_client.py index 113c8274cdda..f188350205e2 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/async_client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1 import gapic_version as package_version @@ -130,7 +130,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudControlsPartnerMonitoringAsyncClient: The constructed client. """ - return CloudControlsPartnerMonitoringClient.from_service_account_info.__func__(CloudControlsPartnerMonitoringAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudControlsPartnerMonitoringClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + CloudControlsPartnerMonitoringAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +151,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudControlsPartnerMonitoringAsyncClient: The constructed client. """ - return CloudControlsPartnerMonitoringClient.from_service_account_file.__func__(CloudControlsPartnerMonitoringAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudControlsPartnerMonitoringClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + CloudControlsPartnerMonitoringAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -184,7 +194,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudControlsPartnerMonitoringClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudControlsPartnerMonitoringClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudControlsPartnerMonitoringTransport: diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/client.py index cc60429273eb..464e67d53ec6 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1 import gapic_version as package_version @@ -85,13 +85,11 @@ class CloudControlsPartnerMonitoringClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] _transport_registry["grpc"] = CloudControlsPartnerMonitoringGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = CloudControlsPartnerMonitoringGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + CloudControlsPartnerMonitoringGrpcAsyncIOTransport + ) _transport_registry["rest"] = CloudControlsPartnerMonitoringRestTransport def get_transport_class( @@ -645,11 +643,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudControlsPartnerMonitoringClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudControlsPartnerMonitoringClient._read_environment_variables() + ) self._client_cert_source = ( CloudControlsPartnerMonitoringClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -690,8 +686,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudControlsPartnerMonitoringTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/pagers.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/pagers.py index b38d5b9651ca..6eb22bbb71e3 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/pagers.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/__init__.py index 0e065d4f866c..55f3aa972f1d 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] _transport_registry["grpc"] = CloudControlsPartnerMonitoringGrpcTransport _transport_registry["grpc_asyncio"] = CloudControlsPartnerMonitoringGrpcAsyncIOTransport _transport_registry["rest"] = CloudControlsPartnerMonitoringRestTransport diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/base.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/base.py index 12f6676d5fd9..d132da0a21cc 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/base.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1 import gapic_version as package_version from google.cloud.cloudcontrolspartner_v1.types import violations diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc.py index 50b4fbb60742..b3c2aa0643f5 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.cloudcontrolspartner_v1.types import violations diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py index 7f24d654b836..4ae8471f554e 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudcontrolspartner_v1.types import violations diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/rest.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/rest.py index fe30f345d92b..80beea881acb 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/rest.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -337,9 +337,7 @@ def __call__( Details of resource Violation """ - http_options = ( - _BaseCloudControlsPartnerMonitoringRestTransport._BaseGetViolation._get_http_options() - ) + http_options = _BaseCloudControlsPartnerMonitoringRestTransport._BaseGetViolation._get_http_options() request, metadata = self._interceptor.pre_get_violation(request, metadata) transcoded_request = _BaseCloudControlsPartnerMonitoringRestTransport._BaseGetViolation._get_transcoded_request( @@ -487,9 +485,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerMonitoringRestTransport._BaseListViolations._get_http_options() - ) + http_options = _BaseCloudControlsPartnerMonitoringRestTransport._BaseListViolations._get_http_options() request, metadata = self._interceptor.pre_list_violations(request, metadata) transcoded_request = _BaseCloudControlsPartnerMonitoringRestTransport._BaseListViolations._get_transcoded_request( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/__init__.py index 628600477002..4ddab3b759da 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/__init__.py @@ -19,8 +19,12 @@ ListAccessApprovalRequestsRequest, ListAccessApprovalRequestsResponse, ) -from .completion_state import CompletionState -from .core import OperationMetadata +from .completion_state import ( + CompletionState, +) +from .core import ( + OperationMetadata, +) from .customer_workloads import ( GetWorkloadRequest, ListWorkloadsRequest, @@ -40,9 +44,21 @@ ListCustomersResponse, UpdateCustomerRequest, ) -from .ekm_connections import EkmConnection, EkmConnections, GetEkmConnectionsRequest -from .partner_permissions import GetPartnerPermissionsRequest, PartnerPermissions -from .partners import EkmMetadata, GetPartnerRequest, Partner, Sku +from .ekm_connections import ( + EkmConnection, + EkmConnections, + GetEkmConnectionsRequest, +) +from .partner_permissions import ( + GetPartnerPermissionsRequest, + PartnerPermissions, +) +from .partners import ( + EkmMetadata, + GetPartnerRequest, + Partner, + Sku, +) from .violations import ( GetViolationRequest, ListViolationsRequest, diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/access_approval_requests.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/access_approval_requests.py index d2045b1467f5..608a840b97f2 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/access_approval_requests.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/access_approval_requests.py @@ -134,12 +134,12 @@ class ListAccessApprovalRequestsResponse(proto.Message): def raw_page(self): return self - access_approval_requests: MutableSequence[ - "AccessApprovalRequest" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AccessApprovalRequest", + access_approval_requests: MutableSequence["AccessApprovalRequest"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AccessApprovalRequest", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -206,6 +206,7 @@ class Type(proto.Enum): outage, or for security, fraud, abuse, or compliance review purposes. """ + TYPE_UNSPECIFIED = 0 CUSTOMER_INITIATED_SUPPORT = 1 GOOGLE_INITIATED_SERVICE = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/completion_state.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/completion_state.py index 9a21336fd3ff..20838bd88481 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/completion_state.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/completion_state.py @@ -43,6 +43,7 @@ class CompletionState(proto.Enum): NOT_APPLICABLE (4): Not applicable state. """ + COMPLETION_STATE_UNSPECIFIED = 0 PENDING = 1 SUCCEEDED = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customer_workloads.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customer_workloads.py index 480400c42ae0..a326298a4a4d 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customer_workloads.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customer_workloads.py @@ -90,6 +90,7 @@ class Partner(proto.Enum): Arabia) partner offering without EKM provisioning. """ + PARTNER_UNSPECIFIED = 0 PARTNER_LOCAL_CONTROLS_BY_S3NS = 1 PARTNER_SOVEREIGN_CONTROLS_BY_T_SYSTEMS = 2 @@ -271,6 +272,7 @@ class Step(proto.Enum): SIGNED_ACCESS_APPROVAL_CONFIGURED (2): Signed Access Approval step. """ + STEP_UNSPECIFIED = 0 EKM_PROVISIONED = 1 SIGNED_ACCESS_APPROVAL_CONFIGURED = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customers.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customers.py index 5649227b559d..947efcdfc0aa 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customers.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customers.py @@ -248,6 +248,7 @@ class Step(proto.Enum): CUSTOMER_ENVIRONMENT (2): Customer Environment """ + STEP_UNSPECIFIED = 0 KAJ_ENROLLMENT = 1 CUSTOMER_ENVIRONMENT = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/ekm_connections.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/ekm_connections.py index d5805d7702ce..d03a4e862c9b 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/ekm_connections.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/ekm_connections.py @@ -96,6 +96,7 @@ class ConnectionState(proto.Enum): PERMISSION_DENIED (4): Permission denied EKM connection state """ + CONNECTION_STATE_UNSPECIFIED = 0 AVAILABLE = 1 NOT_AVAILABLE = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partner_permissions.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partner_permissions.py index cc24dc640f87..ccfeb95e10b8 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partner_permissions.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partner_permissions.py @@ -61,6 +61,7 @@ class Permission(proto.Enum): Permission for support case details for Access Transparency log entries """ + PERMISSION_UNSPECIFIED = 0 ACCESS_TRANSPARENCY_AND_EMERGENCY_ACCESS_LOGS = 1 ASSURED_WORKLOADS_MONITORING = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partners.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partners.py index 67708cb25878..a1f261920da6 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partners.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partners.py @@ -168,6 +168,7 @@ class EkmSolution(proto.Enum): VIRTRU (4): This enum value is never used. """ + EKM_SOLUTION_UNSPECIFIED = 0 FORTANIX = 1 FUTUREX = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/violations.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/violations.py index e53fe60fb93d..feada4ca5d34 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/violations.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/violations.py @@ -85,6 +85,7 @@ class State(proto.Enum): EXCEPTION (3): Violation is Exception """ + STATE_UNSPECIFIED = 0 RESOLVED = 1 UNRESOLVED = 2 @@ -132,6 +133,7 @@ class RemediationType(proto.Enum): REMEDIATION_RESOURCE_VIOLATION (5): Remediation type for resource violation. """ + REMEDIATION_TYPE_UNSPECIFIED = 0 REMEDIATION_BOOLEAN_ORG_POLICY_VIOLATION = 1 REMEDIATION_LIST_ALLOWED_VALUES_ORG_POLICY_VIOLATION = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/__init__.py index 8c462d7059c0..f067f9a662fb 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_controls_partner_core import ( CloudControlsPartnerCoreAsyncClient, CloudControlsPartnerCoreClient, diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/async_client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/async_client.py index 130c33c87b9a..5fa9d69911bb 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/async_client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1beta import gapic_version as package_version @@ -158,7 +158,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudControlsPartnerCoreAsyncClient: The constructed client. """ - return CloudControlsPartnerCoreClient.from_service_account_info.__func__(CloudControlsPartnerCoreAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudControlsPartnerCoreClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CloudControlsPartnerCoreAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -174,7 +177,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudControlsPartnerCoreAsyncClient: The constructed client. """ - return CloudControlsPartnerCoreClient.from_service_account_file.__func__(CloudControlsPartnerCoreAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudControlsPartnerCoreClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + CloudControlsPartnerCoreAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -212,7 +220,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudControlsPartnerCoreClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudControlsPartnerCoreClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudControlsPartnerCoreTransport: diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/client.py index 0f3972fdd668..99df982544ab 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1beta import gapic_version as package_version @@ -90,9 +90,7 @@ class CloudControlsPartnerCoreClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] _transport_registry["grpc"] = CloudControlsPartnerCoreGrpcTransport _transport_registry["grpc_asyncio"] = CloudControlsPartnerCoreGrpcAsyncIOTransport _transport_registry["rest"] = CloudControlsPartnerCoreRestTransport @@ -756,11 +754,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudControlsPartnerCoreClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudControlsPartnerCoreClient._read_environment_variables() + ) self._client_cert_source = ( CloudControlsPartnerCoreClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -797,8 +793,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudControlsPartnerCoreTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/pagers.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/pagers.py index 4e8c89bebbc7..12fad950ab4d 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/pagers.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -147,7 +147,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -385,7 +385,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -467,7 +467,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/__init__.py index 7e12015112d7..ef4b94fbb7f7 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] _transport_registry["grpc"] = CloudControlsPartnerCoreGrpcTransport _transport_registry["grpc_asyncio"] = CloudControlsPartnerCoreGrpcAsyncIOTransport _transport_registry["rest"] = CloudControlsPartnerCoreRestTransport diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/base.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/base.py index 72440126ab99..aaee1524e8a4 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/base.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1beta import gapic_version as package_version from google.cloud.cloudcontrolspartner_v1beta.types import ( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc.py index b51b559500fa..ec73460e8b8c 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.cloudcontrolspartner_v1beta.types import ( access_approval_requests, @@ -517,12 +517,12 @@ def list_access_approval_requests( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_access_approval_requests" not in self._stubs: - self._stubs[ - "list_access_approval_requests" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudcontrolspartner.v1beta.CloudControlsPartnerCore/ListAccessApprovalRequests", - request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, - response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + self._stubs["list_access_approval_requests"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudcontrolspartner.v1beta.CloudControlsPartnerCore/ListAccessApprovalRequests", + request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, + response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + ) ) return self._stubs["list_access_approval_requests"] diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc_asyncio.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc_asyncio.py index 3439a1109f44..46428aeb36a6 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudcontrolspartner_v1beta.types import ( access_approval_requests, @@ -530,12 +530,12 @@ def list_access_approval_requests( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_access_approval_requests" not in self._stubs: - self._stubs[ - "list_access_approval_requests" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudcontrolspartner.v1beta.CloudControlsPartnerCore/ListAccessApprovalRequests", - request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, - response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + self._stubs["list_access_approval_requests"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudcontrolspartner.v1beta.CloudControlsPartnerCore/ListAccessApprovalRequests", + request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, + response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + ) ) return self._stubs["list_access_approval_requests"] diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest.py index 6ef2e3ba628a..7631542f2a9d 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.cloudcontrolspartner_v1beta.types import ( @@ -809,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseCreateCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseCreateCustomer._get_http_options() request, metadata = self._interceptor.pre_create_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseCreateCustomer._get_transcoded_request( @@ -957,9 +955,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseDeleteCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseDeleteCustomer._get_http_options() request, metadata = self._interceptor.pre_delete_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseDeleteCustomer._get_transcoded_request( @@ -1072,9 +1068,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetCustomer._get_http_options() request, metadata = self._interceptor.pre_get_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseGetCustomer._get_transcoded_request( @@ -1220,9 +1214,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetEkmConnections._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetEkmConnections._get_http_options() request, metadata = self._interceptor.pre_get_ekm_connections( request, metadata @@ -1369,9 +1361,7 @@ def __call__( Message describing Partner resource """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartner._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartner._get_http_options() request, metadata = self._interceptor.pre_get_partner(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartner._get_transcoded_request( @@ -1517,9 +1507,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartnerPermissions._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartnerPermissions._get_http_options() request, metadata = self._interceptor.pre_get_partner_permissions( request, metadata @@ -1670,9 +1658,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetWorkload._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetWorkload._get_http_options() request, metadata = self._interceptor.pre_get_workload(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseGetWorkload._get_transcoded_request( @@ -1821,9 +1807,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseListAccessApprovalRequests._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseListAccessApprovalRequests._get_http_options() request, metadata = self._interceptor.pre_list_access_approval_requests( request, metadata @@ -1889,11 +1873,10 @@ def __call__( resp = self._interceptor.post_list_access_approval_requests(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_access_approval_requests_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_access_approval_requests_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1977,9 +1960,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseListCustomers._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseListCustomers._get_http_options() request, metadata = self._interceptor.pre_list_customers(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseListCustomers._get_transcoded_request( @@ -2126,9 +2107,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseListWorkloads._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseListWorkloads._get_http_options() request, metadata = self._interceptor.pre_list_workloads(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseListWorkloads._get_transcoded_request( @@ -2278,9 +2257,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseUpdateCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseUpdateCustomer._get_http_options() request, metadata = self._interceptor.pre_update_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseUpdateCustomer._get_transcoded_request( @@ -2443,7 +2420,9 @@ def list_access_approval_requests( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListAccessApprovalRequests(self._session, self._host, self._interceptor) # type: ignore + return self._ListAccessApprovalRequests( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_customers( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest_base.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest_base.py index 6c057fc6b3aa..d550d525d5bd 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest_base.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1beta.types import ( access_approval_requests, diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/async_client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/async_client.py index 2773169b8929..cb727541ff34 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/async_client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1beta import gapic_version as package_version @@ -130,7 +130,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudControlsPartnerMonitoringAsyncClient: The constructed client. """ - return CloudControlsPartnerMonitoringClient.from_service_account_info.__func__(CloudControlsPartnerMonitoringAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudControlsPartnerMonitoringClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + CloudControlsPartnerMonitoringAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +151,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudControlsPartnerMonitoringAsyncClient: The constructed client. """ - return CloudControlsPartnerMonitoringClient.from_service_account_file.__func__(CloudControlsPartnerMonitoringAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudControlsPartnerMonitoringClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + CloudControlsPartnerMonitoringAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -184,7 +194,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudControlsPartnerMonitoringClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudControlsPartnerMonitoringClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudControlsPartnerMonitoringTransport: diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/client.py index 2a8c09b7b868..16b12d6e5745 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1beta import gapic_version as package_version @@ -85,13 +85,11 @@ class CloudControlsPartnerMonitoringClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] _transport_registry["grpc"] = CloudControlsPartnerMonitoringGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = CloudControlsPartnerMonitoringGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + CloudControlsPartnerMonitoringGrpcAsyncIOTransport + ) _transport_registry["rest"] = CloudControlsPartnerMonitoringRestTransport def get_transport_class( @@ -645,11 +643,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudControlsPartnerMonitoringClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudControlsPartnerMonitoringClient._read_environment_variables() + ) self._client_cert_source = ( CloudControlsPartnerMonitoringClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -690,8 +686,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudControlsPartnerMonitoringTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/pagers.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/pagers.py index 2fd3289be70f..e0fcfd09968d 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/pagers.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/__init__.py index 0e065d4f866c..55f3aa972f1d 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] _transport_registry["grpc"] = CloudControlsPartnerMonitoringGrpcTransport _transport_registry["grpc_asyncio"] = CloudControlsPartnerMonitoringGrpcAsyncIOTransport _transport_registry["rest"] = CloudControlsPartnerMonitoringRestTransport diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/base.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/base.py index 6dc57586c1ce..43c836078926 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/base.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1beta import gapic_version as package_version from google.cloud.cloudcontrolspartner_v1beta.types import violations diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc.py index fba5924341e1..76b17116f731 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.cloudcontrolspartner_v1beta.types import violations diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py index de6b0dceb645..4d382f41e2c2 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudcontrolspartner_v1beta.types import violations diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/rest.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/rest.py index 3c63f099f0d9..1da4a7e933c6 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/rest.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -337,9 +337,7 @@ def __call__( Details of resource Violation """ - http_options = ( - _BaseCloudControlsPartnerMonitoringRestTransport._BaseGetViolation._get_http_options() - ) + http_options = _BaseCloudControlsPartnerMonitoringRestTransport._BaseGetViolation._get_http_options() request, metadata = self._interceptor.pre_get_violation(request, metadata) transcoded_request = _BaseCloudControlsPartnerMonitoringRestTransport._BaseGetViolation._get_transcoded_request( @@ -487,9 +485,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerMonitoringRestTransport._BaseListViolations._get_http_options() - ) + http_options = _BaseCloudControlsPartnerMonitoringRestTransport._BaseListViolations._get_http_options() request, metadata = self._interceptor.pre_list_violations(request, metadata) transcoded_request = _BaseCloudControlsPartnerMonitoringRestTransport._BaseListViolations._get_transcoded_request( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/__init__.py index 628600477002..4ddab3b759da 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/__init__.py @@ -19,8 +19,12 @@ ListAccessApprovalRequestsRequest, ListAccessApprovalRequestsResponse, ) -from .completion_state import CompletionState -from .core import OperationMetadata +from .completion_state import ( + CompletionState, +) +from .core import ( + OperationMetadata, +) from .customer_workloads import ( GetWorkloadRequest, ListWorkloadsRequest, @@ -40,9 +44,21 @@ ListCustomersResponse, UpdateCustomerRequest, ) -from .ekm_connections import EkmConnection, EkmConnections, GetEkmConnectionsRequest -from .partner_permissions import GetPartnerPermissionsRequest, PartnerPermissions -from .partners import EkmMetadata, GetPartnerRequest, Partner, Sku +from .ekm_connections import ( + EkmConnection, + EkmConnections, + GetEkmConnectionsRequest, +) +from .partner_permissions import ( + GetPartnerPermissionsRequest, + PartnerPermissions, +) +from .partners import ( + EkmMetadata, + GetPartnerRequest, + Partner, + Sku, +) from .violations import ( GetViolationRequest, ListViolationsRequest, diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/access_approval_requests.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/access_approval_requests.py index ac94dc0242e7..116db51e4e59 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/access_approval_requests.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/access_approval_requests.py @@ -134,12 +134,12 @@ class ListAccessApprovalRequestsResponse(proto.Message): def raw_page(self): return self - access_approval_requests: MutableSequence[ - "AccessApprovalRequest" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AccessApprovalRequest", + access_approval_requests: MutableSequence["AccessApprovalRequest"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AccessApprovalRequest", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -206,6 +206,7 @@ class Type(proto.Enum): outage, or for security, fraud, abuse, or compliance review purposes. """ + TYPE_UNSPECIFIED = 0 CUSTOMER_INITIATED_SUPPORT = 1 GOOGLE_INITIATED_SERVICE = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/completion_state.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/completion_state.py index d45697509278..a48778b6b32f 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/completion_state.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/completion_state.py @@ -43,6 +43,7 @@ class CompletionState(proto.Enum): NOT_APPLICABLE (4): Not applicable state. """ + COMPLETION_STATE_UNSPECIFIED = 0 PENDING = 1 SUCCEEDED = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customer_workloads.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customer_workloads.py index 516c59501be4..7d42f7900ad4 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customer_workloads.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customer_workloads.py @@ -90,6 +90,7 @@ class Partner(proto.Enum): Arabia) partner offering without EKM provisioning. """ + PARTNER_UNSPECIFIED = 0 PARTNER_LOCAL_CONTROLS_BY_S3NS = 1 PARTNER_SOVEREIGN_CONTROLS_BY_T_SYSTEMS = 2 @@ -271,6 +272,7 @@ class Step(proto.Enum): SIGNED_ACCESS_APPROVAL_CONFIGURED (2): Signed Access Approval step. """ + STEP_UNSPECIFIED = 0 EKM_PROVISIONED = 1 SIGNED_ACCESS_APPROVAL_CONFIGURED = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customers.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customers.py index 3c3e0bb92d64..07f4f4b40361 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customers.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customers.py @@ -248,6 +248,7 @@ class Step(proto.Enum): CUSTOMER_ENVIRONMENT (2): Customer Environment """ + STEP_UNSPECIFIED = 0 KAJ_ENROLLMENT = 1 CUSTOMER_ENVIRONMENT = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/ekm_connections.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/ekm_connections.py index 4cf1b535ddcc..5869e8a12ae5 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/ekm_connections.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/ekm_connections.py @@ -96,6 +96,7 @@ class ConnectionState(proto.Enum): PERMISSION_DENIED (4): Permission denied EKM connection state """ + CONNECTION_STATE_UNSPECIFIED = 0 AVAILABLE = 1 NOT_AVAILABLE = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partner_permissions.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partner_permissions.py index 477071d9ed3a..7ad488802a5d 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partner_permissions.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partner_permissions.py @@ -61,6 +61,7 @@ class Permission(proto.Enum): Permission for support case details for Access Transparency log entries """ + PERMISSION_UNSPECIFIED = 0 ACCESS_TRANSPARENCY_AND_EMERGENCY_ACCESS_LOGS = 1 ASSURED_WORKLOADS_MONITORING = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partners.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partners.py index 70bac8a9a22d..63f6684205ee 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partners.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partners.py @@ -168,6 +168,7 @@ class EkmSolution(proto.Enum): VIRTRU (4): This enum value is never used. """ + EKM_SOLUTION_UNSPECIFIED = 0 FORTANIX = 1 FUTUREX = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/violations.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/violations.py index 07a14a66e7c9..d1a7eb7e1470 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/violations.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/violations.py @@ -85,6 +85,7 @@ class State(proto.Enum): EXCEPTION (3): Violation is Exception """ + STATE_UNSPECIFIED = 0 RESOLVED = 1 UNRESOLVED = 2 @@ -132,6 +133,7 @@ class RemediationType(proto.Enum): REMEDIATION_RESOURCE_VIOLATION (5): Remediation type for resource violation. """ + REMEDIATION_TYPE_UNSPECIFIED = 0 REMEDIATION_BOOLEAN_ORG_POLICY_VIOLATION = 1 REMEDIATION_LIST_ALLOWED_VALUES_ORG_POLICY_VIOLATION = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/mypy.ini b/packages/google-cloud-cloudcontrolspartner/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-cloudcontrolspartner/mypy.ini +++ b/packages/google-cloud-cloudcontrolspartner/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-cloudcontrolspartner/noxfile.py b/packages/google-cloud-cloudcontrolspartner/noxfile.py index ffa044a73222..656d5fbda663 100644 --- a/packages/google-cloud-cloudcontrolspartner/noxfile.py +++ b/packages/google-cloud-cloudcontrolspartner/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_core.py b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_core.py index 12aae86ad5b1..8fb03fa54cf9 100644 --- a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_core.py +++ b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_core.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_core import ( CloudControlsPartnerCoreAsyncClient, @@ -1013,10 +1018,9 @@ def test_cloud_controls_partner_core_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1065,9 @@ def test_cloud_controls_partner_core_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1103,9 @@ def test_cloud_controls_partner_core_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1364,9 +1366,7 @@ def test_cloud_controls_partner_core_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3218,9 +3218,9 @@ def test_get_ekm_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ekm_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ekm_connections] = ( + mock_rpc + ) request = {} client.get_ekm_connections(request) @@ -6624,9 +6624,9 @@ def test_get_ekm_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ekm_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ekm_connections] = ( + mock_rpc + ) request = {} client.get_ekm_connections(request) diff --git a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_monitoring.py b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_monitoring.py index 99af18199bcb..779feac281a4 100644 --- a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_monitoring.py +++ b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_monitoring.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.interval_pb2 as interval_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_monitoring import ( CloudControlsPartnerMonitoringAsyncClient, @@ -1054,10 +1059,9 @@ def test_cloud_controls_partner_monitoring_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1102,10 +1106,9 @@ def test_cloud_controls_partner_monitoring_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1141,10 +1144,9 @@ def test_cloud_controls_partner_monitoring_client_get_mtls_endpoint_and_cert_sou "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1409,9 +1411,7 @@ def test_cloud_controls_partner_monitoring_client_create_channel_credentials_fil google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_core.py b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_core.py index 1ad4874fd624..d4c560c92536 100644 --- a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_core.py +++ b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_core.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_core import ( CloudControlsPartnerCoreAsyncClient, @@ -1013,10 +1018,9 @@ def test_cloud_controls_partner_core_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1065,9 @@ def test_cloud_controls_partner_core_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1103,9 @@ def test_cloud_controls_partner_core_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1364,9 +1366,7 @@ def test_cloud_controls_partner_core_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3218,9 +3218,9 @@ def test_get_ekm_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ekm_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ekm_connections] = ( + mock_rpc + ) request = {} client.get_ekm_connections(request) @@ -6624,9 +6624,9 @@ def test_get_ekm_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ekm_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ekm_connections] = ( + mock_rpc + ) request = {} client.get_ekm_connections(request) diff --git a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_monitoring.py b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_monitoring.py index 171b3ba78cd3..636835f5a80b 100644 --- a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_monitoring.py +++ b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_monitoring.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.interval_pb2 as interval_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_monitoring import ( CloudControlsPartnerMonitoringAsyncClient, @@ -1054,10 +1059,9 @@ def test_cloud_controls_partner_monitoring_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1102,10 +1106,9 @@ def test_cloud_controls_partner_monitoring_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1141,10 +1144,9 @@ def test_cloud_controls_partner_monitoring_client_get_mtls_endpoint_and_cert_sou "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1409,9 +1411,7 @@ def test_cloud_controls_partner_monitoring_client_create_channel_credentials_fil google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/__init__.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/__init__.py index 58d42b5bd4bc..740ae08c99e0 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/__init__.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.audit import AuditAsyncClient, AuditClient from .services.cm_enrollment_service import ( CmEnrollmentServiceAsyncClient, diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/async_client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/async_client.py index 65177b25fda8..75b8619ab0f2 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/async_client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -46,9 +46,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.audit import pagers from google.cloud.cloudsecuritycompliance_v1.types import audit, common @@ -115,7 +115,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AuditAsyncClient: The constructed client. """ - return AuditClient.from_service_account_info.__func__(AuditAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AuditClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AuditAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +134,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AuditAsyncClient: The constructed client. """ - return AuditClient.from_service_account_file.__func__(AuditAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AuditClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AuditAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/client.py index b3a3023d1d9e..42fa10554449 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -63,9 +63,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.audit import pagers from google.cloud.cloudsecuritycompliance_v1.types import audit, common @@ -648,11 +648,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AuditClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AuditClient._read_environment_variables() + ) self._client_cert_source = AuditClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -687,8 +685,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AuditTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/pagers.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/pagers.py index 1bbd4a9a1685..74aa6a9d937d 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/pagers.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/base.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/base.py index 0c49fc188404..f33f0e9a19e3 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/base.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version from google.cloud.cloudsecuritycompliance_v1.types import audit @@ -288,13 +288,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc.py index 10d24a3cfd5d..8f3dd685a75e 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import audit @@ -363,12 +363,12 @@ def generate_framework_audit_scope_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_framework_audit_scope_report" not in self._stubs: - self._stubs[ - "generate_framework_audit_scope_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Audit/GenerateFrameworkAuditScopeReport", - request_serializer=audit.GenerateFrameworkAuditScopeReportRequest.serialize, - response_deserializer=audit.GenerateFrameworkAuditScopeReportResponse.deserialize, + self._stubs["generate_framework_audit_scope_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Audit/GenerateFrameworkAuditScopeReport", + request_serializer=audit.GenerateFrameworkAuditScopeReportRequest.serialize, + response_deserializer=audit.GenerateFrameworkAuditScopeReportResponse.deserialize, + ) ) return self._stubs["generate_framework_audit_scope_report"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc_asyncio.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc_asyncio.py index 42476cd5a877..17ba0374dfbb 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import audit @@ -371,12 +371,12 @@ def generate_framework_audit_scope_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_framework_audit_scope_report" not in self._stubs: - self._stubs[ - "generate_framework_audit_scope_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Audit/GenerateFrameworkAuditScopeReport", - request_serializer=audit.GenerateFrameworkAuditScopeReportRequest.serialize, - response_deserializer=audit.GenerateFrameworkAuditScopeReportResponse.deserialize, + self._stubs["generate_framework_audit_scope_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Audit/GenerateFrameworkAuditScopeReport", + request_serializer=audit.GenerateFrameworkAuditScopeReportRequest.serialize, + response_deserializer=audit.GenerateFrameworkAuditScopeReportResponse.deserialize, + ) ) return self._stubs["generate_framework_audit_scope_report"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/rest.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/rest.py index cd3fa8a432f3..542b16924bd7 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/rest.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -808,15 +808,12 @@ def __call__( """ - http_options = ( - _BaseAuditRestTransport._BaseGenerateFrameworkAuditScopeReport._get_http_options() - ) + http_options = _BaseAuditRestTransport._BaseGenerateFrameworkAuditScopeReport._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_generate_framework_audit_scope_report( - request, metadata + request, metadata = ( + self._interceptor.pre_generate_framework_audit_scope_report( + request, metadata + ) ) transcoded_request = _BaseAuditRestTransport._BaseGenerateFrameworkAuditScopeReport._get_transcoded_request( http_options, request @@ -884,11 +881,10 @@ def __call__( resp = self._interceptor.post_generate_framework_audit_scope_report(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_framework_audit_scope_report_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_framework_audit_scope_report_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1234,7 +1230,9 @@ def generate_framework_audit_scope_report( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateFrameworkAuditScopeReport(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateFrameworkAuditScopeReport( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_framework_audit( diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/async_client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/async_client.py index 3974dd378a23..a3c827952747 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/async_client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import cm_enrollment_service @@ -120,7 +120,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CmEnrollmentServiceAsyncClient: The constructed client. """ - return CmEnrollmentServiceClient.from_service_account_info.__func__(CmEnrollmentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CmEnrollmentServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CmEnrollmentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +139,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CmEnrollmentServiceAsyncClient: The constructed client. """ - return CmEnrollmentServiceClient.from_service_account_file.__func__(CmEnrollmentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CmEnrollmentServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CmEnrollmentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -174,7 +180,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CmEnrollmentServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CmEnrollmentServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CmEnrollmentServiceTransport: diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/client.py index f635081b48a4..c1d0a12e6d3b 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import cm_enrollment_service @@ -81,9 +81,7 @@ class CmEnrollmentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CmEnrollmentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CmEnrollmentServiceTransport]] _transport_registry["grpc"] = CmEnrollmentServiceGrpcTransport _transport_registry["grpc_asyncio"] = CmEnrollmentServiceGrpcAsyncIOTransport _transport_registry["rest"] = CmEnrollmentServiceRestTransport @@ -627,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CmEnrollmentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CmEnrollmentServiceClient._read_environment_variables() + ) self._client_cert_source = CmEnrollmentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -666,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CmEnrollmentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/__init__.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/__init__.py index d2f862b421d1..1bd5c54075ae 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/__init__.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import CmEnrollmentServiceRestInterceptor, CmEnrollmentServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CmEnrollmentServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CmEnrollmentServiceTransport]] _transport_registry["grpc"] = CmEnrollmentServiceGrpcTransport _transport_registry["grpc_asyncio"] = CmEnrollmentServiceGrpcAsyncIOTransport _transport_registry["rest"] = CmEnrollmentServiceRestTransport diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/base.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/base.py index de684e668a78..8d6dcc1b0e0c 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/base.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version from google.cloud.cloudsecuritycompliance_v1.types import cm_enrollment_service @@ -255,13 +255,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc.py index e88207dfec9f..96bb7da3013c 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import cm_enrollment_service @@ -384,12 +384,12 @@ def calculate_effective_cm_enrollment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "calculate_effective_cm_enrollment" not in self._stubs: - self._stubs[ - "calculate_effective_cm_enrollment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.CmEnrollmentService/CalculateEffectiveCmEnrollment", - request_serializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentRequest.serialize, - response_deserializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentResponse.deserialize, + self._stubs["calculate_effective_cm_enrollment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.CmEnrollmentService/CalculateEffectiveCmEnrollment", + request_serializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentRequest.serialize, + response_deserializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentResponse.deserialize, + ) ) return self._stubs["calculate_effective_cm_enrollment"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc_asyncio.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc_asyncio.py index b7f6a020b4cf..21665322f67e 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import cm_enrollment_service @@ -392,12 +392,12 @@ def calculate_effective_cm_enrollment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "calculate_effective_cm_enrollment" not in self._stubs: - self._stubs[ - "calculate_effective_cm_enrollment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.CmEnrollmentService/CalculateEffectiveCmEnrollment", - request_serializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentRequest.serialize, - response_deserializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentResponse.deserialize, + self._stubs["calculate_effective_cm_enrollment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.CmEnrollmentService/CalculateEffectiveCmEnrollment", + request_serializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentRequest.serialize, + response_deserializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentResponse.deserialize, + ) ) return self._stubs["calculate_effective_cm_enrollment"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/rest.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/rest.py index b2b970056b1a..dfa49d57ee1a 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/rest.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -495,9 +495,7 @@ def __call__( """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseCalculateEffectiveCmEnrollment._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseCalculateEffectiveCmEnrollment._get_http_options() request, metadata = self._interceptor.pre_calculate_effective_cm_enrollment( request, metadata @@ -563,11 +561,10 @@ def __call__( resp = self._interceptor.post_calculate_effective_cm_enrollment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_calculate_effective_cm_enrollment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_calculate_effective_cm_enrollment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -652,9 +649,7 @@ def __call__( """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseUpdateCmEnrollment._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseUpdateCmEnrollment._get_http_options() request, metadata = self._interceptor.pre_update_cm_enrollment( request, metadata @@ -762,7 +757,9 @@ def calculate_effective_cm_enrollment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CalculateEffectiveCmEnrollment(self._session, self._host, self._interceptor) # type: ignore + return self._CalculateEffectiveCmEnrollment( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_cm_enrollment( @@ -833,9 +830,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseCmEnrollmentServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -974,9 +969,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseCmEnrollmentServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1113,9 +1106,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1233,9 +1224,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1351,9 +1340,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCmEnrollmentServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1492,9 +1479,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCmEnrollmentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/async_client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/async_client.py index 7cf00b4afeeb..cc7d738b49d5 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/async_client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.config import pagers from google.cloud.cloudsecuritycompliance_v1.types import common, config @@ -112,7 +112,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConfigAsyncClient: The constructed client. """ - return ConfigClient.from_service_account_info.__func__(ConfigAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConfigClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConfigAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -128,7 +131,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConfigAsyncClient: The constructed client. """ - return ConfigClient.from_service_account_file.__func__(ConfigAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConfigClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ConfigAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/client.py index c2913f0c22bd..2fcf5bbcc970 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.config import pagers from google.cloud.cloudsecuritycompliance_v1.types import common, config @@ -647,11 +647,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConfigClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConfigClient._read_environment_variables() + ) self._client_cert_source = ConfigClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -686,8 +684,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConfigTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/pagers.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/pagers.py index 028fa34a32b0..21fa1cd0e707 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/pagers.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/base.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/base.py index e9c8353debd0..308d0d170df1 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/base.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version from google.cloud.cloudsecuritycompliance_v1.types import common, config @@ -383,13 +383,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc.py index 81e59f08232c..5726ec7905b8 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import common, config diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc_asyncio.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc_asyncio.py index a08a6da9f48c..e134cedd1a80 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import common, config diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest.py index 8564f849ffc2..5604c92fd2e3 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.cloudsecuritycompliance_v1.types import common, config diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest_base.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest_base.py index 8408bbfe1a94..1d3f9fd61974 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest_base.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import common, config diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/async_client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/async_client.py index 9eaee0e9c95d..bb53aa3ec27f 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/async_client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -46,10 +46,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.deployment import pagers from google.cloud.cloudsecuritycompliance_v1.types import common, deployment @@ -126,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DeploymentAsyncClient: The constructed client. """ - return DeploymentClient.from_service_account_info.__func__(DeploymentAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DeploymentClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DeploymentAsyncClient, 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: DeploymentAsyncClient: The constructed client. """ - return DeploymentClient.from_service_account_file.__func__(DeploymentAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DeploymentClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DeploymentAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/client.py index fdee22d9326f..3b319ebf9de8 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -63,10 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.deployment import pagers from google.cloud.cloudsecuritycompliance_v1.types import common, deployment @@ -671,11 +671,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DeploymentClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DeploymentClient._read_environment_variables() + ) self._client_cert_source = DeploymentClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -710,8 +708,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DeploymentTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/pagers.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/pagers.py index d314b4d51c41..ee88a695abdc 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/pagers.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/base.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/base.py index 663cb609884d..fdb5743d604b 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/base.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version from google.cloud.cloudsecuritycompliance_v1.types import deployment @@ -339,13 +339,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc.py index 424683773525..e2053013e715 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import deployment @@ -366,12 +366,12 @@ def create_framework_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_framework_deployment" not in self._stubs: - self._stubs[ - "create_framework_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/CreateFrameworkDeployment", - request_serializer=deployment.CreateFrameworkDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_framework_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/CreateFrameworkDeployment", + request_serializer=deployment.CreateFrameworkDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_framework_deployment"] @@ -396,12 +396,12 @@ def delete_framework_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_framework_deployment" not in self._stubs: - self._stubs[ - "delete_framework_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/DeleteFrameworkDeployment", - request_serializer=deployment.DeleteFrameworkDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_framework_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/DeleteFrameworkDeployment", + request_serializer=deployment.DeleteFrameworkDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_framework_deployment"] @@ -456,12 +456,12 @@ def list_framework_deployments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_framework_deployments" not in self._stubs: - self._stubs[ - "list_framework_deployments" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListFrameworkDeployments", - request_serializer=deployment.ListFrameworkDeploymentsRequest.serialize, - response_deserializer=deployment.ListFrameworkDeploymentsResponse.deserialize, + self._stubs["list_framework_deployments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListFrameworkDeployments", + request_serializer=deployment.ListFrameworkDeploymentsRequest.serialize, + response_deserializer=deployment.ListFrameworkDeploymentsResponse.deserialize, + ) ) return self._stubs["list_framework_deployments"] @@ -486,12 +486,12 @@ def get_cloud_control_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_cloud_control_deployment" not in self._stubs: - self._stubs[ - "get_cloud_control_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/GetCloudControlDeployment", - request_serializer=deployment.GetCloudControlDeploymentRequest.serialize, - response_deserializer=deployment.CloudControlDeployment.deserialize, + self._stubs["get_cloud_control_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/GetCloudControlDeployment", + request_serializer=deployment.GetCloudControlDeploymentRequest.serialize, + response_deserializer=deployment.CloudControlDeployment.deserialize, + ) ) return self._stubs["get_cloud_control_deployment"] @@ -518,12 +518,12 @@ def list_cloud_control_deployments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_cloud_control_deployments" not in self._stubs: - self._stubs[ - "list_cloud_control_deployments" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListCloudControlDeployments", - request_serializer=deployment.ListCloudControlDeploymentsRequest.serialize, - response_deserializer=deployment.ListCloudControlDeploymentsResponse.deserialize, + self._stubs["list_cloud_control_deployments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListCloudControlDeployments", + request_serializer=deployment.ListCloudControlDeploymentsRequest.serialize, + response_deserializer=deployment.ListCloudControlDeploymentsResponse.deserialize, + ) ) return self._stubs["list_cloud_control_deployments"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc_asyncio.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc_asyncio.py index 3ae8033159f6..7b6c55380bfe 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import deployment @@ -375,12 +375,12 @@ def create_framework_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_framework_deployment" not in self._stubs: - self._stubs[ - "create_framework_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/CreateFrameworkDeployment", - request_serializer=deployment.CreateFrameworkDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_framework_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/CreateFrameworkDeployment", + request_serializer=deployment.CreateFrameworkDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_framework_deployment"] @@ -406,12 +406,12 @@ def delete_framework_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_framework_deployment" not in self._stubs: - self._stubs[ - "delete_framework_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/DeleteFrameworkDeployment", - request_serializer=deployment.DeleteFrameworkDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_framework_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/DeleteFrameworkDeployment", + request_serializer=deployment.DeleteFrameworkDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_framework_deployment"] @@ -467,12 +467,12 @@ def list_framework_deployments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_framework_deployments" not in self._stubs: - self._stubs[ - "list_framework_deployments" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListFrameworkDeployments", - request_serializer=deployment.ListFrameworkDeploymentsRequest.serialize, - response_deserializer=deployment.ListFrameworkDeploymentsResponse.deserialize, + self._stubs["list_framework_deployments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListFrameworkDeployments", + request_serializer=deployment.ListFrameworkDeploymentsRequest.serialize, + response_deserializer=deployment.ListFrameworkDeploymentsResponse.deserialize, + ) ) return self._stubs["list_framework_deployments"] @@ -498,12 +498,12 @@ def get_cloud_control_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_cloud_control_deployment" not in self._stubs: - self._stubs[ - "get_cloud_control_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/GetCloudControlDeployment", - request_serializer=deployment.GetCloudControlDeploymentRequest.serialize, - response_deserializer=deployment.CloudControlDeployment.deserialize, + self._stubs["get_cloud_control_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/GetCloudControlDeployment", + request_serializer=deployment.GetCloudControlDeploymentRequest.serialize, + response_deserializer=deployment.CloudControlDeployment.deserialize, + ) ) return self._stubs["get_cloud_control_deployment"] @@ -530,12 +530,12 @@ def list_cloud_control_deployments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_cloud_control_deployments" not in self._stubs: - self._stubs[ - "list_cloud_control_deployments" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListCloudControlDeployments", - request_serializer=deployment.ListCloudControlDeploymentsRequest.serialize, - response_deserializer=deployment.ListCloudControlDeploymentsResponse.deserialize, + self._stubs["list_cloud_control_deployments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListCloudControlDeployments", + request_serializer=deployment.ListCloudControlDeploymentsRequest.serialize, + response_deserializer=deployment.ListCloudControlDeploymentsResponse.deserialize, + ) ) return self._stubs["list_cloud_control_deployments"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/rest.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/rest.py index f512a72fd404..3c7cf1570c25 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/rest.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -778,9 +778,7 @@ def __call__( """ - http_options = ( - _BaseDeploymentRestTransport._BaseCreateFrameworkDeployment._get_http_options() - ) + http_options = _BaseDeploymentRestTransport._BaseCreateFrameworkDeployment._get_http_options() request, metadata = self._interceptor.pre_create_framework_deployment( request, metadata @@ -931,9 +929,7 @@ def __call__( """ - http_options = ( - _BaseDeploymentRestTransport._BaseDeleteFrameworkDeployment._get_http_options() - ) + http_options = _BaseDeploymentRestTransport._BaseDeleteFrameworkDeployment._get_http_options() request, metadata = self._interceptor.pre_delete_framework_deployment( request, metadata @@ -1081,9 +1077,7 @@ def __call__( """ - http_options = ( - _BaseDeploymentRestTransport._BaseGetCloudControlDeployment._get_http_options() - ) + http_options = _BaseDeploymentRestTransport._BaseGetCloudControlDeployment._get_http_options() request, metadata = self._interceptor.pre_get_cloud_control_deployment( request, metadata @@ -1233,9 +1227,7 @@ def __call__( """ - http_options = ( - _BaseDeploymentRestTransport._BaseGetFrameworkDeployment._get_http_options() - ) + http_options = _BaseDeploymentRestTransport._BaseGetFrameworkDeployment._get_http_options() request, metadata = self._interceptor.pre_get_framework_deployment( request, metadata @@ -1383,9 +1375,7 @@ def __call__( """ - http_options = ( - _BaseDeploymentRestTransport._BaseListCloudControlDeployments._get_http_options() - ) + http_options = _BaseDeploymentRestTransport._BaseListCloudControlDeployments._get_http_options() request, metadata = self._interceptor.pre_list_cloud_control_deployments( request, metadata @@ -1451,11 +1441,10 @@ def __call__( resp = self._interceptor.post_list_cloud_control_deployments(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_cloud_control_deployments_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_cloud_control_deployments_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1537,9 +1526,7 @@ def __call__( The response message for [ListFrameworkDeployments][]. """ - http_options = ( - _BaseDeploymentRestTransport._BaseListFrameworkDeployments._get_http_options() - ) + http_options = _BaseDeploymentRestTransport._BaseListFrameworkDeployments._get_http_options() request, metadata = self._interceptor.pre_list_framework_deployments( request, metadata @@ -1639,7 +1626,9 @@ def create_framework_deployment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateFrameworkDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._CreateFrameworkDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_framework_deployment( @@ -1649,7 +1638,9 @@ def delete_framework_deployment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteFrameworkDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteFrameworkDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_cloud_control_deployment( @@ -1659,7 +1650,9 @@ def get_cloud_control_deployment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetCloudControlDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._GetCloudControlDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_framework_deployment( @@ -1669,7 +1662,9 @@ def get_framework_deployment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetFrameworkDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._GetFrameworkDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_cloud_control_deployments( @@ -1680,7 +1675,9 @@ def list_cloud_control_deployments( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListCloudControlDeployments(self._session, self._host, self._interceptor) # type: ignore + return self._ListCloudControlDeployments( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_framework_deployments( @@ -1691,7 +1688,9 @@ def list_framework_deployments( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListFrameworkDeployments(self._session, self._host, self._interceptor) # type: ignore + return self._ListFrameworkDeployments( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/async_client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/async_client.py index a7dfba686167..eeaa4b2325a8 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/async_client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.monitoring import pagers from google.cloud.cloudsecuritycompliance_v1.types import common, monitoring @@ -131,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MonitoringAsyncClient: The constructed client. """ - return MonitoringClient.from_service_account_info.__func__(MonitoringAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + MonitoringClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(MonitoringAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MonitoringAsyncClient: The constructed client. """ - return MonitoringClient.from_service_account_file.__func__(MonitoringAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + MonitoringClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(MonitoringAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/client.py index 8ef1bb4a5613..28893ee9ac60 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.monitoring import pagers from google.cloud.cloudsecuritycompliance_v1.types import common, monitoring @@ -690,11 +690,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MonitoringClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MonitoringClient._read_environment_variables() + ) self._client_cert_source = MonitoringClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -729,8 +727,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MonitoringTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/pagers.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/pagers.py index ba0032ac4612..47fce5791206 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/pagers.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -461,7 +461,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/base.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/base.py index 39afc861da61..0c6fd1d42bce 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/base.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version from google.cloud.cloudsecuritycompliance_v1.types import monitoring @@ -333,13 +333,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc.py index 3ed517af1b0d..d387a1a32b82 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import monitoring @@ -347,12 +347,12 @@ def list_framework_compliance_summaries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_framework_compliance_summaries" not in self._stubs: - self._stubs[ - "list_framework_compliance_summaries" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListFrameworkComplianceSummaries", - request_serializer=monitoring.ListFrameworkComplianceSummariesRequest.serialize, - response_deserializer=monitoring.ListFrameworkComplianceSummariesResponse.deserialize, + self._stubs["list_framework_compliance_summaries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListFrameworkComplianceSummaries", + request_serializer=monitoring.ListFrameworkComplianceSummariesRequest.serialize, + response_deserializer=monitoring.ListFrameworkComplianceSummariesResponse.deserialize, + ) ) return self._stubs["list_framework_compliance_summaries"] @@ -410,12 +410,12 @@ def fetch_framework_compliance_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_framework_compliance_report" not in self._stubs: - self._stubs[ - "fetch_framework_compliance_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/FetchFrameworkComplianceReport", - request_serializer=monitoring.FetchFrameworkComplianceReportRequest.serialize, - response_deserializer=monitoring.FrameworkComplianceReport.deserialize, + self._stubs["fetch_framework_compliance_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/FetchFrameworkComplianceReport", + request_serializer=monitoring.FetchFrameworkComplianceReportRequest.serialize, + response_deserializer=monitoring.FrameworkComplianceReport.deserialize, + ) ) return self._stubs["fetch_framework_compliance_report"] @@ -443,12 +443,12 @@ def list_control_compliance_summaries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_control_compliance_summaries" not in self._stubs: - self._stubs[ - "list_control_compliance_summaries" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListControlComplianceSummaries", - request_serializer=monitoring.ListControlComplianceSummariesRequest.serialize, - response_deserializer=monitoring.ListControlComplianceSummariesResponse.deserialize, + self._stubs["list_control_compliance_summaries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListControlComplianceSummaries", + request_serializer=monitoring.ListControlComplianceSummariesRequest.serialize, + response_deserializer=monitoring.ListControlComplianceSummariesResponse.deserialize, + ) ) return self._stubs["list_control_compliance_summaries"] @@ -476,12 +476,12 @@ def aggregate_framework_compliance_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "aggregate_framework_compliance_report" not in self._stubs: - self._stubs[ - "aggregate_framework_compliance_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/AggregateFrameworkComplianceReport", - request_serializer=monitoring.AggregateFrameworkComplianceReportRequest.serialize, - response_deserializer=monitoring.AggregateFrameworkComplianceReportResponse.deserialize, + self._stubs["aggregate_framework_compliance_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/AggregateFrameworkComplianceReport", + request_serializer=monitoring.AggregateFrameworkComplianceReportRequest.serialize, + response_deserializer=monitoring.AggregateFrameworkComplianceReportResponse.deserialize, + ) ) return self._stubs["aggregate_framework_compliance_report"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc_asyncio.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc_asyncio.py index a998d221f40a..268d9946ecc5 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import monitoring @@ -355,12 +355,12 @@ def list_framework_compliance_summaries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_framework_compliance_summaries" not in self._stubs: - self._stubs[ - "list_framework_compliance_summaries" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListFrameworkComplianceSummaries", - request_serializer=monitoring.ListFrameworkComplianceSummariesRequest.serialize, - response_deserializer=monitoring.ListFrameworkComplianceSummariesResponse.deserialize, + self._stubs["list_framework_compliance_summaries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListFrameworkComplianceSummaries", + request_serializer=monitoring.ListFrameworkComplianceSummariesRequest.serialize, + response_deserializer=monitoring.ListFrameworkComplianceSummariesResponse.deserialize, + ) ) return self._stubs["list_framework_compliance_summaries"] @@ -418,12 +418,12 @@ def fetch_framework_compliance_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_framework_compliance_report" not in self._stubs: - self._stubs[ - "fetch_framework_compliance_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/FetchFrameworkComplianceReport", - request_serializer=monitoring.FetchFrameworkComplianceReportRequest.serialize, - response_deserializer=monitoring.FrameworkComplianceReport.deserialize, + self._stubs["fetch_framework_compliance_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/FetchFrameworkComplianceReport", + request_serializer=monitoring.FetchFrameworkComplianceReportRequest.serialize, + response_deserializer=monitoring.FrameworkComplianceReport.deserialize, + ) ) return self._stubs["fetch_framework_compliance_report"] @@ -451,12 +451,12 @@ def list_control_compliance_summaries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_control_compliance_summaries" not in self._stubs: - self._stubs[ - "list_control_compliance_summaries" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListControlComplianceSummaries", - request_serializer=monitoring.ListControlComplianceSummariesRequest.serialize, - response_deserializer=monitoring.ListControlComplianceSummariesResponse.deserialize, + self._stubs["list_control_compliance_summaries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListControlComplianceSummaries", + request_serializer=monitoring.ListControlComplianceSummariesRequest.serialize, + response_deserializer=monitoring.ListControlComplianceSummariesResponse.deserialize, + ) ) return self._stubs["list_control_compliance_summaries"] @@ -484,12 +484,12 @@ def aggregate_framework_compliance_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "aggregate_framework_compliance_report" not in self._stubs: - self._stubs[ - "aggregate_framework_compliance_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/AggregateFrameworkComplianceReport", - request_serializer=monitoring.AggregateFrameworkComplianceReportRequest.serialize, - response_deserializer=monitoring.AggregateFrameworkComplianceReportResponse.deserialize, + self._stubs["aggregate_framework_compliance_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/AggregateFrameworkComplianceReport", + request_serializer=monitoring.AggregateFrameworkComplianceReportRequest.serialize, + response_deserializer=monitoring.AggregateFrameworkComplianceReportResponse.deserialize, + ) ) return self._stubs["aggregate_framework_compliance_report"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/rest.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/rest.py index bc744a7c3e0b..c165e20eb839 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/rest.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -670,15 +670,12 @@ def __call__( """ - http_options = ( - _BaseMonitoringRestTransport._BaseAggregateFrameworkComplianceReport._get_http_options() - ) + http_options = _BaseMonitoringRestTransport._BaseAggregateFrameworkComplianceReport._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_aggregate_framework_compliance_report( - request, metadata + request, metadata = ( + self._interceptor.pre_aggregate_framework_compliance_report( + request, metadata + ) ) transcoded_request = _BaseMonitoringRestTransport._BaseAggregateFrameworkComplianceReport._get_transcoded_request( http_options, request @@ -739,11 +736,10 @@ def __call__( resp = self._interceptor.post_aggregate_framework_compliance_report(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_aggregate_framework_compliance_report_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_aggregate_framework_compliance_report_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -831,9 +827,7 @@ def __call__( """ - http_options = ( - _BaseMonitoringRestTransport._BaseFetchFrameworkComplianceReport._get_http_options() - ) + http_options = _BaseMonitoringRestTransport._BaseFetchFrameworkComplianceReport._get_http_options() request, metadata = self._interceptor.pre_fetch_framework_compliance_report( request, metadata @@ -899,11 +893,10 @@ def __call__( resp = self._interceptor.post_fetch_framework_compliance_report(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_framework_compliance_report_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_framework_compliance_report_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -989,9 +982,7 @@ def __call__( """ - http_options = ( - _BaseMonitoringRestTransport._BaseListControlComplianceSummaries._get_http_options() - ) + http_options = _BaseMonitoringRestTransport._BaseListControlComplianceSummaries._get_http_options() request, metadata = self._interceptor.pre_list_control_compliance_summaries( request, metadata @@ -1057,11 +1048,10 @@ def __call__( resp = self._interceptor.post_list_control_compliance_summaries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_control_compliance_summaries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_control_compliance_summaries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1144,9 +1134,7 @@ def __call__( The response message for [ListFindingSummaries][]. """ - http_options = ( - _BaseMonitoringRestTransport._BaseListFindingSummaries._get_http_options() - ) + http_options = _BaseMonitoringRestTransport._BaseListFindingSummaries._get_http_options() request, metadata = self._interceptor.pre_list_finding_summaries( request, metadata @@ -1297,15 +1285,12 @@ def __call__( """ - http_options = ( - _BaseMonitoringRestTransport._BaseListFrameworkComplianceSummaries._get_http_options() - ) + http_options = _BaseMonitoringRestTransport._BaseListFrameworkComplianceSummaries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_framework_compliance_summaries( - request, metadata + request, metadata = ( + self._interceptor.pre_list_framework_compliance_summaries( + request, metadata + ) ) transcoded_request = _BaseMonitoringRestTransport._BaseListFrameworkComplianceSummaries._get_transcoded_request( http_options, request @@ -1368,11 +1353,10 @@ def __call__( resp = self._interceptor.post_list_framework_compliance_summaries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_framework_compliance_summaries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_framework_compliance_summaries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1410,7 +1394,9 @@ def aggregate_framework_compliance_report( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AggregateFrameworkComplianceReport(self._session, self._host, self._interceptor) # type: ignore + return self._AggregateFrameworkComplianceReport( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_framework_compliance_report( @@ -1421,7 +1407,9 @@ def fetch_framework_compliance_report( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchFrameworkComplianceReport(self._session, self._host, self._interceptor) # type: ignore + return self._FetchFrameworkComplianceReport( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_control_compliance_summaries( @@ -1432,7 +1420,9 @@ def list_control_compliance_summaries( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListControlComplianceSummaries(self._session, self._host, self._interceptor) # type: ignore + return self._ListControlComplianceSummaries( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_finding_summaries( @@ -1454,7 +1444,9 @@ def list_framework_compliance_summaries( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListFrameworkComplianceSummaries(self._session, self._host, self._interceptor) # type: ignore + return self._ListFrameworkComplianceSummaries( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/audit.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/audit.py index 058ed2d7c6a9..50696760b396 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/audit.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/audit.py @@ -63,6 +63,7 @@ class ComplianceState(proto.Enum): AUDIT_NOT_SUPPORTED (5): The resource can't be audited. """ + COMPLIANCE_STATE_UNSPECIFIED = 0 COMPLIANT = 1 VIOLATION = 2 @@ -102,6 +103,7 @@ class Format(proto.Enum): The report format is the Open Document Format (ODF). """ + FORMAT_UNSPECIFIED = 0 ODF = 1 @@ -275,6 +277,7 @@ class Format(proto.Enum): The format for the framework audit report is Open Document. """ + FORMAT_UNSPECIFIED = 0 ODF = 1 @@ -347,6 +350,7 @@ class State(proto.Enum): SUCCEEDED (5): The audit completed successfully. """ + STATE_UNSPECIFIED = 0 SCHEDULED = 1 RUNNING = 2 @@ -402,12 +406,12 @@ class State(proto.Enum): number=10, message="CloudControlGroupAuditDetails", ) - cloud_control_audit_details: MutableSequence[ - "CloudControlAuditDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=11, - message="CloudControlAuditDetails", + cloud_control_audit_details: MutableSequence["CloudControlAuditDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=11, + message="CloudControlAuditDetails", + ) ) operation_id: str = proto.Field( proto.STRING, @@ -605,12 +609,12 @@ class CloudControlGroupAuditDetails(proto.Message): number=11, message=common.ControlFamily, ) - cloud_control_details: MutableSequence[ - "CloudControlAuditDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=12, - message="CloudControlAuditDetails", + cloud_control_details: MutableSequence["CloudControlAuditDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12, + message="CloudControlAuditDetails", + ) ) report_summary: "ReportSummary" = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/common.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/common.py index 23ec0ae55e9c..3d138a56faa0 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/common.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/common.py @@ -67,6 +67,7 @@ class RegulatoryControlResponsibilityType(proto.Enum): SHARED (3): Shared responsibility. """ + REGULATORY_CONTROL_RESPONSIBILITY_TYPE_UNSPECIFIED = 0 GOOGLE = 1 CUSTOMER = 2 @@ -89,6 +90,7 @@ class EnforcementMode(proto.Enum): The cloud control is enforced to audit for non-compliance. """ + ENFORCEMENT_MODE_UNSPECIFIED = 0 PREVENTIVE = 1 DETECTIVE = 2 @@ -112,6 +114,7 @@ class FrameworkCategory(proto.Enum): CUSTOM_FRAMEWORK (5): A user-created framework. """ + FRAMEWORK_CATEGORY_UNSPECIFIED = 0 INDUSTRY_DEFINED_STANDARD = 1 ASSURED_WORKLOADS = 2 @@ -160,6 +163,7 @@ class CloudControlCategory(proto.Enum): The business continuity and disaster recovery (BCDR) category. """ + CLOUD_CONTROL_CATEGORY_UNSPECIFIED = 0 CC_CATEGORY_INFRASTRUCTURE = 1 CC_CATEGORY_ARTIFICIAL_INTELLIGENCE = 2 @@ -191,6 +195,7 @@ class CloudProvider(proto.Enum): GCP (3): Google Cloud. """ + CLOUD_PROVIDER_UNSPECIFIED = 0 AWS = 1 AZURE = 2 @@ -261,6 +266,7 @@ class Severity(proto.Enum): minimal access to an environment but can't access data, execute code, or create resources. """ + SEVERITY_UNSPECIFIED = 0 CRITICAL = 1 HIGH = 2 @@ -283,6 +289,7 @@ class RuleActionType(proto.Enum): RULE_ACTION_TYPE_AUDIT (3): The rule is intended to audit non-compliance. """ + RULE_ACTION_TYPE_UNSPECIFIED = 0 RULE_ACTION_TYPE_PREVENTIVE = 1 RULE_ACTION_TYPE_DETECTIVE = 2 @@ -307,6 +314,7 @@ class TargetResourceType(proto.Enum): The target resource is an application in App Hub. """ + TARGET_RESOURCE_TYPE_UNSPECIFIED = 0 TARGET_RESOURCE_CRM_TYPE_ORG = 1 TARGET_RESOURCE_CRM_TYPE_FOLDER = 2 @@ -367,6 +375,7 @@ class FrameworkType(proto.Enum): A framework that's created and managed by you. """ + FRAMEWORK_TYPE_UNSPECIFIED = 0 BUILT_IN = 1 CUSTOM = 2 @@ -407,19 +416,19 @@ class FrameworkType(proto.Enum): number=10, enum="CloudProvider", ) - supported_target_resource_types: MutableSequence[ - "TargetResourceType" - ] = proto.RepeatedField( - proto.ENUM, - number=11, - enum="TargetResourceType", + supported_target_resource_types: MutableSequence["TargetResourceType"] = ( + proto.RepeatedField( + proto.ENUM, + number=11, + enum="TargetResourceType", + ) ) - supported_enforcement_modes: MutableSequence[ - "EnforcementMode" - ] = proto.RepeatedField( - proto.ENUM, - number=13, - enum="EnforcementMode", + supported_enforcement_modes: MutableSequence["EnforcementMode"] = ( + proto.RepeatedField( + proto.ENUM, + number=13, + enum="EnforcementMode", + ) ) @@ -583,6 +592,7 @@ class Type(proto.Enum): A cloud control that's provided and managed by Google. """ + TYPE_UNSPECIFIED = 0 CUSTOM = 1 BUILT_IN = 2 @@ -603,12 +613,12 @@ class Type(proto.Enum): proto.STRING, number=5, ) - supported_enforcement_modes: MutableSequence[ - "EnforcementMode" - ] = proto.RepeatedField( - proto.ENUM, - number=7, - enum="EnforcementMode", + supported_enforcement_modes: MutableSequence["EnforcementMode"] = ( + proto.RepeatedField( + proto.ENUM, + number=7, + enum="EnforcementMode", + ) ) parameter_spec: MutableSequence["ParameterSpec"] = proto.RepeatedField( proto.MESSAGE, @@ -652,12 +662,12 @@ class Type(proto.Enum): number=17, message=timestamp_pb2.Timestamp, ) - supported_target_resource_types: MutableSequence[ - "TargetResourceType" - ] = proto.RepeatedField( - proto.ENUM, - number=18, - enum="TargetResourceType", + supported_target_resource_types: MutableSequence["TargetResourceType"] = ( + proto.RepeatedField( + proto.ENUM, + number=18, + enum="TargetResourceType", + ) ) @@ -707,6 +717,7 @@ class ValueType(proto.Enum): ONEOF (7): A oneOf value. """ + VALUE_TYPE_UNSPECIFIED = 0 STRING = 3 BOOLEAN = 4 @@ -740,12 +751,12 @@ class ValueType(proto.Enum): number=6, message="ParamValue", ) - substitution_rules: MutableSequence[ - "ParameterSubstitutionRule" - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message="ParameterSubstitutionRule", + substitution_rules: MutableSequence["ParameterSubstitutionRule"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message="ParameterSubstitutionRule", + ) ) sub_parameters: MutableSequence["ParameterSpec"] = proto.RepeatedField( proto.MESSAGE, diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/deployment.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/deployment.py index 9c1aa7ec2db5..554cda6f4f39 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/deployment.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/deployment.py @@ -77,6 +77,7 @@ class DeploymentState(proto.Enum): successfully. Retrying the operation resumes from the first failed step. """ + DEPLOYMENT_STATE_UNSPECIFIED = 0 DEPLOYMENT_STATE_VALIDATING = 1 DEPLOYMENT_STATE_CREATING = 2 @@ -185,12 +186,12 @@ class FrameworkDeployment(proto.Message): proto.STRING, number=5, ) - cloud_control_metadata: MutableSequence[ - "CloudControlMetadata" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="CloudControlMetadata", + cloud_control_metadata: MutableSequence["CloudControlMetadata"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="CloudControlMetadata", + ) ) deployment_state: "DeploymentState" = proto.Field( proto.ENUM, @@ -328,12 +329,12 @@ class CloudControlDeployment(proto.Message): number=10, message=common.CloudControl, ) - framework_deployment_references: MutableSequence[ - "FrameworkDeploymentReference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=11, - message="FrameworkDeploymentReference", + framework_deployment_references: MutableSequence["FrameworkDeploymentReference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=11, + message="FrameworkDeploymentReference", + ) ) target_resource_display_name: str = proto.Field( proto.STRING, @@ -746,12 +747,12 @@ class ListCloudControlDeploymentsResponse(proto.Message): def raw_page(self): return self - cloud_control_deployments: MutableSequence[ - "CloudControlDeployment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CloudControlDeployment", + cloud_control_deployments: MutableSequence["CloudControlDeployment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CloudControlDeployment", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/monitoring.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/monitoring.py index f6784ac65145..05c7f5ef108c 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/monitoring.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/monitoring.py @@ -65,6 +65,7 @@ class EvaluationState(proto.Enum): EVALUATION_STATE_NOT_ASSESSED (3): The control is not assessed. """ + EVALUATION_STATE_UNSPECIFIED = 0 EVALUATION_STATE_PASSED = 1 EVALUATION_STATE_FAILED = 2 @@ -108,6 +109,7 @@ class FindingClass(proto.Enum): attack paths converge, based on attack path simulations (APS). """ + FINDING_CLASS_UNSPECIFIED = 0 THREAT = 1 VULNERABILITY = 2 @@ -174,12 +176,12 @@ class ListFrameworkComplianceSummariesResponse(proto.Message): def raw_page(self): return self - framework_compliance_summaries: MutableSequence[ - "FrameworkComplianceSummary" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="FrameworkComplianceSummary", + framework_compliance_summaries: MutableSequence["FrameworkComplianceSummary"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="FrameworkComplianceSummary", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -246,19 +248,19 @@ class FrameworkComplianceReport(proto.Message): number=5, enum=common.Framework.FrameworkType, ) - supported_cloud_providers: MutableSequence[ - common.CloudProvider - ] = proto.RepeatedField( - proto.ENUM, - number=6, - enum=common.CloudProvider, + supported_cloud_providers: MutableSequence[common.CloudProvider] = ( + proto.RepeatedField( + proto.ENUM, + number=6, + enum=common.CloudProvider, + ) ) - framework_categories: MutableSequence[ - common.FrameworkCategory - ] = proto.RepeatedField( - proto.ENUM, - number=7, - enum=common.FrameworkCategory, + framework_categories: MutableSequence[common.FrameworkCategory] = ( + proto.RepeatedField( + proto.ENUM, + number=7, + enum=common.FrameworkCategory, + ) ) framework_display_name: str = proto.Field( proto.STRING, @@ -276,12 +278,12 @@ class FrameworkComplianceReport(proto.Message): proto.INT64, number=11, ) - target_resource_details: MutableSequence[ - "TargetResourceDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=12, - message="TargetResourceDetails", + target_resource_details: MutableSequence["TargetResourceDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12, + message="TargetResourceDetails", + ) ) @@ -438,12 +440,12 @@ class ListControlComplianceSummariesResponse(proto.Message): def raw_page(self): return self - control_compliance_summaries: MutableSequence[ - "ControlComplianceSummary" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ControlComplianceSummary", + control_compliance_summaries: MutableSequence["ControlComplianceSummary"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ControlComplianceSummary", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -491,12 +493,12 @@ class AggregateFrameworkComplianceReportResponse(proto.Message): The list of aggregated compliance reports. """ - aggregated_compliance_reports: MutableSequence[ - "AggregatedComplianceReport" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AggregatedComplianceReport", + aggregated_compliance_reports: MutableSequence["AggregatedComplianceReport"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AggregatedComplianceReport", + ) ) @@ -580,19 +582,19 @@ class FrameworkComplianceSummary(proto.Message): number=3, enum=common.Framework.FrameworkType, ) - supported_cloud_providers: MutableSequence[ - common.CloudProvider - ] = proto.RepeatedField( - proto.ENUM, - number=4, - enum=common.CloudProvider, + supported_cloud_providers: MutableSequence[common.CloudProvider] = ( + proto.RepeatedField( + proto.ENUM, + number=4, + enum=common.CloudProvider, + ) ) - framework_categories: MutableSequence[ - common.FrameworkCategory - ] = proto.RepeatedField( - proto.ENUM, - number=5, - enum=common.FrameworkCategory, + framework_categories: MutableSequence[common.FrameworkCategory] = ( + proto.RepeatedField( + proto.ENUM, + number=5, + enum=common.FrameworkCategory, + ) ) framework_display_name: str = proto.Field( proto.STRING, @@ -610,12 +612,12 @@ class FrameworkComplianceSummary(proto.Message): proto.INT64, number=9, ) - target_resource_details: MutableSequence[ - "TargetResourceDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=10, - message="TargetResourceDetails", + target_resource_details: MutableSequence["TargetResourceDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=10, + message="TargetResourceDetails", + ) ) diff --git a/packages/google-cloud-cloudsecuritycompliance/mypy.ini b/packages/google-cloud-cloudsecuritycompliance/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-cloudsecuritycompliance/mypy.ini +++ b/packages/google-cloud-cloudsecuritycompliance/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-cloudsecuritycompliance/noxfile.py b/packages/google-cloud-cloudsecuritycompliance/noxfile.py index e4eb3ebb0ced..6453679139af 100644 --- a/packages/google-cloud-cloudsecuritycompliance/noxfile.py +++ b/packages/google-cloud-cloudsecuritycompliance/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_async.py b/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_async.py index e1f4a1a517fc..c53952d45ba8 100644 --- a/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_async.py +++ b/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_async.py @@ -47,9 +47,7 @@ async def sample_create_framework_deployment(): framework_deployment.cloud_control_metadata.cloud_control_details.name = ( "name_value" ) - framework_deployment.cloud_control_metadata.cloud_control_details.major_revision_id = ( - 1811 - ) + framework_deployment.cloud_control_metadata.cloud_control_details.major_revision_id = 1811 framework_deployment.cloud_control_metadata.enforcement_mode = "AUDIT" request = cloudsecuritycompliance_v1.CreateFrameworkDeploymentRequest( diff --git a/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_sync.py b/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_sync.py index 473f826d185d..6033b0efc48a 100644 --- a/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_sync.py +++ b/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_sync.py @@ -47,9 +47,7 @@ def sample_create_framework_deployment(): framework_deployment.cloud_control_metadata.cloud_control_details.name = ( "name_value" ) - framework_deployment.cloud_control_metadata.cloud_control_details.major_revision_id = ( - 1811 - ) + framework_deployment.cloud_control_metadata.cloud_control_details.major_revision_id = 1811 framework_deployment.cloud_control_metadata.enforcement_mode = "AUDIT" request = cloudsecuritycompliance_v1.CreateFrameworkDeploymentRequest( diff --git a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_audit.py b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_audit.py index 8c2cfe710d3a..3cbf52b2a703 100644 --- a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_audit.py +++ b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_audit.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.audit import ( AuditAsyncClient, @@ -903,10 +903,9 @@ def test_audit_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -951,10 +950,9 @@ def test_audit_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -990,10 +988,9 @@ def test_audit_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1222,9 +1219,7 @@ def test_audit_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1707,9 +1702,9 @@ def test_create_framework_audit_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_framework_audit - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_framework_audit] = ( + mock_rpc + ) request = {} client.create_framework_audit(request) @@ -2080,9 +2075,9 @@ def test_list_framework_audits_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_framework_audits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_framework_audits] = ( + mock_rpc + ) request = {} client.list_framework_audits(request) @@ -2635,9 +2630,9 @@ def test_get_framework_audit_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_framework_audit - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_framework_audit] = ( + mock_rpc + ) request = {} client.get_framework_audit(request) @@ -3132,9 +3127,9 @@ def test_create_framework_audit_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_framework_audit - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_framework_audit] = ( + mock_rpc + ) request = {} client.create_framework_audit(request) @@ -3329,9 +3324,9 @@ def test_list_framework_audits_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_framework_audits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_framework_audits] = ( + mock_rpc + ) request = {} client.list_framework_audits(request) @@ -3589,9 +3584,9 @@ def test_get_framework_audit_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_framework_audit - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_framework_audit] = ( + mock_rpc + ) request = {} client.get_framework_audit(request) diff --git a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_cm_enrollment_service.py b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_cm_enrollment_service.py index 11cf7ad1d1e1..865b68456611 100644 --- a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_cm_enrollment_service.py +++ b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_cm_enrollment_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.cm_enrollment_service import ( CmEnrollmentServiceAsyncClient, @@ -994,10 +999,9 @@ def test_cm_enrollment_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1046,9 @@ def test_cm_enrollment_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1081,10 +1084,9 @@ def test_cm_enrollment_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1344,9 +1346,7 @@ def test_cm_enrollment_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1457,9 +1457,9 @@ def test_update_cm_enrollment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cm_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cm_enrollment] = ( + mock_rpc + ) request = {} client.update_cm_enrollment(request) @@ -2092,9 +2092,9 @@ def test_update_cm_enrollment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cm_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cm_enrollment] = ( + mock_rpc + ) request = {} client.update_cm_enrollment(request) diff --git a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_config.py b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_config.py index 0aaa55d5a2b9..82e05d7d14eb 100644 --- a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_config.py +++ b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_config.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.config import ( ConfigAsyncClient, @@ -899,10 +904,9 @@ def test_config_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -947,10 +951,9 @@ def test_config_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +989,9 @@ def test_config_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1218,9 +1220,7 @@ def test_config_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2227,9 +2227,9 @@ def test_create_framework_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_framework - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_framework] = ( + mock_rpc + ) request = {} client.create_framework(request) @@ -2604,9 +2604,9 @@ def test_update_framework_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_framework - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_framework] = ( + mock_rpc + ) request = {} client.update_framework(request) @@ -2952,9 +2952,9 @@ def test_delete_framework_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_framework - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_framework] = ( + mock_rpc + ) request = {} client.delete_framework(request) @@ -3276,9 +3276,9 @@ def test_list_cloud_controls_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cloud_controls - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cloud_controls] = ( + mock_rpc + ) request = {} client.list_cloud_controls(request) @@ -3845,9 +3845,9 @@ def test_get_cloud_control_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cloud_control] = ( + mock_rpc + ) request = {} client.get_cloud_control(request) @@ -4240,9 +4240,9 @@ def test_create_cloud_control_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_cloud_control] = ( + mock_rpc + ) request = {} client.create_cloud_control(request) @@ -4649,9 +4649,9 @@ def test_update_cloud_control_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cloud_control] = ( + mock_rpc + ) request = {} client.update_cloud_control(request) @@ -5021,9 +5021,9 @@ def test_delete_cloud_control_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cloud_control] = ( + mock_rpc + ) request = {} client.delete_cloud_control(request) @@ -5717,9 +5717,9 @@ def test_create_framework_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_framework - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_framework] = ( + mock_rpc + ) request = {} client.create_framework(request) @@ -5926,9 +5926,9 @@ def test_update_framework_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_framework - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_framework] = ( + mock_rpc + ) request = {} client.update_framework(request) @@ -6123,9 +6123,9 @@ def test_delete_framework_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_framework - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_framework] = ( + mock_rpc + ) request = {} client.delete_framework(request) @@ -6302,9 +6302,9 @@ def test_list_cloud_controls_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cloud_controls - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cloud_controls] = ( + mock_rpc + ) request = {} client.list_cloud_controls(request) @@ -6558,9 +6558,9 @@ def test_get_cloud_control_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cloud_control] = ( + mock_rpc + ) request = {} client.get_cloud_control(request) @@ -6744,9 +6744,9 @@ def test_create_cloud_control_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_cloud_control] = ( + mock_rpc + ) request = {} client.create_cloud_control(request) @@ -6955,9 +6955,9 @@ def test_update_cloud_control_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cloud_control] = ( + mock_rpc + ) request = {} client.update_cloud_control(request) @@ -7141,9 +7141,9 @@ def test_delete_cloud_control_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cloud_control] = ( + mock_rpc + ) request = {} client.delete_cloud_control(request) diff --git a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_deployment.py b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_deployment.py index 97462104decb..28be523220a8 100644 --- a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_deployment.py +++ b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_deployment.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.deployment import ( DeploymentAsyncClient, @@ -931,10 +931,9 @@ def test_deployment_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +978,9 @@ def test_deployment_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1016,9 @@ def test_deployment_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1254,9 +1251,7 @@ def test_deployment_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_monitoring.py b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_monitoring.py index 57116d554ba7..7a5d86c77846 100644 --- a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_monitoring.py +++ b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_monitoring.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.interval_pb2 as interval_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.monitoring import ( MonitoringAsyncClient, @@ -922,10 +927,9 @@ def test_monitoring_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -970,10 +974,9 @@ def test_monitoring_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1009,10 +1012,9 @@ def test_monitoring_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1245,9 +1247,7 @@ def test_monitoring_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1920,9 +1920,9 @@ def test_list_finding_summaries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_finding_summaries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_finding_summaries] = ( + mock_rpc + ) request = {} client.list_finding_summaries(request) @@ -3945,9 +3945,9 @@ def test_list_finding_summaries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_finding_summaries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_finding_summaries] = ( + mock_rpc + ) request = {} client.list_finding_summaries(request) diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/__init__.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/__init__.py index 3d321573aa88..5255a3d806c9 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/__init__.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/__init__.py @@ -30,6 +30,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.consumer_procurement_service import ( ConsumerProcurementServiceAsyncClient, ConsumerProcurementServiceClient, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/async_client.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/async_client.py index 2f17350e84a1..38273bb95496 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/async_client.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1 import ( gapic_version as package_version, @@ -48,8 +48,8 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1.services.consumer_procurement_service import ( pagers, @@ -143,7 +143,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConsumerProcurementServiceAsyncClient: The constructed client. """ - return ConsumerProcurementServiceClient.from_service_account_info.__func__(ConsumerProcurementServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConsumerProcurementServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + ConsumerProcurementServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +164,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConsumerProcurementServiceAsyncClient: The constructed client. """ - return ConsumerProcurementServiceClient.from_service_account_file.__func__(ConsumerProcurementServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConsumerProcurementServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + ConsumerProcurementServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -197,7 +207,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConsumerProcurementServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConsumerProcurementServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConsumerProcurementServiceTransport: diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/client.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/client.py index 2179c33ec670..9b8175faf341 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/client.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1 import ( gapic_version as package_version, @@ -65,8 +65,8 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1.services.consumer_procurement_service import ( pagers, @@ -90,9 +90,7 @@ class ConsumerProcurementServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConsumerProcurementServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConsumerProcurementServiceTransport]] _transport_registry["grpc"] = ConsumerProcurementServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConsumerProcurementServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConsumerProcurementServiceRestTransport @@ -660,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConsumerProcurementServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConsumerProcurementServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConsumerProcurementServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -701,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConsumerProcurementServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/pagers.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/pagers.py index 9e385376ee57..7854aa98c540 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/pagers.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/__init__.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/__init__.py index 63bd78670d71..1edabe5054b7 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/__init__.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConsumerProcurementServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConsumerProcurementServiceTransport]] _transport_registry["grpc"] = ConsumerProcurementServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConsumerProcurementServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConsumerProcurementServiceRestTransport diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/base.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/base.py index a20619190bfc..ba85d1d22e1d 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/base.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1 import ( gapic_version as package_version, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc.py index 593ac00258f2..c61ace9496de 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.commerce_consumer_procurement_v1.types import ( order, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc_asyncio.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc_asyncio.py index 5a8332e5f75e..690d1357aaba 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.commerce_consumer_procurement_v1.types import ( order, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/rest.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/rest.py index b4ce0b84ab35..94d15bba1223 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/rest.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -577,9 +577,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseCancelOrder._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseCancelOrder._get_http_options() request, metadata = self._interceptor.pre_cancel_order(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseCancelOrder._get_transcoded_request( @@ -746,9 +744,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseGetOrder._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseGetOrder._get_http_options() request, metadata = self._interceptor.pre_get_order(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseGetOrder._get_transcoded_request( @@ -894,9 +890,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseListOrders._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseListOrders._get_http_options() request, metadata = self._interceptor.pre_list_orders(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseListOrders._get_transcoded_request( @@ -1048,9 +1042,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseModifyOrder._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseModifyOrder._get_http_options() request, metadata = self._interceptor.pre_modify_order(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseModifyOrder._get_transcoded_request( @@ -1203,9 +1195,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BasePlaceOrder._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BasePlaceOrder._get_http_options() request, metadata = self._interceptor.pre_place_order(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BasePlaceOrder._get_transcoded_request( @@ -1396,9 +1386,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/async_client.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/async_client.py index 1cf7a0d7e172..ceab3bb3e9cc 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/async_client.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1 import ( gapic_version as package_version, @@ -46,8 +46,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1.services.license_management_service import ( pagers, @@ -130,7 +130,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: LicenseManagementServiceAsyncClient: The constructed client. """ - return LicenseManagementServiceClient.from_service_account_info.__func__(LicenseManagementServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + LicenseManagementServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(LicenseManagementServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +149,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: LicenseManagementServiceAsyncClient: The constructed client. """ - return LicenseManagementServiceClient.from_service_account_file.__func__(LicenseManagementServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + LicenseManagementServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + LicenseManagementServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -184,7 +192,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return LicenseManagementServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return LicenseManagementServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> LicenseManagementServiceTransport: diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/client.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/client.py index ccca5e6ecdfc..d01d5d9aab88 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/client.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1 import ( gapic_version as package_version, @@ -63,8 +63,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1.services.license_management_service import ( pagers, @@ -87,9 +87,7 @@ class LicenseManagementServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[LicenseManagementServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[LicenseManagementServiceTransport]] _transport_registry["grpc"] = LicenseManagementServiceGrpcTransport _transport_registry["grpc_asyncio"] = LicenseManagementServiceGrpcAsyncIOTransport _transport_registry["rest"] = LicenseManagementServiceRestTransport @@ -633,11 +631,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LicenseManagementServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LicenseManagementServiceClient._read_environment_variables() + ) self._client_cert_source = ( LicenseManagementServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -674,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LicenseManagementServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/pagers.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/pagers.py index 5cc1693d399d..036563990665 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/pagers.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -153,7 +153,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/__init__.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/__init__.py index a2c6b4459d37..0c8620231e11 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/__init__.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[LicenseManagementServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[LicenseManagementServiceTransport]] _transport_registry["grpc"] = LicenseManagementServiceGrpcTransport _transport_registry["grpc_asyncio"] = LicenseManagementServiceGrpcAsyncIOTransport _transport_registry["rest"] = LicenseManagementServiceRestTransport diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/base.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/base.py index 63e93eaba292..535448dcab45 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/base.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1 import ( gapic_version as package_version, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc.py index 821822ae379c..399b1548d3bd 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.commerce_consumer_procurement_v1.types import ( license_management_service, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc_asyncio.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc_asyncio.py index 6399e7941fc7..3d64e26ef8e7 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.commerce_consumer_procurement_v1.types import ( license_management_service, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/rest.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/rest.py index ee3fd76a3699..f1a4e4c1c747 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/rest.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -551,9 +551,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagementServiceRestTransport._BaseAssign._get_http_options() - ) + http_options = _BaseLicenseManagementServiceRestTransport._BaseAssign._get_http_options() request, metadata = self._interceptor.pre_assign(request, metadata) transcoded_request = _BaseLicenseManagementServiceRestTransport._BaseAssign._get_transcoded_request( @@ -706,9 +704,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagementServiceRestTransport._BaseEnumerateLicensedUsers._get_http_options() - ) + http_options = _BaseLicenseManagementServiceRestTransport._BaseEnumerateLicensedUsers._get_http_options() request, metadata = self._interceptor.pre_enumerate_licensed_users( request, metadata @@ -858,9 +854,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagementServiceRestTransport._BaseGetLicensePool._get_http_options() - ) + http_options = _BaseLicenseManagementServiceRestTransport._BaseGetLicensePool._get_http_options() request, metadata = self._interceptor.pre_get_license_pool( request, metadata @@ -1013,9 +1007,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagementServiceRestTransport._BaseUnassign._get_http_options() - ) + http_options = _BaseLicenseManagementServiceRestTransport._BaseUnassign._get_http_options() request, metadata = self._interceptor.pre_unassign(request, metadata) transcoded_request = _BaseLicenseManagementServiceRestTransport._BaseUnassign._get_transcoded_request( @@ -1169,9 +1161,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagementServiceRestTransport._BaseUpdateLicensePool._get_http_options() - ) + http_options = _BaseLicenseManagementServiceRestTransport._BaseUpdateLicensePool._get_http_options() request, metadata = self._interceptor.pre_update_license_pool( request, metadata @@ -1290,7 +1280,9 @@ def enumerate_licensed_users( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._EnumerateLicensedUsers(self._session, self._host, self._interceptor) # type: ignore + return self._EnumerateLicensedUsers( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_license_pool( @@ -1383,9 +1375,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseLicenseManagementServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseLicenseManagementServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseLicenseManagementServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/order.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/order.py index c465eeba1f83..62cb79f07316 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/order.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/order.py @@ -53,6 +53,7 @@ class LineItemChangeType(proto.Enum): LINE_ITEM_CHANGE_TYPE_REVERT_CANCELLATION (4): The change is to revert a cancellation. """ + LINE_ITEM_CHANGE_TYPE_UNSPECIFIED = 0 LINE_ITEM_CHANGE_TYPE_CREATE = 1 LINE_ITEM_CHANGE_TYPE_UPDATE = 2 @@ -98,6 +99,7 @@ class LineItemChangeState(proto.Enum): state. This state is only applicable for pending change. """ + LINE_ITEM_CHANGE_STATE_UNSPECIFIED = 0 LINE_ITEM_CHANGE_STATE_PENDING_APPROVAL = 1 LINE_ITEM_CHANGE_STATE_APPROVED = 2 @@ -124,6 +126,7 @@ class LineItemChangeStateReasonType(proto.Enum): Change is in current state due to system-initiated cancellation. """ + LINE_ITEM_CHANGE_STATE_REASON_TYPE_UNSPECIFIED = 0 LINE_ITEM_CHANGE_STATE_REASON_TYPE_EXPIRED = 1 LINE_ITEM_CHANGE_STATE_REASON_TYPE_USER_CANCELLED = 2 diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/procurement_service.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/procurement_service.py index 7471616ae14f..d106b6bbbea9 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/procurement_service.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/procurement_service.py @@ -52,6 +52,7 @@ class AutoRenewalBehavior(proto.Enum): Auto Renewal will be disabled on subscription. """ + AUTO_RENEWAL_BEHAVIOR_UNSPECIFIED = 0 AUTO_RENEWAL_BEHAVIOR_ENABLE = 1 AUTO_RENEWAL_BEHAVIOR_DISABLE = 2 @@ -334,6 +335,7 @@ class CancellationPolicy(proto.Enum): order is not subscription based, the request will fail. """ + CANCELLATION_POLICY_UNSPECIFIED = 0 CANCELLATION_POLICY_CANCEL_IMMEDIATELY = 1 CANCELLATION_POLICY_CANCEL_AT_TERM_END = 2 diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/__init__.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/__init__.py index e50412c9f87b..509b937da6fb 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/__init__.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/__init__.py @@ -30,6 +30,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.consumer_procurement_service import ( ConsumerProcurementServiceAsyncClient, ConsumerProcurementServiceClient, @@ -57,7 +58,9 @@ api_core, "check_dependency_versions" ): # pragma: NO COVER api_core.check_python_version("google.cloud.commerce_consumer_procurement_v1alpha1") # type: ignore - api_core.check_dependency_versions("google.cloud.commerce_consumer_procurement_v1alpha1") # type: ignore + api_core.check_dependency_versions( + "google.cloud.commerce_consumer_procurement_v1alpha1" + ) # type: ignore else: # pragma: NO COVER # An older version of api_core is installed which does not define the # functions above. We do equivalent checks manually. diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/async_client.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/async_client.py index 4b8f2b4267df..a1165c51f93b 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/async_client.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1alpha1 import ( gapic_version as package_version, @@ -48,8 +48,8 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1alpha1.services.consumer_procurement_service import ( pagers, @@ -143,7 +143,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConsumerProcurementServiceAsyncClient: The constructed client. """ - return ConsumerProcurementServiceClient.from_service_account_info.__func__(ConsumerProcurementServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConsumerProcurementServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + ConsumerProcurementServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +164,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConsumerProcurementServiceAsyncClient: The constructed client. """ - return ConsumerProcurementServiceClient.from_service_account_file.__func__(ConsumerProcurementServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConsumerProcurementServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + ConsumerProcurementServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -197,7 +207,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConsumerProcurementServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConsumerProcurementServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConsumerProcurementServiceTransport: diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/client.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/client.py index 2ecdc94fbd93..416661f058e3 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/client.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1alpha1 import ( gapic_version as package_version, @@ -65,8 +65,8 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1alpha1.services.consumer_procurement_service import ( pagers, @@ -90,9 +90,7 @@ class ConsumerProcurementServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConsumerProcurementServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConsumerProcurementServiceTransport]] _transport_registry["grpc"] = ConsumerProcurementServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConsumerProcurementServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConsumerProcurementServiceRestTransport @@ -660,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConsumerProcurementServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConsumerProcurementServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConsumerProcurementServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -701,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConsumerProcurementServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/pagers.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/pagers.py index 5d460385a710..64870cfdc44b 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/pagers.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/__init__.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/__init__.py index 63bd78670d71..1edabe5054b7 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/__init__.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConsumerProcurementServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConsumerProcurementServiceTransport]] _transport_registry["grpc"] = ConsumerProcurementServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConsumerProcurementServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConsumerProcurementServiceRestTransport diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/base.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/base.py index a1bd880a03db..ba86469dd3cc 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/base.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1alpha1 import ( gapic_version as package_version, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc.py index 1a35bb3e91a0..22a991bd96fe 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.commerce_consumer_procurement_v1alpha1.types import ( order, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc_asyncio.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc_asyncio.py index bdb6ac5aea1d..277ea13d647b 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.commerce_consumer_procurement_v1alpha1.types import ( order, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/rest.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/rest.py index 3619dc8a69b4..641b4f0b2b91 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/rest.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -483,9 +483,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseGetOrder._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseGetOrder._get_http_options() request, metadata = self._interceptor.pre_get_order(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseGetOrder._get_transcoded_request( @@ -631,9 +629,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseListOrders._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseListOrders._get_http_options() request, metadata = self._interceptor.pre_list_orders(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseListOrders._get_transcoded_request( @@ -785,9 +781,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BasePlaceOrder._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BasePlaceOrder._get_http_options() request, metadata = self._interceptor.pre_place_order(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BasePlaceOrder._get_transcoded_request( @@ -962,9 +956,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/types/order.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/types/order.py index a817f0a315c6..9e4d9ea61eb8 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/types/order.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/types/order.py @@ -53,6 +53,7 @@ class LineItemChangeType(proto.Enum): LINE_ITEM_CHANGE_TYPE_REVERT_CANCELLATION (4): The change is to revert a cancellation. """ + LINE_ITEM_CHANGE_TYPE_UNSPECIFIED = 0 LINE_ITEM_CHANGE_TYPE_CREATE = 1 LINE_ITEM_CHANGE_TYPE_UPDATE = 2 @@ -92,6 +93,7 @@ class LineItemChangeState(proto.Enum): be overwritten or cancelled when it's in this state. """ + LINE_ITEM_CHANGE_STATE_UNSPECIFIED = 0 LINE_ITEM_CHANGE_STATE_PENDING_APPROVAL = 1 LINE_ITEM_CHANGE_STATE_APPROVED = 2 @@ -118,6 +120,7 @@ class LineItemChangeStateReasonType(proto.Enum): Change is in current state due to system-initiated cancellation. """ + LINE_ITEM_CHANGE_STATE_REASON_TYPE_UNSPECIFIED = 0 LINE_ITEM_CHANGE_STATE_REASON_TYPE_EXPIRED = 1 LINE_ITEM_CHANGE_STATE_REASON_TYPE_USER_CANCELLED = 2 diff --git a/packages/google-cloud-commerce-consumer-procurement/mypy.ini b/packages/google-cloud-commerce-consumer-procurement/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-commerce-consumer-procurement/mypy.ini +++ b/packages/google-cloud-commerce-consumer-procurement/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-commerce-consumer-procurement/noxfile.py b/packages/google-cloud-commerce-consumer-procurement/noxfile.py index 91a2881e44c7..444c1bfe5e16 100644 --- a/packages/google-cloud-commerce-consumer-procurement/noxfile.py +++ b/packages/google-cloud-commerce-consumer-procurement/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_consumer_procurement_service.py b/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_consumer_procurement_service.py index 5be6e2e82869..aec55c4fc5cb 100644 --- a/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_consumer_procurement_service.py +++ b/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_consumer_procurement_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,16 +56,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1.services.consumer_procurement_service import ( ConsumerProcurementServiceAsyncClient, @@ -1034,10 +1034,9 @@ def test_consumer_procurement_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1081,9 @@ def test_consumer_procurement_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1121,10 +1119,9 @@ def test_consumer_procurement_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1387,9 +1384,7 @@ def test_consumer_procurement_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_license_management_service.py b/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_license_management_service.py index 5651092b40af..1cbd7b2a811e 100644 --- a/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_license_management_service.py +++ b/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_license_management_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1.services.license_management_service import ( LicenseManagementServiceAsyncClient, @@ -1008,10 +1013,9 @@ def test_license_management_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1056,10 +1060,9 @@ def test_license_management_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1095,10 +1098,9 @@ def test_license_management_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1359,9 +1361,7 @@ def test_license_management_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1472,9 +1472,9 @@ def test_get_license_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_license_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_license_pool] = ( + mock_rpc + ) request = {} client.get_license_pool(request) @@ -1808,9 +1808,9 @@ def test_update_license_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_license_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_license_pool] = ( + mock_rpc + ) request = {} client.update_license_pool(request) @@ -2192,9 +2192,9 @@ async def test_assign_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.assign - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.assign] = ( + mock_rpc + ) request = {} await client.assign(request) @@ -3299,9 +3299,9 @@ def test_get_license_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_license_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_license_pool] = ( + mock_rpc + ) request = {} client.get_license_pool(request) @@ -3481,9 +3481,9 @@ def test_update_license_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_license_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_license_pool] = ( + mock_rpc + ) request = {} client.update_license_pool(request) diff --git a/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1alpha1/test_consumer_procurement_service.py b/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1alpha1/test_consumer_procurement_service.py index 7d0379650668..4909dcc03b4f 100644 --- a/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1alpha1/test_consumer_procurement_service.py +++ b/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1alpha1/test_consumer_procurement_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,16 +56,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1alpha1.services.consumer_procurement_service import ( ConsumerProcurementServiceAsyncClient, @@ -1034,10 +1034,9 @@ def test_consumer_procurement_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1081,9 @@ def test_consumer_procurement_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1121,10 +1119,9 @@ def test_consumer_procurement_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1387,9 +1384,7 @@ def test_consumer_procurement_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-common/google/cloud/common/__init__.py b/packages/google-cloud-common/google/cloud/common/__init__.py index fc95ec33ea31..27e96905bdd1 100644 --- a/packages/google-cloud-common/google/cloud/common/__init__.py +++ b/packages/google-cloud-common/google/cloud/common/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.operation_metadata import OperationMetadata if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-cloud-common/google/cloud/common/types/__init__.py b/packages/google-cloud-common/google/cloud/common/types/__init__.py index 8ddfca97a7da..19b7088c23e9 100644 --- a/packages/google-cloud-common/google/cloud/common/types/__init__.py +++ b/packages/google-cloud-common/google/cloud/common/types/__init__.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .operation_metadata import OperationMetadata +from .operation_metadata import ( + OperationMetadata, +) __all__ = ("OperationMetadata",) diff --git a/packages/google-cloud-common/mypy.ini b/packages/google-cloud-common/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-common/mypy.ini +++ b/packages/google-cloud-common/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-common/noxfile.py b/packages/google-cloud-common/noxfile.py index d8e06c8b187c..7ead182d297b 100644 --- a/packages/google-cloud-common/noxfile.py +++ b/packages/google-cloud-common/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/__init__.py index 40c9cdffb1a3..d449ed277d2e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.accelerator_types import AcceleratorTypesClient from .services.addresses import AddressesClient from .services.advice import AdviceClient diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/client.py index 308529af4b05..5341bdc9302c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class AcceleratorTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AcceleratorTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AcceleratorTypesTransport]] _transport_registry["rest"] = AcceleratorTypesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AcceleratorTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AcceleratorTypesClient._read_environment_variables() + ) self._client_cert_source = AcceleratorTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AcceleratorTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/pagers.py index fa37238ec35b..5cd1b4f507c7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/base.py index 85533ab60620..d0679ddf7ea4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/rest.py index 4c3b54ce90fd..5d4e3e6e5ffa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -397,9 +397,7 @@ def __call__( """ - http_options = ( - _BaseAcceleratorTypesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseAcceleratorTypesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseAcceleratorTypesRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/client.py index 097a8fd48a19..059152ebe477 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AddressesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AddressesClient._read_environment_variables() + ) self._client_cert_source = AddressesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AddressesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/pagers.py index c1a522c7bc65..8e60a3e73029 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/base.py index 1e38b8caae0d..e0c5ee1361ed 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/rest.py index 8a820df751d3..8aad6ff5593b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/client.py index 7487dd01906b..454d51f652d1 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -594,11 +594,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AdviceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AdviceClient._read_environment_variables() + ) self._client_cert_source = AdviceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -633,8 +631,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AdviceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/base.py index f6b891201793..d89153f62492 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/rest.py index 716031b142c3..341fddb4f2b8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/client.py index f96b7027ea7f..91cb3f7f4302 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutoscalersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutoscalersClient._read_environment_variables() + ) self._client_cert_source = AutoscalersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutoscalersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/pagers.py index b4d094299c72..817129bc067d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/base.py index 382bdbd4c17e..b358d38200ba 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/rest.py index 0d95cbbc7bd2..b724f976d1bb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1652,9 +1652,7 @@ def __call__( """ - http_options = ( - _BaseAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/client.py index 4cde60c8b2c7..91a307a4d02b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class BackendBucketsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BackendBucketsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BackendBucketsTransport]] _transport_registry["rest"] = BackendBucketsRestTransport def get_transport_class( @@ -600,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BackendBucketsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BackendBucketsClient._read_environment_variables() + ) self._client_cert_source = BackendBucketsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -639,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BackendBucketsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/pagers.py index af86b8d652c7..87bed3ebfa92 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/base.py index c7b08d24962a..fa965dc86df2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/rest.py index 7cb4592f96d2..c4cebaed5cf6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1036,9 +1036,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseAddSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseAddSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_add_signed_url_key( request, metadata @@ -1541,9 +1539,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseDeleteSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseDeleteSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_delete_signed_url_key( request, metadata @@ -2749,9 +2745,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_edge_security_policy( request, metadata @@ -3129,9 +3123,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/client.py index 01c039868b12..f60c8d66fe9a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class BackendServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BackendServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BackendServicesTransport]] _transport_registry["rest"] = BackendServicesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BackendServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BackendServicesClient._read_environment_variables() + ) self._client_cert_source = BackendServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BackendServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/pagers.py index 31dfca947f2b..b23b53ae6292 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/base.py index 385103610de6..82f8967c4712 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/rest.py index cc49150d3549..6318b19a3918 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1212,9 +1212,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseAddSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseAddSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_add_signed_url_key( request, metadata @@ -1367,9 +1365,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseBackendServicesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1722,9 +1718,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseDeleteSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseDeleteSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_delete_signed_url_key( request, metadata @@ -2037,9 +2031,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseGetEffectiveSecurityPolicies._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseGetEffectiveSecurityPolicies._get_http_options() request, metadata = self._interceptor.pre_get_effective_security_policies( request, metadata @@ -2105,11 +2097,10 @@ def __call__( resp = self._interceptor.post_get_effective_security_policies(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_effective_security_policies_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_effective_security_policies_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3264,9 +3255,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_edge_security_policy( request, metadata @@ -3675,9 +3664,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_security_policy( request, metadata @@ -3830,9 +3817,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -4163,7 +4148,9 @@ def get_effective_security_policies( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetEffectiveSecurityPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._GetEffectiveSecurityPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_health( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/client.py index b78add2d36e0..f7ea42c3f7fa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class CrossSiteNetworksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CrossSiteNetworksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CrossSiteNetworksTransport]] _transport_registry["rest"] = CrossSiteNetworksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CrossSiteNetworksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CrossSiteNetworksClient._read_environment_variables() + ) self._client_cert_source = CrossSiteNetworksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CrossSiteNetworksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/pagers.py index 505bc099d5c0..46ffcc802900 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/base.py index af06cf1a0f07..a5a1cba520d6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/rest.py index 8de2d9283b44..8eecc5537db1 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/client.py index 44c425b7c75b..c115d6399f01 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -78,9 +78,7 @@ class DiskSettingsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DiskSettingsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DiskSettingsServiceTransport]] _transport_registry["rest"] = DiskSettingsServiceRestTransport def get_transport_class( @@ -603,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DiskSettingsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DiskSettingsServiceClient._read_environment_variables() + ) self._client_cert_source = DiskSettingsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -642,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DiskSettingsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/__init__.py index dc0f60547bda..23031b5e1ad6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import DiskSettingsServiceRestInterceptor, DiskSettingsServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DiskSettingsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DiskSettingsServiceTransport]] _transport_registry["rest"] = DiskSettingsServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/base.py index d5e162a2c04d..a58f437b2968 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/rest.py index 7cb81958ee4f..65fb107d07de 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/client.py index b674c280e0d7..a85dea4b4acd 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DiskTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DiskTypesClient._read_environment_variables() + ) self._client_cert_source = DiskTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DiskTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/pagers.py index 96b4ae471f9b..260d4cb44c1f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/base.py index 1532556f46d3..1aa08ed51ab4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/rest.py index e6f69fd98e7b..1e2f6908d564 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/client.py index 614835e36eed..799cc7cc5491 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DisksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DisksClient._read_environment_variables() + ) self._client_cert_source = DisksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DisksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/pagers.py index cc8df71bb8b5..2c21332139ef 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/base.py index d7723452111c..e87dad2be4f1 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/rest.py index 407fcf457a8a..8166a6b0c451 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -4152,9 +4152,7 @@ def __call__( """ - http_options = ( - _BaseDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() - ) + http_options = _BaseDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_stop_group_async_replication( request, metadata @@ -4664,7 +4662,9 @@ def remove_resource_policies( ) -> Callable[[compute.RemoveResourcePoliciesDiskRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RemoveResourcePolicies(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveResourcePolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def resize(self) -> Callable[[compute.ResizeDiskRequest], compute.Operation]: @@ -4708,7 +4708,9 @@ def stop_group_async_replication( ) -> Callable[[compute.StopGroupAsyncReplicationDiskRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._StopGroupAsyncReplication(self._session, self._host, self._interceptor) # type: ignore + return self._StopGroupAsyncReplication( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/client.py index 256c000eae7d..dd7f739d2f07 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class ExternalVpnGatewaysClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ExternalVpnGatewaysTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ExternalVpnGatewaysTransport]] _transport_registry["rest"] = ExternalVpnGatewaysRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ExternalVpnGatewaysClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ExternalVpnGatewaysClient._read_environment_variables() + ) self._client_cert_source = ExternalVpnGatewaysClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ExternalVpnGatewaysTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/pagers.py index 686b305fcab4..495d7f7384bb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/__init__.py index 9300bfbc4bb0..0fe624e4ec94 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ExternalVpnGatewaysRestInterceptor, ExternalVpnGatewaysRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ExternalVpnGatewaysTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ExternalVpnGatewaysTransport]] _transport_registry["rest"] = ExternalVpnGatewaysRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/base.py index c88195de01c4..9bf4f577d636 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/rest.py index 151dd1ba4f14..13f47d46437b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1413,9 +1413,7 @@ def __call__( """ - http_options = ( - _BaseExternalVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseExternalVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/client.py index 16f9f2e381aa..8da2bb1a85b4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class FirewallPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[FirewallPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[FirewallPoliciesTransport]] _transport_registry["rest"] = FirewallPoliciesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FirewallPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FirewallPoliciesClient._read_environment_variables() + ) self._client_cert_source = FirewallPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FirewallPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/pagers.py index 1d3b32523510..0cbf713d8f3f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/base.py index 2d20b10b1ab1..ca999aed4c70 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_organization_operations @@ -486,9 +486,9 @@ def _global_organization_operations_client( transport=self.kind, ) ) - self._extended_operations_services[ - "global_organization_operations" - ] = ex_op_service + self._extended_operations_services["global_organization_operations"] = ( + ex_op_service + ) return ex_op_service diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/rest.py index 8aa92b0c61dd..a18536d420d3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1479,9 +1479,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseFirewallPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1660,9 +1658,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseAddPacketMirroringRule._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseAddPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_add_packet_mirroring_rule( request, metadata @@ -2501,9 +2497,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseFirewallPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2874,9 +2868,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseGetPacketMirroringRule._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseGetPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_get_packet_mirroring_rule( request, metadata @@ -3511,9 +3503,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseListAssociations._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseListAssociations._get_http_options() request, metadata = self._interceptor.pre_list_associations( request, metadata @@ -4052,9 +4042,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BasePatchPacketMirroringRule._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BasePatchPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_patch_packet_mirroring_rule( request, metadata @@ -4416,9 +4404,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -4594,9 +4580,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseRemovePacketMirroringRule._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseRemovePacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_remove_packet_mirroring_rule( request, metadata @@ -5146,9 +5130,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5259,7 +5241,9 @@ def add_packet_mirroring_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AddPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._AddPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def add_rule( @@ -5320,7 +5304,9 @@ def get_packet_mirroring_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._GetPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_rule( @@ -5379,7 +5365,9 @@ def patch_packet_mirroring_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PatchPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._PatchPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch_rule( @@ -5405,7 +5393,9 @@ def remove_packet_mirroring_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RemovePacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._RemovePacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def remove_rule( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/client.py index 03c0f2f8e365..29bbf1dccaed 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FirewallsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FirewallsClient._read_environment_variables() + ) self._client_cert_source = FirewallsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FirewallsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/pagers.py index 373c0cd72433..2bf459153eae 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/base.py index 8e23c8b97ce9..c3247911f2d9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/rest.py index 708645e2e59f..e5e70e45cf3c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/client.py index 879a515a2f51..89f866614e41 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class ForwardingRulesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ForwardingRulesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ForwardingRulesTransport]] _transport_registry["rest"] = ForwardingRulesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ForwardingRulesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ForwardingRulesClient._read_environment_variables() + ) self._client_cert_source = ForwardingRulesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ForwardingRulesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/pagers.py index 0e1e0d0a1503..d7daa744b4ce 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/base.py index f404c5dbcfb4..42a3af5c528c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/rest.py index 82d2cf4ef00c..02a3b791ce42 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -724,9 +724,7 @@ def __call__( """ - http_options = ( - _BaseForwardingRulesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseForwardingRulesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseForwardingRulesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2096,9 +2094,7 @@ def __call__( """ - http_options = ( - _BaseForwardingRulesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseForwardingRulesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/client.py index eae329b94ae1..46544d32a628 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class FutureReservationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[FutureReservationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[FutureReservationsTransport]] _transport_registry["rest"] = FutureReservationsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FutureReservationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FutureReservationsClient._read_environment_variables() + ) self._client_cert_source = FutureReservationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FutureReservationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/pagers.py index c91fad417231..ea7894014519 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/__init__.py index 17942ee90dd8..619aabbfdb22 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import FutureReservationsRestInterceptor, FutureReservationsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[FutureReservationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[FutureReservationsTransport]] _transport_registry["rest"] = FutureReservationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/base.py index ab487433993d..ee71f25a9697 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/rest.py index 3e645a0a2ce2..dd4e10d579e6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -619,9 +619,7 @@ def __call__( """ - http_options = ( - _BaseFutureReservationsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseFutureReservationsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseFutureReservationsRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/client.py index ab06cf9edabc..e11db81db7e9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class GlobalAddressesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalAddressesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalAddressesTransport]] _transport_registry["rest"] = GlobalAddressesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalAddressesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalAddressesClient._read_environment_variables() + ) self._client_cert_source = GlobalAddressesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalAddressesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/pagers.py index 5221ced5f1ba..fbd9a30d9054 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/base.py index dc1d6e557e2a..649bdda4617d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/rest.py index 597d14e696e0..e75b3416d7f0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1640,9 +1640,7 @@ def __call__( """ - http_options = ( - _BaseGlobalAddressesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseGlobalAddressesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/client.py index f8877b2cf81c..29b6d23a7c9b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class GlobalForwardingRulesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalForwardingRulesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalForwardingRulesTransport]] _transport_registry["rest"] = GlobalForwardingRulesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalForwardingRulesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalForwardingRulesClient._read_environment_variables() + ) self._client_cert_source = GlobalForwardingRulesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalForwardingRulesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/pagers.py index 76c39f31b0fc..3304c38e1b1f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/__init__.py index 3854f4dcea54..fc066edab114 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalForwardingRulesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalForwardingRulesTransport]] _transport_registry["rest"] = GlobalForwardingRulesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/base.py index b5b7b4bfa759..e7d4f5345a16 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/rest.py index 7edded39f26a..1e6f2e678813 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1546,9 +1546,7 @@ def __call__( """ - http_options = ( - _BaseGlobalForwardingRulesRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseGlobalForwardingRulesRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseGlobalForwardingRulesRestTransport._BaseSetLabels._get_transcoded_request( @@ -1727,9 +1725,7 @@ def __call__( """ - http_options = ( - _BaseGlobalForwardingRulesRestTransport._BaseSetTarget._get_http_options() - ) + http_options = _BaseGlobalForwardingRulesRestTransport._BaseSetTarget._get_http_options() request, metadata = self._interceptor.pre_set_target(request, metadata) transcoded_request = _BaseGlobalForwardingRulesRestTransport._BaseSetTarget._get_transcoded_request( @@ -1880,9 +1876,7 @@ def __call__( """ - http_options = ( - _BaseGlobalForwardingRulesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseGlobalForwardingRulesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/client.py index 3421dc31bfc6..13dabb70644f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class GlobalNetworkEndpointGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] _transport_registry["rest"] = GlobalNetworkEndpointGroupsRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalNetworkEndpointGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalNetworkEndpointGroupsClient._read_environment_variables() + ) self._client_cert_source = ( GlobalNetworkEndpointGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalNetworkEndpointGroupsTransport, transport) self._api_endpoint = self._transport.host @@ -839,9 +834,7 @@ def sample_attach_network_endpoints(): global_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_attach_endpoints_request_resource = ( - global_network_endpoint_groups_attach_endpoints_request_resource - ) + request.global_network_endpoint_groups_attach_endpoints_request_resource = global_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -990,9 +983,7 @@ def sample_attach_network_endpoints(): global_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_attach_endpoints_request_resource = ( - global_network_endpoint_groups_attach_endpoints_request_resource - ) + request.global_network_endpoint_groups_attach_endpoints_request_resource = global_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1445,9 +1436,7 @@ def sample_detach_network_endpoints(): global_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_detach_endpoints_request_resource = ( - global_network_endpoint_groups_detach_endpoints_request_resource - ) + request.global_network_endpoint_groups_detach_endpoints_request_resource = global_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1596,9 +1585,7 @@ def sample_detach_network_endpoints(): global_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_detach_endpoints_request_resource = ( - global_network_endpoint_groups_detach_endpoints_request_resource - ) + request.global_network_endpoint_groups_detach_endpoints_request_resource = global_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/pagers.py index d55a98d011f6..4e0d100db6f2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/__init__.py index 99b13497ddba..cefb9a8a2787 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] _transport_registry["rest"] = GlobalNetworkEndpointGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/base.py index 2d1b0cb29ae6..7fbc860f2433 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/rest.py index 7bec90ba00ba..bf14025569d3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -660,9 +660,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_attach_network_endpoints( request, metadata @@ -842,9 +840,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDelete._get_transcoded_request( @@ -1020,9 +1016,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_detach_network_endpoints( request, metadata @@ -1183,9 +1177,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseGet._get_transcoded_request( @@ -1357,9 +1349,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseInsert._get_transcoded_request( @@ -1509,9 +1499,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseList._get_transcoded_request( @@ -1656,9 +1644,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_list_network_endpoints( request, metadata @@ -1761,7 +1747,9 @@ def attach_network_endpoints( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AttachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._AttachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete( @@ -1780,7 +1768,9 @@ def detach_network_endpoints( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DetachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._DetachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/client.py index dc94d24ca2f6..0b83c38fa210 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class GlobalOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalOperationsTransport]] _transport_registry["rest"] = GlobalOperationsRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalOperationsClient._read_environment_variables() + ) self._client_cert_source = GlobalOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/pagers.py index dfd5226db09e..5ed3852e24c7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/base.py index 96aa2dc75f34..80e859753755 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/rest.py index 3f9a55fe133e..bb7092572823 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -505,9 +505,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOperationsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseGlobalOperationsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseGlobalOperationsRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/client.py index 981f2bcb4d01..3070466fc1fe 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class GlobalOrganizationOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] _transport_registry["rest"] = GlobalOrganizationOperationsRestTransport def get_transport_class( @@ -609,11 +607,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalOrganizationOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalOrganizationOperationsClient._read_environment_variables() + ) self._client_cert_source = ( GlobalOrganizationOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -652,8 +648,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalOrganizationOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/pagers.py index 7d2008a4a8ec..fb8783db7acc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/__init__.py index 2a15d17dfe0e..b015c2aa78f3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] _transport_registry["rest"] = GlobalOrganizationOperationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/base.py index 565d5bbca815..97be6001281c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/rest.py index 90675a853a5e..cdd3fe0ead36 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -402,9 +402,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOrganizationOperationsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseGlobalOrganizationOperationsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseGlobalOrganizationOperationsRestTransport._BaseDelete._get_transcoded_request( @@ -581,9 +579,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOrganizationOperationsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseGlobalOrganizationOperationsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseGlobalOrganizationOperationsRestTransport._BaseGet._get_transcoded_request( @@ -728,9 +724,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOrganizationOperationsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseGlobalOrganizationOperationsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseGlobalOrganizationOperationsRestTransport._BaseList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/client.py index 43be11ea5004..19f04060cff3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class GlobalPublicDelegatedPrefixesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] _transport_registry["rest"] = GlobalPublicDelegatedPrefixesRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalPublicDelegatedPrefixesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalPublicDelegatedPrefixesClient._read_environment_variables() + ) self._client_cert_source = ( GlobalPublicDelegatedPrefixesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -657,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalPublicDelegatedPrefixesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/pagers.py index d3fa123cb41e..bcff8877555b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/__init__.py index c9b6bd28dec3..f096c6964246 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] _transport_registry["rest"] = GlobalPublicDelegatedPrefixesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/base.py index c509cea03f0f..45bca8831598 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/rest.py index e902b3da73b1..3dc5da4cb9cc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -540,9 +540,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseDelete._get_transcoded_request( @@ -696,9 +694,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseGet._get_transcoded_request( @@ -870,9 +866,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseInsert._get_transcoded_request( @@ -1022,9 +1016,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseList._get_transcoded_request( @@ -1198,9 +1190,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BasePatch._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/client.py index 391f31bf05f1..e5c3c37b7ea3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class GlobalVmExtensionPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalVmExtensionPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalVmExtensionPoliciesTransport]] _transport_registry["rest"] = GlobalVmExtensionPoliciesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalVmExtensionPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalVmExtensionPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( GlobalVmExtensionPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalVmExtensionPoliciesTransport, transport) self._api_endpoint = self._transport.host @@ -967,9 +962,7 @@ def sample_delete(): global_vm_extension_policy_rollout_operation_rollout_input_resource is not None ): - request.global_vm_extension_policy_rollout_operation_rollout_input_resource = ( - global_vm_extension_policy_rollout_operation_rollout_input_resource - ) + request.global_vm_extension_policy_rollout_operation_rollout_input_resource = global_vm_extension_policy_rollout_operation_rollout_input_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1118,9 +1111,7 @@ def sample_delete(): global_vm_extension_policy_rollout_operation_rollout_input_resource is not None ): - request.global_vm_extension_policy_rollout_operation_rollout_input_resource = ( - global_vm_extension_policy_rollout_operation_rollout_input_resource - ) + request.global_vm_extension_policy_rollout_operation_rollout_input_resource = global_vm_extension_policy_rollout_operation_rollout_input_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/pagers.py index d691606078d5..91d2c5f77ad4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/__init__.py index 6cecd5a5368a..807926b3331f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalVmExtensionPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalVmExtensionPoliciesTransport]] _transport_registry["rest"] = GlobalVmExtensionPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/base.py index fd00af4d06d4..b6949bd46b92 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/rest.py index 45abd123e868..f7ab88808d62 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -574,9 +574,7 @@ def __call__( """ - http_options = ( - _BaseGlobalVmExtensionPoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseGlobalVmExtensionPoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseGlobalVmExtensionPoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -756,9 +754,7 @@ def __call__( """ - http_options = ( - _BaseGlobalVmExtensionPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseGlobalVmExtensionPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseGlobalVmExtensionPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -1084,9 +1080,7 @@ def __call__( """ - http_options = ( - _BaseGlobalVmExtensionPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseGlobalVmExtensionPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseGlobalVmExtensionPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -1238,9 +1232,7 @@ def __call__( """ - http_options = ( - _BaseGlobalVmExtensionPoliciesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseGlobalVmExtensionPoliciesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseGlobalVmExtensionPoliciesRestTransport._BaseList._get_transcoded_request( @@ -1414,9 +1406,7 @@ def __call__( """ - http_options = ( - _BaseGlobalVmExtensionPoliciesRestTransport._BaseUpdate._get_http_options() - ) + http_options = _BaseGlobalVmExtensionPoliciesRestTransport._BaseUpdate._get_http_options() request, metadata = self._interceptor.pre_update(request, metadata) transcoded_request = _BaseGlobalVmExtensionPoliciesRestTransport._BaseUpdate._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/client.py index dda915f9a1ee..3be7c317556b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = HealthChecksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + HealthChecksClient._read_environment_variables() + ) self._client_cert_source = HealthChecksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(HealthChecksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/pagers.py index 54f1e9294d43..60bc892b115d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/base.py index a956c0308a10..68beab9ce499 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/rest.py index 9514e722ba56..727c6f035e47 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1670,9 +1670,7 @@ def __call__( """ - http_options = ( - _BaseHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/client.py index b38d8b6a22c7..702c979806d0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -75,9 +75,7 @@ class ImageFamilyViewsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ImageFamilyViewsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ImageFamilyViewsTransport]] _transport_registry["rest"] = ImageFamilyViewsRestTransport def get_transport_class( @@ -598,11 +596,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ImageFamilyViewsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ImageFamilyViewsClient._read_environment_variables() + ) self._client_cert_source = ImageFamilyViewsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +633,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ImageFamilyViewsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/base.py index d708b718a088..6d6294cbb1d3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/rest.py index 7f7da8b51858..9d5f374eeeba 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/client.py index e499b7f55901..43deb27934ae 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ImagesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ImagesClient._read_environment_variables() + ) self._client_cert_source = ImagesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ImagesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/pagers.py index 42b84c30a669..5e0592aa3293 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/base.py index 25c5a4836079..ca759197dbcd 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/rest.py index bd34c04c5eb5..021a34206139 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/client.py index 4229c34df2dc..47e85065a52f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -84,9 +84,7 @@ class InstanceGroupManagerResizeRequestsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] _transport_registry["rest"] = InstanceGroupManagerResizeRequestsRestTransport def get_transport_class( @@ -619,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceGroupManagerResizeRequestsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceGroupManagerResizeRequestsClient._read_environment_variables() + ) self._client_cert_source = ( InstanceGroupManagerResizeRequestsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -664,8 +660,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast( InstanceGroupManagerResizeRequestsTransport, transport diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/pagers.py index c23d87d2c61a..ee0b41350ada 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/__init__.py index 909be688fd9c..f8e449424b53 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] _transport_registry["rest"] = InstanceGroupManagerResizeRequestsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/base.py index f2dd90200a1c..6d2e88b88c49 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/rest.py index 44820c267f53..c18424ebbd0c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -544,9 +544,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_http_options() request, metadata = self._interceptor.pre_cancel(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_transcoded_request( @@ -721,9 +719,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_transcoded_request( @@ -878,9 +874,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_transcoded_request( @@ -1056,9 +1050,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_transcoded_request( @@ -1210,9 +1202,7 @@ def __call__( [Output Only] A list of resize requests. """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/client.py index aa71f0a9c279..baa582fe059b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class InstanceGroupManagersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceGroupManagersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagersTransport]] _transport_registry["rest"] = InstanceGroupManagersRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceGroupManagersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceGroupManagersClient._read_environment_variables() + ) self._client_cert_source = InstanceGroupManagersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceGroupManagersTransport, transport) self._api_endpoint = self._transport.host @@ -2716,9 +2711,7 @@ def sample_delete_per_instance_configs(): instance_group_managers_delete_per_instance_configs_req_resource is not None ): - request.instance_group_managers_delete_per_instance_configs_req_resource = ( - instance_group_managers_delete_per_instance_configs_req_resource - ) + request.instance_group_managers_delete_per_instance_configs_req_resource = instance_group_managers_delete_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2882,9 +2875,7 @@ def sample_delete_per_instance_configs(): instance_group_managers_delete_per_instance_configs_req_resource is not None ): - request.instance_group_managers_delete_per_instance_configs_req_resource = ( - instance_group_managers_delete_per_instance_configs_req_resource - ) + request.instance_group_managers_delete_per_instance_configs_req_resource = instance_group_managers_delete_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4664,9 +4655,7 @@ def sample_patch_per_instance_configs(): instance_group_managers_patch_per_instance_configs_req_resource is not None ): - request.instance_group_managers_patch_per_instance_configs_req_resource = ( - instance_group_managers_patch_per_instance_configs_req_resource - ) + request.instance_group_managers_patch_per_instance_configs_req_resource = instance_group_managers_patch_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4831,9 +4820,7 @@ def sample_patch_per_instance_configs(): instance_group_managers_patch_per_instance_configs_req_resource is not None ): - request.instance_group_managers_patch_per_instance_configs_req_resource = ( - instance_group_managers_patch_per_instance_configs_req_resource - ) + request.instance_group_managers_patch_per_instance_configs_req_resource = instance_group_managers_patch_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6868,9 +6855,7 @@ def sample_set_instance_template(): instance_group_managers_set_instance_template_request_resource is not None ): - request.instance_group_managers_set_instance_template_request_resource = ( - instance_group_managers_set_instance_template_request_resource - ) + request.instance_group_managers_set_instance_template_request_resource = instance_group_managers_set_instance_template_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7031,9 +7016,7 @@ def sample_set_instance_template(): instance_group_managers_set_instance_template_request_resource is not None ): - request.instance_group_managers_set_instance_template_request_resource = ( - instance_group_managers_set_instance_template_request_resource - ) + request.instance_group_managers_set_instance_template_request_resource = instance_group_managers_set_instance_template_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -9242,9 +9225,7 @@ def sample_update_per_instance_configs(): instance_group_managers_update_per_instance_configs_req_resource is not None ): - request.instance_group_managers_update_per_instance_configs_req_resource = ( - instance_group_managers_update_per_instance_configs_req_resource - ) + request.instance_group_managers_update_per_instance_configs_req_resource = instance_group_managers_update_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -9409,9 +9390,7 @@ def sample_update_per_instance_configs(): instance_group_managers_update_per_instance_configs_req_resource is not None ): - request.instance_group_managers_update_per_instance_configs_req_resource = ( - instance_group_managers_update_per_instance_configs_req_resource - ) + request.instance_group_managers_update_per_instance_configs_req_resource = instance_group_managers_update_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/pagers.py index 63289ac89152..0b46673ad6fa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -300,7 +300,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -380,7 +380,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/__init__.py index f219aff6d960..11971291fcaf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InstanceGroupManagersTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagersTransport]] _transport_registry["rest"] = InstanceGroupManagersRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/base.py index bd99ad04828a..2440a3bcf5fe 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/rest.py index c8642f42bbc1..f9e4e49ac1c9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1898,9 +1898,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() request, metadata = self._interceptor.pre_abandon_instances( request, metadata @@ -2054,9 +2052,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2233,9 +2229,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() request, metadata = self._interceptor.pre_apply_updates_to_instances( request, metadata @@ -2416,9 +2410,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() request, metadata = self._interceptor.pre_create_instances( request, metadata @@ -2776,9 +2768,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() request, metadata = self._interceptor.pre_delete_instances( request, metadata @@ -2962,9 +2952,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_delete_per_instance_configs( request, metadata @@ -3277,15 +3265,12 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseGetAvailableAcceleratorTopologies._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseGetAvailableAcceleratorTopologies._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_available_accelerator_topologies( - request, metadata + request, metadata = ( + self._interceptor.pre_get_available_accelerator_topologies( + request, metadata + ) ) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseGetAvailableAcceleratorTopologies._get_transcoded_request( http_options, request @@ -3350,11 +3335,10 @@ def __call__( resp = self._interceptor.post_get_available_accelerator_topologies(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_available_accelerator_topologies_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_available_accelerator_topologies_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3765,9 +3749,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() request, metadata = self._interceptor.pre_list_errors(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseListErrors._get_transcoded_request( @@ -3916,9 +3898,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() request, metadata = self._interceptor.pre_list_managed_instances( request, metadata @@ -4069,9 +4049,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_list_per_instance_configs( request, metadata @@ -4433,9 +4411,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_patch_per_instance_configs( request, metadata @@ -4616,9 +4592,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() request, metadata = self._interceptor.pre_recreate_instances( request, metadata @@ -4976,9 +4950,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseResizeAdvanced._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseResizeAdvanced._get_http_options() request, metadata = self._interceptor.pre_resize_advanced(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseResizeAdvanced._get_transcoded_request( @@ -5157,9 +5129,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() request, metadata = self._interceptor.pre_resume_instances( request, metadata @@ -5342,9 +5312,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseSetAutoHealingPolicies._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseSetAutoHealingPolicies._get_http_options() request, metadata = self._interceptor.pre_set_auto_healing_policies( request, metadata @@ -5525,9 +5493,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() request, metadata = self._interceptor.pre_set_instance_template( request, metadata @@ -5710,9 +5676,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() request, metadata = self._interceptor.pre_set_target_pools( request, metadata @@ -5893,9 +5857,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() request, metadata = self._interceptor.pre_start_instances(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseStartInstances._get_transcoded_request( @@ -6074,9 +6036,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() request, metadata = self._interceptor.pre_stop_instances(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseStopInstances._get_transcoded_request( @@ -6255,9 +6215,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() request, metadata = self._interceptor.pre_suspend_instances( request, metadata @@ -6412,9 +6370,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -6779,9 +6735,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_update_per_instance_configs( request, metadata @@ -6905,7 +6859,9 @@ def apply_updates_to_instances( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ApplyUpdatesToInstances(self._session, self._host, self._interceptor) # type: ignore + return self._ApplyUpdatesToInstances( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_instances( @@ -6943,7 +6899,9 @@ def delete_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeletePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( @@ -6964,7 +6922,9 @@ def get_available_accelerator_topologies( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetAvailableAcceleratorTopologies(self._session, self._host, self._interceptor) # type: ignore + return self._GetAvailableAcceleratorTopologies( + self._session, self._host, self._interceptor + ) # type: ignore @property def insert( @@ -7015,7 +6975,9 @@ def list_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch( @@ -7033,7 +6995,9 @@ def patch_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PatchPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._PatchPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def recreate_instances( @@ -7081,7 +7045,9 @@ def set_auto_healing_policies( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetAutoHealingPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._SetAutoHealingPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_instance_template( @@ -7160,7 +7126,9 @@ def update_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdatePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/client.py index 2fff05ae27ba..9b1ef41eeab5 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class InstanceGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupsTransport]] _transport_registry["rest"] = InstanceGroupsRestTransport def get_transport_class( @@ -600,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceGroupsClient._read_environment_variables() + ) self._client_cert_source = InstanceGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -639,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/pagers.py index aa7dc46af9d1..ece348a2868c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/base.py index 13656566417e..425b2b809e29 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/rest.py index 17b3d11ecdb9..ea96de5889e2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1968,9 +1968,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupsRestTransport._BaseRemoveInstances._get_http_options() - ) + http_options = _BaseInstanceGroupsRestTransport._BaseRemoveInstances._get_http_options() request, metadata = self._interceptor.pre_remove_instances( request, metadata @@ -2302,9 +2300,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/client.py index c816573a263a..5b2bc2a269d4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -78,9 +78,7 @@ class InstanceSettingsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceSettingsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceSettingsServiceTransport]] _transport_registry["rest"] = InstanceSettingsServiceRestTransport def get_transport_class( @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceSettingsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceSettingsServiceClient._read_environment_variables() + ) self._client_cert_source = ( InstanceSettingsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -646,8 +642,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceSettingsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/__init__.py index 5e289b9ebf70..a7869d6637f2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InstanceSettingsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InstanceSettingsServiceTransport]] _transport_registry["rest"] = InstanceSettingsServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/base.py index e705fb4a08c8..44c3d3220024 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/rest.py index 76e16e8bb6b9..6d915a6c52dd 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/client.py index 65e8475522fd..8c33afb9c075 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class InstanceTemplatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceTemplatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceTemplatesTransport]] _transport_registry["rest"] = InstanceTemplatesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceTemplatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceTemplatesClient._read_environment_variables() + ) self._client_cert_source = InstanceTemplatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceTemplatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/pagers.py index 7d33c5596b42..dd8772e0c37d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/base.py index 0a3e60415fbf..ef636dfc680c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/rest.py index d6855d794c8d..a485090c7f5e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -675,9 +675,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInstanceTemplatesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1240,9 +1238,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseInstanceTemplatesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1795,9 +1791,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseInstanceTemplatesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1948,9 +1942,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/client.py index 385df986e379..711e1d9f56ec 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstancesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstancesClient._read_environment_variables() + ) self._client_cert_source = InstancesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstancesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/pagers.py index bae09f509cc1..e998e439ed0c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/base.py index 653b4c968e96..d0dd15a395d0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/rest.py index a12c958746fc..b3183e68f714 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -4775,9 +4775,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseDeleteNetworkInterface._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseDeleteNetworkInterface._get_http_options() request, metadata = self._interceptor.pre_delete_network_interface( request, metadata @@ -5246,9 +5244,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseGetEffectiveFirewalls._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseGetEffectiveFirewalls._get_http_options() request, metadata = self._interceptor.pre_get_effective_firewalls( request, metadata @@ -6218,9 +6214,7 @@ def __call__( A Shielded Instance Identity. """ - http_options = ( - _BaseInstancesRestTransport._BaseGetShieldedInstanceIdentity._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseGetShieldedInstanceIdentity._get_http_options() request, metadata = self._interceptor.pre_get_shielded_instance_identity( request, metadata @@ -6286,11 +6280,10 @@ def __call__( resp = self._interceptor.post_get_shielded_instance_identity(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_shielded_instance_identity_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_shielded_instance_identity_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6373,9 +6366,7 @@ def __call__( A Shielded VM Identity. """ - http_options = ( - _BaseInstancesRestTransport._BaseGetShieldedVmIdentity._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseGetShieldedVmIdentity._get_http_options() request, metadata = self._interceptor.pre_get_shielded_vm_identity( request, metadata @@ -7023,9 +7014,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BasePatchPartnerMetadata._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BasePatchPartnerMetadata._get_http_options() request, metadata = self._interceptor.pre_patch_partner_metadata( request, metadata @@ -7381,9 +7370,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseRemoveResourcePolicies._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseRemoveResourcePolicies._get_http_options() request, metadata = self._interceptor.pre_remove_resource_policies( request, metadata @@ -8073,9 +8060,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSendDiagnosticInterrupt._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSendDiagnosticInterrupt._get_http_options() request, metadata = self._interceptor.pre_send_diagnostic_interrupt( request, metadata @@ -8253,9 +8238,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSetDeletionProtection._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSetDeletionProtection._get_http_options() request, metadata = self._interceptor.pre_set_deletion_protection( request, metadata @@ -10484,15 +10467,12 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSetShieldedInstanceIntegrityPolicy._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSetShieldedInstanceIntegrityPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_set_shielded_instance_integrity_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_set_shielded_instance_integrity_policy( + request, metadata + ) ) transcoded_request = _BaseInstancesRestTransport._BaseSetShieldedInstanceIntegrityPolicy._get_transcoded_request( http_options, request @@ -10558,11 +10538,10 @@ def __call__( resp = self._interceptor.post_set_shielded_instance_integrity_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_shielded_instance_integrity_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_shielded_instance_integrity_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -10673,9 +10652,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSetShieldedVmIntegrityPolicy._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSetShieldedVmIntegrityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_shielded_vm_integrity_policy( request, metadata @@ -10746,11 +10723,10 @@ def __call__( resp = self._interceptor.post_set_shielded_vm_integrity_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_shielded_vm_integrity_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_shielded_vm_integrity_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -11040,9 +11016,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSimulateMaintenanceEvent._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSimulateMaintenanceEvent._get_http_options() request, metadata = self._interceptor.pre_simulate_maintenance_event( request, metadata @@ -11391,9 +11365,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseStartWithEncryptionKey._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseStartWithEncryptionKey._get_http_options() request, metadata = self._interceptor.pre_start_with_encryption_key( request, metadata @@ -12614,9 +12586,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseUpdateNetworkInterface._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseUpdateNetworkInterface._get_http_options() request, metadata = self._interceptor.pre_update_network_interface( request, metadata @@ -12797,9 +12767,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseUpdateShieldedInstanceConfig._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseUpdateShieldedInstanceConfig._get_http_options() request, metadata = self._interceptor.pre_update_shielded_instance_config( request, metadata @@ -12870,11 +12838,10 @@ def __call__( resp = self._interceptor.post_update_shielded_instance_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_shielded_instance_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_shielded_instance_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -12984,9 +12951,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseUpdateShieldedVmConfig._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseUpdateShieldedVmConfig._get_http_options() request, metadata = self._interceptor.pre_update_shielded_vm_config( request, metadata @@ -13151,7 +13116,9 @@ def delete_network_interface( ) -> Callable[[compute.DeleteNetworkInterfaceInstanceRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteNetworkInterface(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteNetworkInterface( + self._session, self._host, self._interceptor + ) # type: ignore @property def detach_disk( @@ -13229,7 +13196,9 @@ def get_shielded_instance_identity( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetShieldedInstanceIdentity(self._session, self._host, self._interceptor) # type: ignore + return self._GetShieldedInstanceIdentity( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_shielded_vm_identity( @@ -13285,7 +13254,9 @@ def remove_resource_policies( ) -> Callable[[compute.RemoveResourcePoliciesInstanceRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RemoveResourcePolicies(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveResourcePolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def report_host_as_faulty( @@ -13316,7 +13287,9 @@ def send_diagnostic_interrupt( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SendDiagnosticInterrupt(self._session, self._host, self._interceptor) # type: ignore + return self._SendDiagnosticInterrupt( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_deletion_protection( @@ -13420,7 +13393,9 @@ def set_shielded_instance_integrity_policy( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetShieldedInstanceIntegrityPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._SetShieldedInstanceIntegrityPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_shielded_vm_integrity_policy( @@ -13430,7 +13405,9 @@ def set_shielded_vm_integrity_policy( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetShieldedVmIntegrityPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._SetShieldedVmIntegrityPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_tags(self) -> Callable[[compute.SetTagsInstanceRequest], compute.Operation]: @@ -13444,7 +13421,9 @@ def simulate_maintenance_event( ) -> Callable[[compute.SimulateMaintenanceEventInstanceRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SimulateMaintenanceEvent(self._session, self._host, self._interceptor) # type: ignore + return self._SimulateMaintenanceEvent( + self._session, self._host, self._interceptor + ) # type: ignore @property def start(self) -> Callable[[compute.StartInstanceRequest], compute.Operation]: @@ -13458,7 +13437,9 @@ def start_with_encryption_key( ) -> Callable[[compute.StartWithEncryptionKeyInstanceRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._StartWithEncryptionKey(self._session, self._host, self._interceptor) # type: ignore + return self._StartWithEncryptionKey( + self._session, self._host, self._interceptor + ) # type: ignore @property def stop(self) -> Callable[[compute.StopInstanceRequest], compute.Operation]: @@ -13510,7 +13491,9 @@ def update_network_interface( ) -> Callable[[compute.UpdateNetworkInterfaceInstanceRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateNetworkInterface(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateNetworkInterface( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_shielded_instance_config( @@ -13520,7 +13503,9 @@ def update_shielded_instance_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateShieldedInstanceConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateShieldedInstanceConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_shielded_vm_config( @@ -13528,7 +13513,9 @@ def update_shielded_vm_config( ) -> Callable[[compute.UpdateShieldedVmConfigInstanceRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateShieldedVmConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateShieldedVmConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/client.py index 8afb7aac8725..4d56326549f8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class InstantSnapshotsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstantSnapshotsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstantSnapshotsTransport]] _transport_registry["rest"] = InstantSnapshotsRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstantSnapshotsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstantSnapshotsClient._read_environment_variables() + ) self._client_cert_source = InstantSnapshotsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstantSnapshotsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/pagers.py index b35faa8411a4..4ce56f29e62a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/base.py index 7cde8ef677f1..4f0d6791aa6d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/rest.py index aa8602d47a3b..26102b1c112e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -726,9 +726,7 @@ def __call__( """ - http_options = ( - _BaseInstantSnapshotsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInstantSnapshotsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInstantSnapshotsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2164,9 +2162,7 @@ def __call__( """ - http_options = ( - _BaseInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/client.py index 29dc9725ab4d..4d0d2ac74771 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class InterconnectAttachmentGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] _transport_registry["rest"] = InterconnectAttachmentGroupsRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectAttachmentGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectAttachmentGroupsClient._read_environment_variables() + ) self._client_cert_source = ( InterconnectAttachmentGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -655,8 +651,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectAttachmentGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/pagers.py index 96fa12fa38b8..d0a9ee40901b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/__init__.py index 3961ad9d29df..71f91b690f4b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] _transport_registry["rest"] = InterconnectAttachmentGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/base.py index 7cce2fb24cb1..92c04197faf6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/rest.py index 7fb3997b7d4e..dd9a525ddc18 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -770,9 +770,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseDelete._get_transcoded_request( @@ -921,9 +919,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseGet._get_transcoded_request( @@ -1142,9 +1138,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1295,9 +1289,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseGetOperationalStatus._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseGetOperationalStatus._get_http_options() request, metadata = self._interceptor.pre_get_operational_status( request, metadata @@ -1479,9 +1471,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseInsert._get_transcoded_request( @@ -1631,9 +1621,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseList._get_transcoded_request( @@ -1809,9 +1797,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BasePatch._get_transcoded_request( @@ -2036,9 +2022,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2191,9 +2175,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/client.py index f1ed5f909419..15334e936f1b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class InterconnectAttachmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectAttachmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentsTransport]] _transport_registry["rest"] = InterconnectAttachmentsRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectAttachmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectAttachmentsClient._read_environment_variables() + ) self._client_cert_source = ( InterconnectAttachmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectAttachmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/pagers.py index 475f0748809a..b0450b5d0521 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/__init__.py index 04ffd6c58a57..d59fde76191f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectAttachmentsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentsTransport]] _transport_registry["rest"] = InterconnectAttachmentsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/base.py index db7247e18fb9..53863dec5d54 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/rest.py index 90bda28a9121..c72f302b9ec0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -682,9 +682,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -861,9 +859,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseDelete._get_transcoded_request( @@ -1190,9 +1186,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseInsert._get_transcoded_request( @@ -1702,9 +1696,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseSetLabels._get_transcoded_request( @@ -1855,9 +1847,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/client.py index 100dce5e0d69..e7c76ea128c7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class InterconnectGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectGroupsTransport]] _transport_registry["rest"] = InterconnectGroupsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectGroupsClient._read_environment_variables() + ) self._client_cert_source = InterconnectGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/pagers.py index 9c0e4f419e42..70025763d914 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/__init__.py index c12b274fcacb..efbcb9c02950 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import InterconnectGroupsRestInterceptor, InterconnectGroupsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectGroupsTransport]] _transport_registry["rest"] = InterconnectGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/base.py index e812fcbfe04d..337dd510e3ba 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/rest.py index 19ada5c7c71d..c5d8a9bfcfe2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -816,9 +816,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseCreateMembers._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseCreateMembers._get_http_options() request, metadata = self._interceptor.pre_create_members(request, metadata) transcoded_request = _BaseInterconnectGroupsRestTransport._BaseCreateMembers._get_transcoded_request( @@ -1369,9 +1367,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseInterconnectGroupsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1518,9 +1514,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseGetOperationalStatus._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseGetOperationalStatus._get_http_options() request, metadata = self._interceptor.pre_get_operational_status( request, metadata @@ -2268,9 +2262,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseInterconnectGroupsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2421,9 +2413,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/client.py index 6600f4d6583b..823ebe395a60 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class InterconnectLocationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectLocationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectLocationsTransport]] _transport_registry["rest"] = InterconnectLocationsRestTransport def get_transport_class( @@ -603,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectLocationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectLocationsClient._read_environment_variables() + ) self._client_cert_source = InterconnectLocationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -642,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectLocationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/pagers.py index dc2a54d19d0e..2e1dd912c22b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/__init__.py index 990c40f05d00..fe298fae537f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectLocationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectLocationsTransport]] _transport_registry["rest"] = InterconnectLocationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/base.py index 3fdf5c81020a..79b431a08f2e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/rest.py index f9b412e84534..297bfff8ba44 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/client.py index 54a40c468138..3f46306686d2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class InterconnectRemoteLocationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] _transport_registry["rest"] = InterconnectRemoteLocationsRestTransport def get_transport_class( @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectRemoteLocationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectRemoteLocationsClient._read_environment_variables() + ) self._client_cert_source = ( InterconnectRemoteLocationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -646,8 +642,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectRemoteLocationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/pagers.py index bbfd0ffbd36d..ac3d92987f6b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/__init__.py index 7ed7479ad72f..5f3a153d40d6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] _transport_registry["rest"] = InterconnectRemoteLocationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/base.py index da0e1e19df27..ccb029cc6478 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/rest.py index d1d7fa94bcd3..23091f01e8b0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -352,9 +352,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectRemoteLocationsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseInterconnectRemoteLocationsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseInterconnectRemoteLocationsRestTransport._BaseGet._get_transcoded_request( @@ -502,9 +500,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectRemoteLocationsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseInterconnectRemoteLocationsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseInterconnectRemoteLocationsRestTransport._BaseList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/client.py index 4a4efa23047c..a53e1e8c49da 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectsClient._read_environment_variables() + ) self._client_cert_source = InterconnectsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/pagers.py index 8c407791ab85..90b0da342a21 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/base.py index a69227a2231c..f1dca2553178 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/rest.py index c05b574c6703..75699ff0287a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -2053,9 +2053,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInterconnectsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/client.py index 7f513c7c994a..aed43dddcb3c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -594,11 +594,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LicenseCodesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LicenseCodesClient._read_environment_variables() + ) self._client_cert_source = LicenseCodesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -633,8 +631,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LicenseCodesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/base.py index e7db1e6d4c37..ecbb685fa746 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/rest.py index f12c9d32eb65..a02b75a0fdd8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -488,9 +488,7 @@ def __call__( """ - http_options = ( - _BaseLicenseCodesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseLicenseCodesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/client.py index 6dcb2384ecc2..63811581f2aa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LicensesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LicensesClient._read_environment_variables() + ) self._client_cert_source = LicensesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LicensesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/pagers.py index 2b47ce54b527..c2e326aec16f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/base.py index 7a880bf4642a..34ce938f3903 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/rest.py index 6071edd278b9..50c032aff193 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/client.py index dbc300c145e4..34825d5cb508 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MachineImagesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MachineImagesClient._read_environment_variables() + ) self._client_cert_source = MachineImagesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MachineImagesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/pagers.py index 0f61551a885c..7eda5ddc823e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/base.py index c05a31fa5c82..ede1b208fc34 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/rest.py index fd52ad6840d7..4a41b202b625 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1949,9 +1949,7 @@ def __call__( """ - http_options = ( - _BaseMachineImagesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseMachineImagesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/client.py index bcc8dfe42b04..8b40a1edfdbf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MachineTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MachineTypesClient._read_environment_variables() + ) self._client_cert_source = MachineTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MachineTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/pagers.py index 6327af205b00..9665a38428bd 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/base.py index 6580e9f7247f..815995aede1a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/rest.py index 8bd92f75b9f3..a377bc05fb8c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/client.py index 5b34c8d01e7c..2c97a475dea5 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class NetworkAttachmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkAttachmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkAttachmentsTransport]] _transport_registry["rest"] = NetworkAttachmentsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkAttachmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkAttachmentsClient._read_environment_variables() + ) self._client_cert_source = NetworkAttachmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkAttachmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/pagers.py index d86ea7380c37..f10c62862a4e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/__init__.py index f0a1ddd862ed..2920a592dd40 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import NetworkAttachmentsRestInterceptor, NetworkAttachmentsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkAttachmentsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkAttachmentsTransport]] _transport_registry["rest"] = NetworkAttachmentsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/base.py index 9182ff64fe0c..8fbd31a40b80 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/rest.py index 2e79457f508a..9f2465f59252 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -731,9 +731,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkAttachmentsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1280,9 +1278,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseNetworkAttachmentsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2020,9 +2016,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseNetworkAttachmentsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2173,9 +2167,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/client.py index a3bbd2406640..04bfd1e87760 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class NetworkEdgeSecurityServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] _transport_registry["rest"] = NetworkEdgeSecurityServicesRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkEdgeSecurityServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkEdgeSecurityServicesClient._read_environment_variables() + ) self._client_cert_source = ( NetworkEdgeSecurityServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkEdgeSecurityServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/pagers.py index 9edcfe0a36f7..25235a8891ce 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/__init__.py index 7eaed7b9e349..80d8b0a32470 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] _transport_registry["rest"] = NetworkEdgeSecurityServicesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/base.py index 576096eaa168..440ed7459719 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/rest.py index d919373a4ec9..bd958fe3779b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -513,9 +513,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -694,9 +692,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseDelete._get_transcoded_request( @@ -843,9 +839,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseGet._get_transcoded_request( @@ -1019,9 +1013,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseInsert._get_transcoded_request( @@ -1200,9 +1192,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BasePatch._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/client.py index c1e20d115918..4248d6427554 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class NetworkEndpointGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkEndpointGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEndpointGroupsTransport]] _transport_registry["rest"] = NetworkEndpointGroupsRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkEndpointGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkEndpointGroupsClient._read_environment_variables() + ) self._client_cert_source = NetworkEndpointGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkEndpointGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/pagers.py index 214cff7d1802..1760942269b8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/__init__.py index cd78182e83fb..1b70862e7803 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkEndpointGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEndpointGroupsTransport]] _transport_registry["rest"] = NetworkEndpointGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/base.py index f0998c19e2cc..481add0b92a0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/rest.py index 51d6ae1d2b18..d3c3bba68cce 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -745,9 +745,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkEndpointGroupsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -923,9 +921,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_attach_network_endpoints( request, metadata @@ -1281,9 +1277,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_detach_network_endpoints( request, metadata @@ -1918,9 +1912,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_list_network_endpoints( request, metadata @@ -2079,9 +2071,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2197,7 +2187,9 @@ def attach_network_endpoints( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AttachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._AttachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete( @@ -2215,7 +2207,9 @@ def detach_network_endpoints( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DetachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._DetachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/client.py index a6ec6f6c7f40..4f05f9a8093f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class NetworkFirewallPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] _transport_registry["rest"] = NetworkFirewallPoliciesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkFirewallPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkFirewallPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( NetworkFirewallPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkFirewallPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/pagers.py index 3cf0307d4a41..9c95b423e1e8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/__init__.py index 40078d68ba97..71ed19bf349c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] _transport_registry["rest"] = NetworkFirewallPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/base.py index 7497c85bf1a3..9e3413b89fb7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/rest.py index 2169bf16addf..7ee791c6f994 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1435,9 +1435,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1618,9 +1616,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAddPacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAddPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_add_packet_mirroring_rule( request, metadata @@ -1801,9 +1797,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1953,9 +1947,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2132,9 +2124,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() request, metadata = self._interceptor.pre_clone_rules(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_transcoded_request( @@ -2307,9 +2297,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -2601,9 +2589,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2826,9 +2812,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2977,9 +2961,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetPacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_get_packet_mirroring_rule( request, metadata @@ -3130,9 +3112,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -3306,9 +3286,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -3814,9 +3792,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BasePatchPacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BasePatchPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_patch_packet_mirroring_rule( request, metadata @@ -3997,9 +3973,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -4177,9 +4151,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -4359,9 +4331,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseRemovePacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseRemovePacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_remove_packet_mirroring_rule( request, metadata @@ -4536,9 +4506,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -4758,9 +4726,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -4911,9 +4877,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5028,7 +4992,9 @@ def add_packet_mirroring_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AddPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._AddPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def add_rule( @@ -5101,7 +5067,9 @@ def get_packet_mirroring_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._GetPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_rule( @@ -5148,7 +5116,9 @@ def patch_packet_mirroring_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PatchPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._PatchPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch_rule( @@ -5177,7 +5147,9 @@ def remove_packet_mirroring_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RemovePacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._RemovePacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def remove_rule( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/client.py index 5e2cda8a2f12..9bd8a8441c9a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class NetworkProfilesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkProfilesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkProfilesTransport]] _transport_registry["rest"] = NetworkProfilesRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkProfilesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkProfilesClient._read_environment_variables() + ) self._client_cert_source = NetworkProfilesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkProfilesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/pagers.py index d4cf40c18d78..051d9221b33e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/base.py index c7f275fc443a..50a7d181f3bb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/rest.py index edebc9dc6910..e4643603c432 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/client.py index eb48cc1a8ad0..2ced20a899cc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworksClient._read_environment_variables() + ) self._client_cert_source = NetworksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/pagers.py index 86aad0c556c2..383a4dc3ab77 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/base.py index e9eac97d2a32..76cbd44fa0b0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/rest.py index def25e9ac2af..da2552a18c43 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1209,9 +1209,7 @@ def __call__( """ - http_options = ( - _BaseNetworksRestTransport._BaseCancelRequestRemovePeering._get_http_options() - ) + http_options = _BaseNetworksRestTransport._BaseCancelRequestRemovePeering._get_http_options() request, metadata = self._interceptor.pre_cancel_request_remove_peering( request, metadata @@ -1280,11 +1278,10 @@ def __call__( resp = self._interceptor.post_cancel_request_remove_peering(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_cancel_request_remove_peering_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_cancel_request_remove_peering_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1686,9 +1683,7 @@ def __call__( """ - http_options = ( - _BaseNetworksRestTransport._BaseGetEffectiveFirewalls._get_http_options() - ) + http_options = _BaseNetworksRestTransport._BaseGetEffectiveFirewalls._get_http_options() request, metadata = self._interceptor.pre_get_effective_firewalls( request, metadata @@ -3324,7 +3319,9 @@ def cancel_request_remove_peering( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CancelRequestRemovePeering(self._session, self._host, self._interceptor) # type: ignore + return self._CancelRequestRemovePeering( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete(self) -> Callable[[compute.DeleteNetworkRequest], compute.Operation]: diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/client.py index c18d1a01a48e..893282afc36c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NodeGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NodeGroupsClient._read_environment_variables() + ) self._client_cert_source = NodeGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NodeGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/pagers.py index c7d6ca89e55a..6191cbec6853 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/base.py index d9e0975f5d2b..c9a7a551613b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/rest.py index 7453702b4e6e..63ffcf0ef1f2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -3385,9 +3385,7 @@ def __call__( """ - http_options = ( - _BaseNodeGroupsRestTransport._BaseSimulateMaintenanceEvent._get_http_options() - ) + http_options = _BaseNodeGroupsRestTransport._BaseSimulateMaintenanceEvent._get_http_options() request, metadata = self._interceptor.pre_simulate_maintenance_event( request, metadata @@ -3740,7 +3738,9 @@ def simulate_maintenance_event( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SimulateMaintenanceEvent(self._session, self._host, self._interceptor) # type: ignore + return self._SimulateMaintenanceEvent( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/client.py index 489ae6a9828f..e23fbce9422b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NodeTemplatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NodeTemplatesClient._read_environment_variables() + ) self._client_cert_source = NodeTemplatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NodeTemplatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/pagers.py index 2ec39315a456..87dbfcd3360d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/base.py index 93895e7db44d..ba2411aa4d37 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/rest.py index c46ba011aa39..f239fbf10ca2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1913,9 +1913,7 @@ def __call__( """ - http_options = ( - _BaseNodeTemplatesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNodeTemplatesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/client.py index 8cd82e939d77..f96737839a3a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NodeTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NodeTypesClient._read_environment_variables() + ) self._client_cert_source = NodeTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NodeTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/pagers.py index 102dda26b578..b0d2dd3f10cf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/base.py index 168025811251..f6046695285d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/rest.py index 4e29ed299a51..48dc5e9fb300 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/client.py index 39eab31e659f..79d4b459464d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class OrganizationSecurityPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] _transport_registry["rest"] = OrganizationSecurityPoliciesRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OrganizationSecurityPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OrganizationSecurityPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( OrganizationSecurityPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -655,8 +651,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OrganizationSecurityPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/pagers.py index df35322f213a..59990292a04f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/__init__.py index 4ea5804aaf22..9e6f8d312955 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] _transport_registry["rest"] = OrganizationSecurityPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/base.py index 2aeb9db168eb..0fa8bf0b753e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_organization_operations @@ -403,9 +403,9 @@ def _global_organization_operations_client( transport=self.kind, ) ) - self._extended_operations_services[ - "global_organization_operations" - ] = ex_op_service + self._extended_operations_services["global_organization_operations"] = ( + ex_op_service + ) return ex_op_service diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/rest.py index 1b718cf895d5..ef9186f191c7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1156,9 +1156,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1339,9 +1337,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1519,9 +1515,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseCopyRules._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseCopyRules._get_http_options() request, metadata = self._interceptor.pre_copy_rules(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseCopyRules._get_transcoded_request( @@ -1696,9 +1690,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -1849,9 +1841,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseGet._get_transcoded_request( @@ -1994,9 +1984,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2149,9 +2137,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -2325,9 +2311,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -2477,9 +2461,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseList._get_transcoded_request( @@ -2622,9 +2604,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseListAssociations._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseListAssociations._get_http_options() request, metadata = self._interceptor.pre_list_associations( request, metadata @@ -2778,15 +2758,12 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_preconfigured_expression_sets( - request, metadata + request, metadata = ( + self._interceptor.pre_list_preconfigured_expression_sets( + request, metadata + ) ) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_transcoded_request( http_options, request @@ -2849,11 +2826,10 @@ def __call__( resp = self._interceptor.post_list_preconfigured_expression_sets(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_preconfigured_expression_sets_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_preconfigured_expression_sets_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2965,9 +2941,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseMove._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseMove._get_http_options() request, metadata = self._interceptor.pre_move(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseMove._get_transcoded_request( @@ -3139,9 +3113,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BasePatch._get_transcoded_request( @@ -3320,9 +3292,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -3502,9 +3472,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -3679,9 +3647,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -3878,7 +3844,9 @@ def list_preconfigured_expression_sets( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListPreconfiguredExpressionSets(self._session, self._host, self._interceptor) # type: ignore + return self._ListPreconfiguredExpressionSets( + self._session, self._host, self._interceptor + ) # type: ignore @property def move( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/client.py index 16525a5633cb..cbb1a30275cf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class PacketMirroringsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PacketMirroringsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PacketMirroringsTransport]] _transport_registry["rest"] = PacketMirroringsRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PacketMirroringsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PacketMirroringsClient._read_environment_variables() + ) self._client_cert_source = PacketMirroringsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PacketMirroringsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/pagers.py index 9f20e64f5117..c6ea891a2a88 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/base.py index 26cbde122826..f6ca21b53c50 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/rest.py index 2ef71134ce71..b7a6403ca27b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -616,9 +616,7 @@ def __call__( Contains a list of packetMirrorings. """ - http_options = ( - _BasePacketMirroringsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BasePacketMirroringsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BasePacketMirroringsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1620,9 +1618,7 @@ def __call__( """ - http_options = ( - _BasePacketMirroringsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BasePacketMirroringsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/client.py index 351c484b1231..fd830359ad6c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class PreviewFeaturesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PreviewFeaturesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PreviewFeaturesTransport]] _transport_registry["rest"] = PreviewFeaturesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PreviewFeaturesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PreviewFeaturesClient._read_environment_variables() + ) self._client_cert_source = PreviewFeaturesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PreviewFeaturesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/pagers.py index 70e66ea77298..0d5a691c04db 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/base.py index 902ba7689db3..fc36ea26f1bf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/rest.py index 1d5ae7f5f5f9..9476b1eea30c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/client.py index 991433118f5c..0943c1327265 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProjectsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProjectsClient._read_environment_variables() + ) self._client_cert_source = ProjectsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProjectsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/pagers.py index 9b069ee8ebee..71378e4983af 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/base.py index 3bce9ed82b34..aa6352fcdfc0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/rest.py index 653c7057eb9f..261f79b78548 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -2958,9 +2958,7 @@ def __call__( """ - http_options = ( - _BaseProjectsRestTransport._BaseSetCommonInstanceMetadata._get_http_options() - ) + http_options = _BaseProjectsRestTransport._BaseSetCommonInstanceMetadata._get_http_options() request, metadata = self._interceptor.pre_set_common_instance_metadata( request, metadata @@ -3140,9 +3138,7 @@ def __call__( """ - http_options = ( - _BaseProjectsRestTransport._BaseSetDefaultNetworkTier._get_http_options() - ) + http_options = _BaseProjectsRestTransport._BaseSetDefaultNetworkTier._get_http_options() request, metadata = self._interceptor.pre_set_default_network_tier( request, metadata @@ -3323,9 +3319,7 @@ def __call__( """ - http_options = ( - _BaseProjectsRestTransport._BaseSetManagedProtectionTier._get_http_options() - ) + http_options = _BaseProjectsRestTransport._BaseSetManagedProtectionTier._get_http_options() request, metadata = self._interceptor.pre_set_managed_protection_tier( request, metadata @@ -3696,7 +3690,9 @@ def set_common_instance_metadata( ) -> Callable[[compute.SetCommonInstanceMetadataProjectRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetCommonInstanceMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._SetCommonInstanceMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_default_network_tier( @@ -3712,7 +3708,9 @@ def set_managed_protection_tier( ) -> Callable[[compute.SetManagedProtectionTierProjectRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetManagedProtectionTier(self._session, self._host, self._interceptor) # type: ignore + return self._SetManagedProtectionTier( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_usage_export_bucket( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/client.py index 6813aedc4d92..60c0be4083cb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class PublicAdvertisedPrefixesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] _transport_registry["rest"] = PublicAdvertisedPrefixesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PublicAdvertisedPrefixesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PublicAdvertisedPrefixesClient._read_environment_variables() + ) self._client_cert_source = ( PublicAdvertisedPrefixesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PublicAdvertisedPrefixesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/pagers.py index 9a7d7863d81a..59dd7a78f93a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/__init__.py index 650a8a373eb5..02e1ed39d336 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] _transport_registry["rest"] = PublicAdvertisedPrefixesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/base.py index fd8ebba77d07..9050a6faa16e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/rest.py index fdb90b26a73f..8a1ea5907a71 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -646,9 +646,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseAnnounce._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseAnnounce._get_http_options() request, metadata = self._interceptor.pre_announce(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseAnnounce._get_transcoded_request( @@ -821,9 +819,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseDelete._get_transcoded_request( @@ -1148,9 +1144,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseInsert._get_transcoded_request( @@ -1476,9 +1470,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BasePatch._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BasePatch._get_transcoded_request( @@ -1656,9 +1648,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseWithdraw._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseWithdraw._get_http_options() request, metadata = self._interceptor.pre_withdraw(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseWithdraw._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/client.py index 5077697c83c9..aa48306790e1 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class PublicDelegatedPrefixesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] _transport_registry["rest"] = PublicDelegatedPrefixesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PublicDelegatedPrefixesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PublicDelegatedPrefixesClient._read_environment_variables() + ) self._client_cert_source = ( PublicDelegatedPrefixesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PublicDelegatedPrefixesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/pagers.py index 84b4a82df534..0ecc67b27f54 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/__init__.py index d648523dc57a..0f7bd60f78b7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] _transport_registry["rest"] = PublicDelegatedPrefixesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/base.py index aa0238dad891..8653f3868e91 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/rest.py index 98e3bb5f5556..68d98ff07150 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -678,9 +678,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -857,9 +855,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseAnnounce._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseAnnounce._get_http_options() request, metadata = self._interceptor.pre_announce(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseAnnounce._get_transcoded_request( @@ -1032,9 +1028,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseDelete._get_transcoded_request( @@ -1362,9 +1356,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseInsert._get_transcoded_request( @@ -1870,9 +1862,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseWithdraw._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseWithdraw._get_http_options() request, metadata = self._interceptor.pre_withdraw(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseWithdraw._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/client.py index fcb73f163626..0e009cdba8e2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionAutoscalersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionAutoscalersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionAutoscalersTransport]] _transport_registry["rest"] = RegionAutoscalersRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionAutoscalersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionAutoscalersClient._read_environment_variables() + ) self._client_cert_source = RegionAutoscalersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionAutoscalersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/pagers.py index b3d041f5ed79..96bbe7e09c29 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/base.py index c45c34fef69c..6b3b8872d14f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/rest.py index 088ef49f729b..c67651c2892c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1474,9 +1474,7 @@ def __call__( """ - http_options = ( - _BaseRegionAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/client.py index 8db84b52c026..36c1becffeb7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionBackendBucketsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionBackendBucketsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionBackendBucketsTransport]] _transport_registry["rest"] = RegionBackendBucketsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionBackendBucketsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionBackendBucketsClient._read_environment_variables() + ) self._client_cert_source = RegionBackendBucketsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionBackendBucketsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/pagers.py index ba57b38f423e..e55a56f4ac84 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/__init__.py index d7bffabc6226..afd708c12c80 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import RegionBackendBucketsRestInterceptor, RegionBackendBucketsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionBackendBucketsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionBackendBucketsTransport]] _transport_registry["rest"] = RegionBackendBucketsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/base.py index f07a8d1bf475..987c4c068712 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/rest.py index 66e511d6d1b4..082243b4e1d4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1131,9 +1131,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendBucketsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRegionBackendBucketsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRegionBackendBucketsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1606,9 +1604,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendBucketsRestTransport._BaseListUsable._get_http_options() - ) + http_options = _BaseRegionBackendBucketsRestTransport._BaseListUsable._get_http_options() request, metadata = self._interceptor.pre_list_usable(request, metadata) transcoded_request = _BaseRegionBackendBucketsRestTransport._BaseListUsable._get_transcoded_request( @@ -2008,9 +2004,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendBucketsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRegionBackendBucketsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRegionBackendBucketsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2161,9 +2155,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendBucketsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionBackendBucketsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/client.py index 2a5ebf4dd28c..fdb6302453b6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionBackendServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionBackendServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionBackendServicesTransport]] _transport_registry["rest"] = RegionBackendServicesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionBackendServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionBackendServicesClient._read_environment_variables() + ) self._client_cert_source = RegionBackendServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionBackendServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/pagers.py index b74914a8ae22..1d3784e18db7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/__init__.py index 9168387b112f..9b9ab96e44da 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionBackendServicesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionBackendServicesTransport]] _transport_registry["rest"] = RegionBackendServicesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/base.py index 5e84b29f5a16..d5c72f965819 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/rest.py index 569a584ecbd1..96121de7b46c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1243,9 +1243,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseGetHealth._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseGetHealth._get_http_options() request, metadata = self._interceptor.pre_get_health(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseGetHealth._get_transcoded_request( @@ -1471,9 +1469,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1947,9 +1943,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseListUsable._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseListUsable._get_http_options() request, metadata = self._interceptor.pre_list_usable(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseListUsable._get_transcoded_request( @@ -2352,9 +2346,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2533,9 +2525,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_security_policy( request, metadata @@ -2690,9 +2680,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/client.py index 7e6f263a497f..9997dea6447f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionCommitmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionCommitmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionCommitmentsTransport]] _transport_registry["rest"] = RegionCommitmentsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionCommitmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionCommitmentsClient._read_environment_variables() + ) self._client_cert_source = RegionCommitmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionCommitmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/pagers.py index e5a698c0f996..38d1f489a9f4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/base.py index 5ece33156b0c..6073ffeac6be 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/rest.py index 197bf1747e3a..b085e048bbe2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -618,9 +618,7 @@ def __call__( """ - http_options = ( - _BaseRegionCommitmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseRegionCommitmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseRegionCommitmentsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1260,9 +1258,7 @@ def __call__( """ - http_options = ( - _BaseRegionCommitmentsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionCommitmentsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1629,9 +1625,7 @@ def __call__( """ - http_options = ( - _BaseRegionCommitmentsRestTransport._BaseUpdateReservations._get_http_options() - ) + http_options = _BaseRegionCommitmentsRestTransport._BaseUpdateReservations._get_http_options() request, metadata = self._interceptor.pre_update_reservations( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/client.py index 55d59ec9af48..4f7ac8a93275 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionCompositeHealthChecksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionCompositeHealthChecksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionCompositeHealthChecksTransport]] _transport_registry["rest"] = RegionCompositeHealthChecksRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionCompositeHealthChecksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionCompositeHealthChecksClient._read_environment_variables() + ) self._client_cert_source = ( RegionCompositeHealthChecksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionCompositeHealthChecksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/pagers.py index c712f01450f2..a9acd2eb190c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/__init__.py index 3fffc275301e..2f884b8d0ed8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionCompositeHealthChecksTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionCompositeHealthChecksTransport]] _transport_registry["rest"] = RegionCompositeHealthChecksRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/base.py index 0f126ee46142..825ed67501fc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/rest.py index 4100ac193d8b..b2c5a3d85b22 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -631,9 +631,7 @@ def __call__( """ - http_options = ( - _BaseRegionCompositeHealthChecksRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseRegionCompositeHealthChecksRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseRegionCompositeHealthChecksRestTransport._BaseAggregatedList._get_transcoded_request( @@ -810,9 +808,7 @@ def __call__( """ - http_options = ( - _BaseRegionCompositeHealthChecksRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionCompositeHealthChecksRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionCompositeHealthChecksRestTransport._BaseDelete._get_transcoded_request( @@ -965,9 +961,7 @@ def __call__( """ - http_options = ( - _BaseRegionCompositeHealthChecksRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionCompositeHealthChecksRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionCompositeHealthChecksRestTransport._BaseGet._get_transcoded_request( @@ -1139,9 +1133,7 @@ def __call__( """ - http_options = ( - _BaseRegionCompositeHealthChecksRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionCompositeHealthChecksRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionCompositeHealthChecksRestTransport._BaseInsert._get_transcoded_request( @@ -1291,9 +1283,7 @@ def __call__( """ - http_options = ( - _BaseRegionCompositeHealthChecksRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionCompositeHealthChecksRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionCompositeHealthChecksRestTransport._BaseList._get_transcoded_request( @@ -1467,9 +1457,7 @@ def __call__( """ - http_options = ( - _BaseRegionCompositeHealthChecksRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionCompositeHealthChecksRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionCompositeHealthChecksRestTransport._BasePatch._get_transcoded_request( @@ -1620,9 +1608,7 @@ def __call__( """ - http_options = ( - _BaseRegionCompositeHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionCompositeHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/client.py index 2c1b615c09c0..784d97f5898d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -78,9 +78,7 @@ class RegionDiskSettingsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionDiskSettingsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionDiskSettingsTransport]] _transport_registry["rest"] = RegionDiskSettingsRestTransport def get_transport_class( @@ -603,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionDiskSettingsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionDiskSettingsClient._read_environment_variables() + ) self._client_cert_source = RegionDiskSettingsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -642,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionDiskSettingsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/__init__.py index a831e60b2b86..a3d148a9f396 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import RegionDiskSettingsRestInterceptor, RegionDiskSettingsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionDiskSettingsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionDiskSettingsTransport]] _transport_registry["rest"] = RegionDiskSettingsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/base.py index 65694a0a408b..54620a49aa73 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/rest.py index 7ed5ccb9edb3..a50ef25d058f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/client.py index 1c50d86b9ffb..23e2767120e0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class RegionDiskTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionDiskTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionDiskTypesTransport]] _transport_registry["rest"] = RegionDiskTypesRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionDiskTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionDiskTypesClient._read_environment_variables() + ) self._client_cert_source = RegionDiskTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionDiskTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/pagers.py index a1f55769023e..bb0e3f2d2df4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/base.py index 3b600f57f2c2..74c789455e65 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/rest.py index fc234d722f5c..cd0850a2c1a0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/client.py index 9683cc8fa288..f8e19eaa511c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionDisksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionDisksClient._read_environment_variables() + ) self._client_cert_source = RegionDisksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionDisksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/pagers.py index 7206d9742268..9260174134b2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/base.py index 43a45698385b..cf4e8c051bdf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/rest.py index 6f94aaa160dd..16b52175c210 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1187,9 +1187,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseAddResourcePolicies._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseAddResourcePolicies._get_http_options() request, metadata = self._interceptor.pre_add_resource_policies( request, metadata @@ -2617,9 +2615,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseRemoveResourcePolicies._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseRemoveResourcePolicies._get_http_options() request, metadata = self._interceptor.pre_remove_resource_policies( request, metadata @@ -3393,9 +3389,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseStartAsyncReplication._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseStartAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_start_async_replication( request, metadata @@ -3574,9 +3568,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseStopAsyncReplication._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseStopAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_stop_async_replication( request, metadata @@ -3753,9 +3745,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_stop_group_async_replication( request, metadata @@ -3909,9 +3899,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -4248,7 +4236,9 @@ def remove_resource_policies( ) -> Callable[[compute.RemoveResourcePoliciesRegionDiskRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RemoveResourcePolicies(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveResourcePolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def resize(self) -> Callable[[compute.ResizeRegionDiskRequest], compute.Operation]: @@ -4296,7 +4286,9 @@ def stop_group_async_replication( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._StopGroupAsyncReplication(self._session, self._host, self._interceptor) # type: ignore + return self._StopGroupAsyncReplication( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/client.py index b5f7cfd1a2b8..3375966bccf2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -84,9 +84,7 @@ class RegionHealthAggregationPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionHealthAggregationPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthAggregationPoliciesTransport]] _transport_registry["rest"] = RegionHealthAggregationPoliciesRestTransport def get_transport_class( @@ -617,11 +615,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionHealthAggregationPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionHealthAggregationPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( RegionHealthAggregationPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -662,8 +658,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionHealthAggregationPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/pagers.py index 55862d8b7170..531bf0795d88 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -150,7 +150,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/__init__.py index 278ca78ce726..854282b6a5d6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionHealthAggregationPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthAggregationPoliciesTransport]] _transport_registry["rest"] = RegionHealthAggregationPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/base.py index 0b73a0034889..5f6fc026b54f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/rest.py index 652d0fba9b71..3608fb4f7555 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -635,9 +635,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthAggregationPoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseRegionHealthAggregationPoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseRegionHealthAggregationPoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -812,9 +810,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthAggregationPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionHealthAggregationPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionHealthAggregationPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -968,9 +964,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthAggregationPoliciesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionHealthAggregationPoliciesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionHealthAggregationPoliciesRestTransport._BaseGet._get_transcoded_request( @@ -1142,9 +1136,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthAggregationPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionHealthAggregationPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionHealthAggregationPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -1296,9 +1288,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthAggregationPoliciesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionHealthAggregationPoliciesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionHealthAggregationPoliciesRestTransport._BaseList._get_transcoded_request( @@ -1472,9 +1462,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthAggregationPoliciesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionHealthAggregationPoliciesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionHealthAggregationPoliciesRestTransport._BasePatch._get_transcoded_request( @@ -1629,9 +1617,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthAggregationPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionHealthAggregationPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/client.py index 681f808b7759..a259c0dd077d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionHealthCheckServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionHealthCheckServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthCheckServicesTransport]] _transport_registry["rest"] = RegionHealthCheckServicesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionHealthCheckServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionHealthCheckServicesClient._read_environment_variables() + ) self._client_cert_source = ( RegionHealthCheckServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionHealthCheckServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/pagers.py index a5a15769686d..f2bf3341d350 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/__init__.py index 251cbe2cc4da..d75676f50849 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionHealthCheckServicesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthCheckServicesTransport]] _transport_registry["rest"] = RegionHealthCheckServicesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/base.py index 671f860922ac..ad4532566a0f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/rest.py index ab380925a2d3..6708f93b781a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -597,9 +597,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BaseDelete._get_transcoded_request( @@ -920,9 +918,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BaseInsert._get_transcoded_request( @@ -1072,9 +1068,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BaseList._get_transcoded_request( @@ -1246,9 +1240,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BasePatch._get_transcoded_request( @@ -1399,9 +1391,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/client.py index 23c27b127b3c..45d0ac000ba5 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionHealthChecksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionHealthChecksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthChecksTransport]] _transport_registry["rest"] = RegionHealthChecksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionHealthChecksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionHealthChecksClient._read_environment_variables() + ) self._client_cert_source = RegionHealthChecksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionHealthChecksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/pagers.py index c9c7e6b2424a..785aa9944e57 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/__init__.py index 4cf5cc2f2dee..b5068a49f468 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import RegionHealthChecksRestInterceptor, RegionHealthChecksRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionHealthChecksTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthChecksTransport]] _transport_registry["rest"] = RegionHealthChecksRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/base.py index 03c7bed64dbb..8e1f20c03ba6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/rest.py index 11d7e7d06e09..baa6ff4a9f5c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1482,9 +1482,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/client.py index 7cf83097a3a1..ff81a08b21bc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionHealthSourcesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionHealthSourcesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthSourcesTransport]] _transport_registry["rest"] = RegionHealthSourcesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionHealthSourcesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionHealthSourcesClient._read_environment_variables() + ) self._client_cert_source = RegionHealthSourcesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionHealthSourcesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/pagers.py index ad16f88a1dc8..13eb4910659a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/__init__.py index b1c0d0e70377..ed517a535b8f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import RegionHealthSourcesRestInterceptor, RegionHealthSourcesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionHealthSourcesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthSourcesTransport]] _transport_registry["rest"] = RegionHealthSourcesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/base.py index 7b4626531708..69ebf9b7eeaf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/rest.py index d28f2fe3ea18..be72767136f9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -617,9 +617,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthSourcesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseRegionHealthSourcesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseRegionHealthSourcesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1608,9 +1606,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthSourcesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionHealthSourcesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/client.py index df4d89e6f8b2..f6cd8782d495 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -84,9 +84,7 @@ class RegionInstanceGroupManagerResizeRequestsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstanceGroupManagerResizeRequestsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupManagerResizeRequestsTransport]] _transport_registry["rest"] = RegionInstanceGroupManagerResizeRequestsRestTransport def get_transport_class( @@ -621,11 +619,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstanceGroupManagerResizeRequestsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstanceGroupManagerResizeRequestsClient._read_environment_variables() + ) self._client_cert_source = ( RegionInstanceGroupManagerResizeRequestsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -666,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast( RegionInstanceGroupManagerResizeRequestsTransport, transport diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/pagers.py index b4b2cf260913..a139ae7c4a40 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/pagers.py @@ -69,7 +69,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/__init__.py index 4b6e60b2a658..b3dbb91be6ed 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstanceGroupManagerResizeRequestsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupManagerResizeRequestsTransport]] _transport_registry["rest"] = RegionInstanceGroupManagerResizeRequestsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/base.py index c3179a12f4af..507118a68db2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/rest.py index f42a7db11e1f..931d7f62983d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -546,9 +546,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_http_options() request, metadata = self._interceptor.pre_cancel(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_transcoded_request( @@ -721,9 +719,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_transcoded_request( @@ -876,9 +872,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_transcoded_request( @@ -1052,9 +1046,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_transcoded_request( @@ -1204,9 +1196,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/client.py index ab6dd4449f65..3e686f0fb68e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionInstanceGroupManagersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] _transport_registry["rest"] = RegionInstanceGroupManagersRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstanceGroupManagersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstanceGroupManagersClient._read_environment_variables() + ) self._client_cert_source = ( RegionInstanceGroupManagersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstanceGroupManagersTransport, transport) self._api_endpoint = self._transport.host @@ -863,9 +858,7 @@ def sample_abandon_instances(): region_instance_group_managers_abandon_instances_request_resource is not None ): - request.region_instance_group_managers_abandon_instances_request_resource = ( - region_instance_group_managers_abandon_instances_request_resource - ) + request.region_instance_group_managers_abandon_instances_request_resource = region_instance_group_managers_abandon_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1039,9 +1032,7 @@ def sample_abandon_instances(): region_instance_group_managers_abandon_instances_request_resource is not None ): - request.region_instance_group_managers_abandon_instances_request_resource = ( - region_instance_group_managers_abandon_instances_request_resource - ) + request.region_instance_group_managers_abandon_instances_request_resource = region_instance_group_managers_abandon_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1234,9 +1225,7 @@ def sample_adopt_instances(): region_instance_group_managers_adopt_instances_request_resource is not None ): - request.region_instance_group_managers_adopt_instances_request_resource = ( - region_instance_group_managers_adopt_instances_request_resource - ) + request.region_instance_group_managers_adopt_instances_request_resource = region_instance_group_managers_adopt_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1404,9 +1393,7 @@ def sample_adopt_instances(): region_instance_group_managers_adopt_instances_request_resource is not None ): - request.region_instance_group_managers_adopt_instances_request_resource = ( - region_instance_group_managers_adopt_instances_request_resource - ) + request.region_instance_group_managers_adopt_instances_request_resource = region_instance_group_managers_adopt_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1593,9 +1580,7 @@ def sample_apply_updates_to_instances(): region_instance_group_managers_apply_updates_request_resource is not None ): - request.region_instance_group_managers_apply_updates_request_resource = ( - region_instance_group_managers_apply_updates_request_resource - ) + request.region_instance_group_managers_apply_updates_request_resource = region_instance_group_managers_apply_updates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1759,9 +1744,7 @@ def sample_apply_updates_to_instances(): region_instance_group_managers_apply_updates_request_resource is not None ): - request.region_instance_group_managers_apply_updates_request_resource = ( - region_instance_group_managers_apply_updates_request_resource - ) + request.region_instance_group_managers_apply_updates_request_resource = region_instance_group_managers_apply_updates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1953,9 +1936,7 @@ def sample_create_instances(): region_instance_group_managers_create_instances_request_resource is not None ): - request.region_instance_group_managers_create_instances_request_resource = ( - region_instance_group_managers_create_instances_request_resource - ) + request.region_instance_group_managers_create_instances_request_resource = region_instance_group_managers_create_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2120,9 +2101,7 @@ def sample_create_instances(): region_instance_group_managers_create_instances_request_resource is not None ): - request.region_instance_group_managers_create_instances_request_resource = ( - region_instance_group_managers_create_instances_request_resource - ) + request.region_instance_group_managers_create_instances_request_resource = region_instance_group_managers_create_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2622,9 +2601,7 @@ def sample_delete_instances(): region_instance_group_managers_delete_instances_request_resource is not None ): - request.region_instance_group_managers_delete_instances_request_resource = ( - region_instance_group_managers_delete_instances_request_resource - ) + request.region_instance_group_managers_delete_instances_request_resource = region_instance_group_managers_delete_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2798,9 +2775,7 @@ def sample_delete_instances(): region_instance_group_managers_delete_instances_request_resource is not None ): - request.region_instance_group_managers_delete_instances_request_resource = ( - region_instance_group_managers_delete_instances_request_resource - ) + request.region_instance_group_managers_delete_instances_request_resource = region_instance_group_managers_delete_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2987,9 +2962,7 @@ def sample_delete_per_instance_configs(): region_instance_group_manager_delete_instance_config_req_resource is not None ): - request.region_instance_group_manager_delete_instance_config_req_resource = ( - region_instance_group_manager_delete_instance_config_req_resource - ) + request.region_instance_group_manager_delete_instance_config_req_resource = region_instance_group_manager_delete_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -3153,9 +3126,7 @@ def sample_delete_per_instance_configs(): region_instance_group_manager_delete_instance_config_req_resource is not None ): - request.region_instance_group_manager_delete_instance_config_req_resource = ( - region_instance_group_manager_delete_instance_config_req_resource - ) + request.region_instance_group_manager_delete_instance_config_req_resource = region_instance_group_manager_delete_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4788,9 +4759,7 @@ def sample_patch_per_instance_configs(): region_instance_group_manager_patch_instance_config_req_resource is not None ): - request.region_instance_group_manager_patch_instance_config_req_resource = ( - region_instance_group_manager_patch_instance_config_req_resource - ) + request.region_instance_group_manager_patch_instance_config_req_resource = region_instance_group_manager_patch_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4956,9 +4925,7 @@ def sample_patch_per_instance_configs(): region_instance_group_manager_patch_instance_config_req_resource is not None ): - request.region_instance_group_manager_patch_instance_config_req_resource = ( - region_instance_group_manager_patch_instance_config_req_resource - ) + request.region_instance_group_manager_patch_instance_config_req_resource = region_instance_group_manager_patch_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -5885,9 +5852,7 @@ def sample_resize_advanced(): region_instance_group_managers_resize_advanced_request_resource is not None ): - request.region_instance_group_managers_resize_advanced_request_resource = ( - region_instance_group_managers_resize_advanced_request_resource - ) + request.region_instance_group_managers_resize_advanced_request_resource = region_instance_group_managers_resize_advanced_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6067,9 +6032,7 @@ def sample_resize_advanced(): region_instance_group_managers_resize_advanced_request_resource is not None ): - request.region_instance_group_managers_resize_advanced_request_resource = ( - region_instance_group_managers_resize_advanced_request_resource - ) + request.region_instance_group_managers_resize_advanced_request_resource = region_instance_group_managers_resize_advanced_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6269,9 +6232,7 @@ def sample_resume_instances(): region_instance_group_managers_resume_instances_request_resource is not None ): - request.region_instance_group_managers_resume_instances_request_resource = ( - region_instance_group_managers_resume_instances_request_resource - ) + request.region_instance_group_managers_resume_instances_request_resource = region_instance_group_managers_resume_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6446,9 +6407,7 @@ def sample_resume_instances(): region_instance_group_managers_resume_instances_request_resource is not None ): - request.region_instance_group_managers_resume_instances_request_resource = ( - region_instance_group_managers_resume_instances_request_resource - ) + request.region_instance_group_managers_resume_instances_request_resource = region_instance_group_managers_resume_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6632,9 +6591,7 @@ def sample_set_auto_healing_policies(): region_instance_group_managers_set_auto_healing_request_resource is not None ): - request.region_instance_group_managers_set_auto_healing_request_resource = ( - region_instance_group_managers_set_auto_healing_request_resource - ) + request.region_instance_group_managers_set_auto_healing_request_resource = region_instance_group_managers_set_auto_healing_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6795,9 +6752,7 @@ def sample_set_auto_healing_policies(): region_instance_group_managers_set_auto_healing_request_resource is not None ): - request.region_instance_group_managers_set_auto_healing_request_resource = ( - region_instance_group_managers_set_auto_healing_request_resource - ) + request.region_instance_group_managers_set_auto_healing_request_resource = region_instance_group_managers_set_auto_healing_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7326,9 +7281,7 @@ def sample_set_target_pools(): region_instance_group_managers_set_target_pools_request_resource is not None ): - request.region_instance_group_managers_set_target_pools_request_resource = ( - region_instance_group_managers_set_target_pools_request_resource - ) + request.region_instance_group_managers_set_target_pools_request_resource = region_instance_group_managers_set_target_pools_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7485,9 +7438,7 @@ def sample_set_target_pools(): region_instance_group_managers_set_target_pools_request_resource is not None ): - request.region_instance_group_managers_set_target_pools_request_resource = ( - region_instance_group_managers_set_target_pools_request_resource - ) + request.region_instance_group_managers_set_target_pools_request_resource = region_instance_group_managers_set_target_pools_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7687,9 +7638,7 @@ def sample_start_instances(): region_instance_group_managers_start_instances_request_resource is not None ): - request.region_instance_group_managers_start_instances_request_resource = ( - region_instance_group_managers_start_instances_request_resource - ) + request.region_instance_group_managers_start_instances_request_resource = region_instance_group_managers_start_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7864,9 +7813,7 @@ def sample_start_instances(): region_instance_group_managers_start_instances_request_resource is not None ): - request.region_instance_group_managers_start_instances_request_resource = ( - region_instance_group_managers_start_instances_request_resource - ) + request.region_instance_group_managers_start_instances_request_resource = region_instance_group_managers_start_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -8080,9 +8027,7 @@ def sample_stop_instances(): region_instance_group_managers_stop_instances_request_resource is not None ): - request.region_instance_group_managers_stop_instances_request_resource = ( - region_instance_group_managers_stop_instances_request_resource - ) + request.region_instance_group_managers_stop_instances_request_resource = region_instance_group_managers_stop_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -8271,9 +8216,7 @@ def sample_stop_instances(): region_instance_group_managers_stop_instances_request_resource is not None ): - request.region_instance_group_managers_stop_instances_request_resource = ( - region_instance_group_managers_stop_instances_request_resource - ) + request.region_instance_group_managers_stop_instances_request_resource = region_instance_group_managers_stop_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -8485,9 +8428,7 @@ def sample_suspend_instances(): region_instance_group_managers_suspend_instances_request_resource is not None ): - request.region_instance_group_managers_suspend_instances_request_resource = ( - region_instance_group_managers_suspend_instances_request_resource - ) + request.region_instance_group_managers_suspend_instances_request_resource = region_instance_group_managers_suspend_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -8674,9 +8615,7 @@ def sample_suspend_instances(): region_instance_group_managers_suspend_instances_request_resource is not None ): - request.region_instance_group_managers_suspend_instances_request_resource = ( - region_instance_group_managers_suspend_instances_request_resource - ) + request.region_instance_group_managers_suspend_instances_request_resource = region_instance_group_managers_suspend_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -9377,9 +9316,7 @@ def sample_update_per_instance_configs(): region_instance_group_manager_update_instance_config_req_resource is not None ): - request.region_instance_group_manager_update_instance_config_req_resource = ( - region_instance_group_manager_update_instance_config_req_resource - ) + request.region_instance_group_manager_update_instance_config_req_resource = region_instance_group_manager_update_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -9545,9 +9482,7 @@ def sample_update_per_instance_configs(): region_instance_group_manager_update_instance_config_req_resource is not None ): - request.region_instance_group_manager_update_instance_config_req_resource = ( - region_instance_group_manager_update_instance_config_req_resource - ) + request.region_instance_group_manager_update_instance_config_req_resource = region_instance_group_manager_update_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/pagers.py index 2536c19f8b18..c072729eadb7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -219,7 +219,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/__init__.py index 893f6c69a453..9beb4c2b5cab 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] _transport_registry["rest"] = RegionInstanceGroupManagersRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/base.py index 41b374f0d286..550c6ef4287d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/rest.py index cd1bdc8eaac0..1fd91783d38e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1835,9 +1835,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() request, metadata = self._interceptor.pre_abandon_instances( request, metadata @@ -2018,9 +2016,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseAdoptInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseAdoptInstances._get_http_options() request, metadata = self._interceptor.pre_adopt_instances(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseAdoptInstances._get_transcoded_request( @@ -2204,9 +2200,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() request, metadata = self._interceptor.pre_apply_updates_to_instances( request, metadata @@ -2387,9 +2381,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() request, metadata = self._interceptor.pre_create_instances( request, metadata @@ -2571,9 +2563,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseDelete._get_transcoded_request( @@ -2747,9 +2737,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() request, metadata = self._interceptor.pre_delete_instances( request, metadata @@ -2935,9 +2923,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_delete_per_instance_configs( request, metadata @@ -3101,9 +3087,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseGet._get_transcoded_request( @@ -3275,9 +3259,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseInsert._get_transcoded_request( @@ -3429,9 +3411,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseList._get_transcoded_request( @@ -3576,9 +3556,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() request, metadata = self._interceptor.pre_list_errors(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseListErrors._get_transcoded_request( @@ -3729,9 +3707,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() request, metadata = self._interceptor.pre_list_managed_instances( request, metadata @@ -3882,9 +3858,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_list_per_instance_configs( request, metadata @@ -4064,9 +4038,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BasePatch._get_transcoded_request( @@ -4248,9 +4220,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_patch_per_instance_configs( request, metadata @@ -4431,9 +4401,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() request, metadata = self._interceptor.pre_recreate_instances( request, metadata @@ -4613,9 +4581,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseResize._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseResize._get_http_options() request, metadata = self._interceptor.pre_resize(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseResize._get_transcoded_request( @@ -4789,9 +4755,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseResizeAdvanced._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseResizeAdvanced._get_http_options() request, metadata = self._interceptor.pre_resize_advanced(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseResizeAdvanced._get_transcoded_request( @@ -4972,9 +4936,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() request, metadata = self._interceptor.pre_resume_instances( request, metadata @@ -5159,9 +5121,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseSetAutoHealingPolicies._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseSetAutoHealingPolicies._get_http_options() request, metadata = self._interceptor.pre_set_auto_healing_policies( request, metadata @@ -5342,9 +5302,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() request, metadata = self._interceptor.pre_set_instance_template( request, metadata @@ -5525,9 +5483,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() request, metadata = self._interceptor.pre_set_target_pools( request, metadata @@ -5710,9 +5666,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() request, metadata = self._interceptor.pre_start_instances(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseStartInstances._get_transcoded_request( @@ -5893,9 +5847,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() request, metadata = self._interceptor.pre_stop_instances(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseStopInstances._get_transcoded_request( @@ -6076,9 +6028,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() request, metadata = self._interceptor.pre_suspend_instances( request, metadata @@ -6231,9 +6181,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -6414,9 +6362,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseUpdate._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseUpdate._get_http_options() request, metadata = self._interceptor.pre_update(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseUpdate._get_transcoded_request( @@ -6598,9 +6544,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_update_per_instance_configs( request, metadata @@ -6724,7 +6668,9 @@ def apply_updates_to_instances( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ApplyUpdatesToInstances(self._session, self._host, self._interceptor) # type: ignore + return self._ApplyUpdatesToInstances( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_instances( @@ -6763,7 +6709,9 @@ def delete_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeletePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( @@ -6825,7 +6773,9 @@ def list_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch( @@ -6844,7 +6794,9 @@ def patch_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PatchPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._PatchPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def recreate_instances( @@ -6893,7 +6845,9 @@ def set_auto_healing_policies( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetAutoHealingPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._SetAutoHealingPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_instance_template( @@ -6974,7 +6928,9 @@ def update_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdatePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/client.py index 178f4b4a9973..86bd8306ce92 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionInstanceGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstanceGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupsTransport]] _transport_registry["rest"] = RegionInstanceGroupsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstanceGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstanceGroupsClient._read_environment_variables() + ) self._client_cert_source = RegionInstanceGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstanceGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/pagers.py index 0e10ba2b7a74..11785f815073 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/__init__.py index 64ee5dcb38b2..4e1ced171a44 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import RegionInstanceGroupsRestInterceptor, RegionInstanceGroupsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstanceGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupsTransport]] _transport_registry["rest"] = RegionInstanceGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/base.py index 934b8166f9c2..7193e2955a5b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/rest.py index 1860f127dfcc..912eb722fb7a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -833,9 +833,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupsRestTransport._BaseListInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupsRestTransport._BaseListInstances._get_http_options() request, metadata = self._interceptor.pre_list_instances(request, metadata) transcoded_request = _BaseRegionInstanceGroupsRestTransport._BaseListInstances._get_transcoded_request( @@ -1016,9 +1014,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupsRestTransport._BaseSetNamedPorts._get_http_options() - ) + http_options = _BaseRegionInstanceGroupsRestTransport._BaseSetNamedPorts._get_http_options() request, metadata = self._interceptor.pre_set_named_ports(request, metadata) transcoded_request = _BaseRegionInstanceGroupsRestTransport._BaseSetNamedPorts._get_transcoded_request( @@ -1169,9 +1165,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/client.py index 81cda79aa278..d0092c8099a7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionInstanceTemplatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstanceTemplatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceTemplatesTransport]] _transport_registry["rest"] = RegionInstanceTemplatesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstanceTemplatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstanceTemplatesClient._read_environment_variables() + ) self._client_cert_source = ( RegionInstanceTemplatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstanceTemplatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/pagers.py index cbb93ffabfb8..2b4ab4d2a1c4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/__init__.py index 37ac6b1ce0d9..91c96fdb74c4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstanceTemplatesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceTemplatesTransport]] _transport_registry["rest"] = RegionInstanceTemplatesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/base.py index 1ab7ff52399c..759f1f9e9f56 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/rest.py index aa5d635caf7e..0669461af948 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -477,9 +477,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceTemplatesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionInstanceTemplatesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionInstanceTemplatesRestTransport._BaseDelete._get_transcoded_request( @@ -817,9 +815,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceTemplatesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionInstanceTemplatesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionInstanceTemplatesRestTransport._BaseInsert._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/client.py index 6317fc44a73e..78c874bffb1e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -78,9 +78,7 @@ class RegionInstancesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstancesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstancesTransport]] _transport_registry["rest"] = RegionInstancesRestTransport def get_transport_class( @@ -601,11 +599,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstancesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstancesClient._read_environment_variables() + ) self._client_cert_source = RegionInstancesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +636,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstancesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/base.py index 42859c77104d..0de37a2675d8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/rest.py index cd16e36170c7..b092b954e7a0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/client.py index 859c07d12967..d1125192f096 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionInstantSnapshotsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstantSnapshotsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstantSnapshotsTransport]] _transport_registry["rest"] = RegionInstantSnapshotsRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstantSnapshotsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstantSnapshotsClient._read_environment_variables() + ) self._client_cert_source = RegionInstantSnapshotsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstantSnapshotsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/pagers.py index 6da3a0e15063..12f7a6b363fa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/__init__.py index c79504fba846..d67a8b7e1a0e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstantSnapshotsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstantSnapshotsTransport]] _transport_registry["rest"] = RegionInstantSnapshotsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/base.py index a53c09a038a2..9f7cba7b284c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/rest.py index af62a9392ce8..c306dbdae13b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1070,9 +1070,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRegionInstantSnapshotsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1620,9 +1618,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRegionInstantSnapshotsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1801,9 +1797,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseRegionInstantSnapshotsRestTransport._BaseSetLabels._get_transcoded_request( @@ -1954,9 +1948,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/client.py index 91f9e235bf9e..4c190f9cf00e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class RegionMultiMigMembersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionMultiMigMembersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionMultiMigMembersTransport]] _transport_registry["rest"] = RegionMultiMigMembersRestTransport def get_transport_class( @@ -603,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionMultiMigMembersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionMultiMigMembersClient._read_environment_variables() + ) self._client_cert_source = RegionMultiMigMembersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -642,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionMultiMigMembersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/pagers.py index 07d4eccab9fa..8cd83487a745 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/__init__.py index 3c6a7fe7211d..4fe065b6877a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionMultiMigMembersTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionMultiMigMembersTransport]] _transport_registry["rest"] = RegionMultiMigMembersRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/base.py index e0d742df9f5d..f6a127d47661 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/rest.py index c6c470d2b0ac..e0b5963d8a03 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/client.py index 1440b80a9d51..81a95ca0810c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionMultiMigsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionMultiMigsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionMultiMigsTransport]] _transport_registry["rest"] = RegionMultiMigsRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionMultiMigsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionMultiMigsClient._read_environment_variables() + ) self._client_cert_source = RegionMultiMigsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionMultiMigsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/pagers.py index 1bf6a20d3135..7fdf0e68b9ab 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/base.py index d35949b5260c..205e8a327589 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/rest.py index 43b50c2c55e0..7206c9754484 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/client.py index 6bf8c738f7fa..bc590dd69394 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionNetworkEndpointGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] _transport_registry["rest"] = RegionNetworkEndpointGroupsRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionNetworkEndpointGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionNetworkEndpointGroupsClient._read_environment_variables() + ) self._client_cert_source = ( RegionNetworkEndpointGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionNetworkEndpointGroupsTransport, transport) self._api_endpoint = self._transport.host @@ -852,9 +847,7 @@ def sample_attach_network_endpoints(): region_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_attach_endpoints_request_resource = ( - region_network_endpoint_groups_attach_endpoints_request_resource - ) + request.region_network_endpoint_groups_attach_endpoints_request_resource = region_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1017,9 +1010,7 @@ def sample_attach_network_endpoints(): region_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_attach_endpoints_request_resource = ( - region_network_endpoint_groups_attach_endpoints_request_resource - ) + request.region_network_endpoint_groups_attach_endpoints_request_resource = region_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1514,9 +1505,7 @@ def sample_detach_network_endpoints(): region_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_detach_endpoints_request_resource = ( - region_network_endpoint_groups_detach_endpoints_request_resource - ) + request.region_network_endpoint_groups_detach_endpoints_request_resource = region_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1679,9 +1668,7 @@ def sample_detach_network_endpoints(): region_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_detach_endpoints_request_resource = ( - region_network_endpoint_groups_detach_endpoints_request_resource - ) + request.region_network_endpoint_groups_detach_endpoints_request_resource = region_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/pagers.py index 5a123a819683..a8704417d1b6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/__init__.py index 3dd7945713af..da8323cc3026 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] _transport_registry["rest"] = RegionNetworkEndpointGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/base.py index 0b0a41277da3..b728d4f962ae 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/rest.py index be51849c59a8..afc3fb77ed79 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -660,9 +660,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_attach_network_endpoints( request, metadata @@ -842,9 +840,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseDelete._get_transcoded_request( @@ -1020,9 +1016,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_detach_network_endpoints( request, metadata @@ -1183,9 +1177,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseGet._get_transcoded_request( @@ -1357,9 +1349,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseInsert._get_transcoded_request( @@ -1509,9 +1499,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseList._get_transcoded_request( @@ -1656,9 +1644,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_list_network_endpoints( request, metadata @@ -1761,7 +1747,9 @@ def attach_network_endpoints( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AttachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._AttachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete( @@ -1780,7 +1768,9 @@ def detach_network_endpoints( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DetachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._DetachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/client.py index 9d42dc231528..e60afcb1c663 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionNetworkFirewallPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] _transport_registry["rest"] = RegionNetworkFirewallPoliciesRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionNetworkFirewallPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionNetworkFirewallPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( RegionNetworkFirewallPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -657,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionNetworkFirewallPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/pagers.py index 73e954ba9a83..662af83b15e9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/__init__.py index 433f662fc5c8..f3263c79b48b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] _transport_registry["rest"] = RegionNetworkFirewallPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/base.py index 72f96b8bab2b..3a54b34d9652 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/rest.py index b281f281392a..74b70562f3c6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1268,9 +1268,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1449,9 +1447,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1631,9 +1627,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() request, metadata = self._interceptor.pre_clone_rules(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_transcoded_request( @@ -1808,9 +1802,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -1957,9 +1949,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGet._get_transcoded_request( @@ -2102,9 +2092,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2253,9 +2241,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetEffectiveFirewalls._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetEffectiveFirewalls._get_http_options() request, metadata = self._interceptor.pre_get_effective_firewalls( request, metadata @@ -2482,9 +2468,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2635,9 +2619,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -2813,9 +2795,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -2965,9 +2945,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseList._get_transcoded_request( @@ -3139,9 +3117,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatch._get_transcoded_request( @@ -3320,9 +3296,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchAssociation._get_http_options() request, metadata = self._interceptor.pre_patch_association( request, metadata @@ -3503,9 +3477,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -3685,9 +3657,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -3862,9 +3832,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -4086,9 +4054,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -4241,9 +4207,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/client.py index f14119f9aa83..608a75ce5384 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionNetworkPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionNetworkPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkPoliciesTransport]] _transport_registry["rest"] = RegionNetworkPoliciesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionNetworkPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionNetworkPoliciesClient._read_environment_variables() + ) self._client_cert_source = RegionNetworkPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionNetworkPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/pagers.py index 97689cf06f1a..5e46a1f8994e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/__init__.py index 3aea4021a71d..cdc33a7ff41c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionNetworkPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkPoliciesTransport]] _transport_registry["rest"] = RegionNetworkPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/base.py index 283e27478f7e..f55aabcd7ef8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/rest.py index 1b5efe483c7d..f034385a2448 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -990,9 +990,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseRegionNetworkPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1174,9 +1172,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BaseAddTrafficClassificationRule._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BaseAddTrafficClassificationRule._get_http_options() request, metadata = self._interceptor.pre_add_traffic_classification_rule( request, metadata @@ -1245,11 +1241,10 @@ def __call__( resp = self._interceptor.post_add_traffic_classification_rule(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_add_traffic_classification_rule_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_add_traffic_classification_rule_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1331,9 +1326,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseRegionNetworkPoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1801,9 +1794,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseRegionNetworkPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -1958,9 +1949,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BaseGetTrafficClassificationRule._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BaseGetTrafficClassificationRule._get_http_options() request, metadata = self._interceptor.pre_get_traffic_classification_rule( request, metadata @@ -2024,11 +2013,10 @@ def __call__( resp = self._interceptor.post_get_traffic_classification_rule(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_traffic_classification_rule_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_traffic_classification_rule_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2650,9 +2638,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BasePatchTrafficClassificationRule._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BasePatchTrafficClassificationRule._get_http_options() request, metadata = self._interceptor.pre_patch_traffic_classification_rule( request, metadata @@ -2721,11 +2707,10 @@ def __call__( resp = self._interceptor.post_patch_traffic_classification_rule(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_patch_traffic_classification_rule_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_patch_traffic_classification_rule_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2835,9 +2820,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -3017,15 +3000,12 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BaseRemoveTrafficClassificationRule._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BaseRemoveTrafficClassificationRule._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_remove_traffic_classification_rule( - request, metadata + request, metadata = ( + self._interceptor.pre_remove_traffic_classification_rule( + request, metadata + ) ) transcoded_request = _BaseRegionNetworkPoliciesRestTransport._BaseRemoveTrafficClassificationRule._get_transcoded_request( http_options, request @@ -3086,11 +3066,10 @@ def __call__( resp = self._interceptor.post_remove_traffic_classification_rule(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_remove_traffic_classification_rule_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_remove_traffic_classification_rule_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3134,7 +3113,9 @@ def add_traffic_classification_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AddTrafficClassificationRule(self._session, self._host, self._interceptor) # type: ignore + return self._AddTrafficClassificationRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def aggregated_list( @@ -3183,7 +3164,9 @@ def get_traffic_classification_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetTrafficClassificationRule(self._session, self._host, self._interceptor) # type: ignore + return self._GetTrafficClassificationRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def insert( @@ -3220,7 +3203,9 @@ def patch_traffic_classification_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PatchTrafficClassificationRule(self._session, self._host, self._interceptor) # type: ignore + return self._PatchTrafficClassificationRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def remove_association( @@ -3241,7 +3226,9 @@ def remove_traffic_classification_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RemoveTrafficClassificationRule(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveTrafficClassificationRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/client.py index ba5e33ffc5cd..0ab6788e74fe 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionNotificationEndpointsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionNotificationEndpointsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionNotificationEndpointsTransport]] _transport_registry["rest"] = RegionNotificationEndpointsRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionNotificationEndpointsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionNotificationEndpointsClient._read_environment_variables() + ) self._client_cert_source = ( RegionNotificationEndpointsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionNotificationEndpointsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/pagers.py index 5ca6e81ce49f..dd6d33112830 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/__init__.py index 5439dcd7a1f4..520eb9a6de76 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionNotificationEndpointsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionNotificationEndpointsTransport]] _transport_registry["rest"] = RegionNotificationEndpointsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/base.py index dd41f07c3ca9..3630e796214a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/rest.py index b74dc5430cc4..a403e015fdee 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -542,9 +542,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseDelete._get_transcoded_request( @@ -698,9 +696,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseGet._get_transcoded_request( @@ -872,9 +868,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseInsert._get_transcoded_request( @@ -1024,9 +1018,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseList._get_transcoded_request( @@ -1172,9 +1164,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/client.py index dcaa42271f15..ec2fd1aad787 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class RegionOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionOperationsTransport]] _transport_registry["rest"] = RegionOperationsRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionOperationsClient._read_environment_variables() + ) self._client_cert_source = RegionOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/pagers.py index d7e9df0f9b35..0258203335ba 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/base.py index a8b20f5e6a53..14bc76304227 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/rest.py index fc3128e6ffbf..cb977b5a50a4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/client.py index f4c8fda8ff03..0db08f0f23fa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionSecurityPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSecurityPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSecurityPoliciesTransport]] _transport_registry["rest"] = RegionSecurityPoliciesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSecurityPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSecurityPoliciesClient._read_environment_variables() + ) self._client_cert_source = RegionSecurityPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSecurityPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/pagers.py index 33c0caa57a88..44027fae410b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/__init__.py index 974b3530fac6..05c2647ccc95 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionSecurityPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionSecurityPoliciesTransport]] _transport_registry["rest"] = RegionSecurityPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/base.py index 8102bf187ae6..a69983268bdc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/rest.py index 707a190ef1e9..c3396ee63556 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -809,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1291,9 +1289,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -1974,9 +1970,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -2154,9 +2148,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -2330,9 +2322,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseSetLabels._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/client.py index 5ff5c3556741..21d400d3a720 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -78,9 +78,7 @@ class RegionSnapshotSettingsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSnapshotSettingsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSnapshotSettingsTransport]] _transport_registry["rest"] = RegionSnapshotSettingsRestTransport def get_transport_class( @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSnapshotSettingsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSnapshotSettingsClient._read_environment_variables() + ) self._client_cert_source = RegionSnapshotSettingsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -644,8 +640,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSnapshotSettingsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/__init__.py index f490b4a1478c..90555f4f3793 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionSnapshotSettingsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionSnapshotSettingsTransport]] _transport_registry["rest"] = RegionSnapshotSettingsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/base.py index f4d5c4711863..9e019faad1c6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/rest.py index d20d54407e77..f132455e41c5 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/client.py index c77e0cb59d10..92810547913a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionSnapshotsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSnapshotsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSnapshotsTransport]] _transport_registry["rest"] = RegionSnapshotsRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSnapshotsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSnapshotsClient._read_environment_variables() + ) self._client_cert_source = RegionSnapshotsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSnapshotsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/pagers.py index 7f1efc0c92d9..52e9577267cf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/base.py index 0ecf81000b26..fb019bd837e4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/rest.py index 396acbda6640..644b9d7566e5 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1959,9 +1959,7 @@ def __call__( """ - http_options = ( - _BaseRegionSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/client.py index 65c44e5dab9d..2dccd5c3d7be 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionSslCertificatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSslCertificatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSslCertificatesTransport]] _transport_registry["rest"] = RegionSslCertificatesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSslCertificatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSslCertificatesClient._read_environment_variables() + ) self._client_cert_source = RegionSslCertificatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSslCertificatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/pagers.py index 09753e4967f5..d7b4f97856e4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/__init__.py index 060c7906a8ce..34a9a093486c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionSslCertificatesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionSslCertificatesTransport]] _transport_registry["rest"] = RegionSslCertificatesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/base.py index 2b7d1ea5e49a..dd9d49c9c709 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/rest.py index 78bfd70d9d38..1437f44663c3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1188,9 +1188,7 @@ def __call__( """ - http_options = ( - _BaseRegionSslCertificatesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionSslCertificatesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/client.py index e9768d9d75d3..df15b91bdf21 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionSslPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSslPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSslPoliciesTransport]] _transport_registry["rest"] = RegionSslPoliciesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSslPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSslPoliciesClient._read_environment_variables() + ) self._client_cert_source = RegionSslPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSslPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/pagers.py index 13fcf04c4986..084245247199 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/base.py index a6efbd024736..a4c4e350bcab 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/rest.py index 7ba2e6bb1dc1..79727b5743cb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1282,9 +1282,7 @@ def __call__( """ - http_options = ( - _BaseRegionSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() - ) + http_options = _BaseRegionSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() request, metadata = self._interceptor.pre_list_available_features( request, metadata @@ -1624,9 +1622,7 @@ def __call__( """ - http_options = ( - _BaseRegionSslPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionSslPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/client.py index 4982c0bfd8da..9f6445a362e2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionTargetHttpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpProxiesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionTargetHttpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionTargetHttpProxiesClient._read_environment_variables() + ) self._client_cert_source = ( RegionTargetHttpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionTargetHttpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/pagers.py index cc782016608c..0d43331b3c7e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/__init__.py index d1f663d11aae..b1007083364a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/base.py index faa4a732c466..53e9dd239391 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/rest.py index 12fb8efb856c..0c4343a11935 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -590,9 +590,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpProxiesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionTargetHttpProxiesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionTargetHttpProxiesRestTransport._BaseDelete._get_transcoded_request( @@ -934,9 +932,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpProxiesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionTargetHttpProxiesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionTargetHttpProxiesRestTransport._BaseInsert._get_transcoded_request( @@ -1260,9 +1256,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpProxiesRestTransport._BaseSetUrlMap._get_http_options() - ) + http_options = _BaseRegionTargetHttpProxiesRestTransport._BaseSetUrlMap._get_http_options() request, metadata = self._interceptor.pre_set_url_map(request, metadata) transcoded_request = _BaseRegionTargetHttpProxiesRestTransport._BaseSetUrlMap._get_transcoded_request( @@ -1413,9 +1407,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionTargetHttpProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/client.py index e9009cec1dd3..98a227092e67 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionTargetHttpsProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpsProxiesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionTargetHttpsProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionTargetHttpsProxiesClient._read_environment_variables() + ) self._client_cert_source = ( RegionTargetHttpsProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionTargetHttpsProxiesTransport, transport) self._api_endpoint = self._transport.host @@ -2062,9 +2057,7 @@ def sample_set_ssl_certificates(): region_target_https_proxies_set_ssl_certificates_request_resource is not None ): - request.region_target_https_proxies_set_ssl_certificates_request_resource = ( - region_target_https_proxies_set_ssl_certificates_request_resource - ) + request.region_target_https_proxies_set_ssl_certificates_request_resource = region_target_https_proxies_set_ssl_certificates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2221,9 +2214,7 @@ def sample_set_ssl_certificates(): region_target_https_proxies_set_ssl_certificates_request_resource is not None ): - request.region_target_https_proxies_set_ssl_certificates_request_resource = ( - region_target_https_proxies_set_ssl_certificates_request_resource - ) + request.region_target_https_proxies_set_ssl_certificates_request_resource = region_target_https_proxies_set_ssl_certificates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/pagers.py index 2240ba572f18..cc3c7c214ca6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/__init__.py index 56fd11aaf8f8..10e93cde04da 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpsProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/base.py index 8850f642d818..3517c711a1ba 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/rest.py index 27c9b3153561..341325a67d16 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -703,9 +703,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BaseDelete._get_transcoded_request( @@ -1047,9 +1045,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BaseInsert._get_transcoded_request( @@ -1375,9 +1371,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BasePatch._get_transcoded_request( @@ -1556,9 +1550,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() request, metadata = self._interceptor.pre_set_ssl_certificates( request, metadata @@ -1741,9 +1733,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseSetUrlMap._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseSetUrlMap._get_http_options() request, metadata = self._interceptor.pre_set_url_map(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BaseSetUrlMap._get_transcoded_request( @@ -1894,9 +1884,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/client.py index 7bdb568cf122..0a168ee33795 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionTargetTcpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] _transport_registry["rest"] = RegionTargetTcpProxiesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionTargetTcpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionTargetTcpProxiesClient._read_environment_variables() + ) self._client_cert_source = RegionTargetTcpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionTargetTcpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/pagers.py index b5a62779d6ec..6e052b84c12c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/__init__.py index 72e8e2cb3dfa..d3ec0d868b0d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] _transport_registry["rest"] = RegionTargetTcpProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/base.py index 732ade81ae27..2dd288939a95 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/rest.py index 89f099417e7a..6e12bb39d7b4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1165,9 +1165,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetTcpProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionTargetTcpProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/client.py index af349b29d39e..7ee4ce7ca2e9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionUrlMapsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionUrlMapsClient._read_environment_variables() + ) self._client_cert_source = RegionUrlMapsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionUrlMapsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/pagers.py index e06fff712988..e25a2e71b495 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/base.py index 995947633601..1dd002632051 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/rest.py index 6b32b1443f94..7cccfadf9b2c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1766,9 +1766,7 @@ def __call__( """ - http_options = ( - _BaseRegionUrlMapsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionUrlMapsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/client.py index 0a48e6099fe4..1e1fcbb3a936 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionZonesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionZonesClient._read_environment_variables() + ) self._client_cert_source = RegionZonesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionZonesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/pagers.py index 89f032e6c0a4..6e4a184ea540 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/base.py index f6e0c1a4118a..dad6754d1b1b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/rest.py index 42f07f61092d..2a10d3463614 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/client.py index ce156f9816ba..3a3e7591774d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionsClient._read_environment_variables() + ) self._client_cert_source = RegionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/pagers.py index 251066e08fea..4a0f4c76b875 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/base.py index 4df397c4d2f3..9ea7a665a0df 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/rest.py index 9af8b178836f..75a2520efa4b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/client.py index e694e4b6fcac..fafd42da14f7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class ReservationBlocksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ReservationBlocksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ReservationBlocksTransport]] _transport_registry["rest"] = ReservationBlocksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReservationBlocksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReservationBlocksClient._read_environment_variables() + ) self._client_cert_source = ReservationBlocksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReservationBlocksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/pagers.py index fa769c8c8f88..9cee4324088a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/base.py index ca99659056d7..3ac48360fc4e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/rest.py index 992febf04609..20242a326dcc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -790,9 +790,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseReservationBlocksRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1118,9 +1116,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BasePerformMaintenance._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BasePerformMaintenance._get_http_options() request, metadata = self._interceptor.pre_perform_maintenance( request, metadata @@ -1346,9 +1342,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseReservationBlocksRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1499,9 +1493,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/client.py index 137a2da77e56..c05c08d85ffa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class ReservationSubBlocksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ReservationSubBlocksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ReservationSubBlocksTransport]] _transport_registry["rest"] = ReservationSubBlocksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReservationSubBlocksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReservationSubBlocksClient._read_environment_variables() + ) self._client_cert_source = ReservationSubBlocksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReservationSubBlocksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/pagers.py index 51a10f719dec..f233067f1c7b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/__init__.py index b1aa0cc62777..3cc2955ac69c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ReservationSubBlocksRestInterceptor, ReservationSubBlocksRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ReservationSubBlocksTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ReservationSubBlocksTransport]] _transport_registry["rest"] = ReservationSubBlocksRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/base.py index bba08838f849..d991bb74d150 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/rest.py index 0b259f1a26bf..ea99740a285a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -849,9 +849,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseReservationSubBlocksRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1174,9 +1172,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BasePerformMaintenance._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BasePerformMaintenance._get_http_options() request, metadata = self._interceptor.pre_perform_maintenance( request, metadata @@ -1354,9 +1350,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseReportFaulty._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseReportFaulty._get_http_options() request, metadata = self._interceptor.pre_report_faulty(request, metadata) transcoded_request = _BaseReservationSubBlocksRestTransport._BaseReportFaulty._get_transcoded_request( @@ -1581,9 +1575,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseReservationSubBlocksRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1734,9 +1726,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/client.py index 4c23deb58a16..bb69c14f6eea 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReservationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReservationsClient._read_environment_variables() + ) self._client_cert_source = ReservationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReservationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/pagers.py index c20500ea284e..0ea57c632e35 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/base.py index 513eb6a97e8c..26e84fcb2a4c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/rest.py index 22c4eeaf142f..9aa9109408c3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1882,9 +1882,7 @@ def __call__( """ - http_options = ( - _BaseReservationsRestTransport._BasePerformMaintenance._get_http_options() - ) + http_options = _BaseReservationsRestTransport._BasePerformMaintenance._get_http_options() request, metadata = self._interceptor.pre_perform_maintenance( request, metadata @@ -2448,9 +2446,7 @@ def __call__( """ - http_options = ( - _BaseReservationsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseReservationsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/client.py index a045401e1b59..dddf05fc6bad 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class ResourcePoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ResourcePoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ResourcePoliciesTransport]] _transport_registry["rest"] = ResourcePoliciesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ResourcePoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ResourcePoliciesClient._read_environment_variables() + ) self._client_cert_source = ResourcePoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ResourcePoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/pagers.py index 2a88ae3add34..21b4427c4372 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/base.py index ade356b5b6be..f8249734730e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/rest.py index 3da68170caaf..3c510c59f5e2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -726,9 +726,7 @@ def __call__( Contains a list of resourcePolicies. """ - http_options = ( - _BaseResourcePoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseResourcePoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseResourcePoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2168,9 +2166,7 @@ def __call__( """ - http_options = ( - _BaseResourcePoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseResourcePoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/client.py index 46cd67aec6c7..3ef688f3cd81 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RolloutPlansClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RolloutPlansClient._read_environment_variables() + ) self._client_cert_source = RolloutPlansClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RolloutPlansTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/pagers.py index df19d0ab2cf8..1162fb835dcb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/base.py index d9bf56bb0456..24d69ca61bb9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/rest.py index c81c3bba0b85..28edb8d58009 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/client.py index 1448413404a4..3d0cc78d5d6f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RolloutsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RolloutsClient._read_environment_variables() + ) self._client_cert_source = RolloutsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RolloutsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/pagers.py index 94afc8d29ccf..89a21c084abc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/base.py index b94883ce6580..7186635924b3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/rest.py index e22a51c19e8e..c9fba8beafea 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/client.py index f501b7b76b52..18b88309913a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RoutersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RoutersClient._read_environment_variables() + ) self._client_cert_source = RoutersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RoutersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/pagers.py index 5b0fa8a7cf63..7a883ab35729 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -298,7 +298,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -374,7 +374,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/base.py index bea66e644bd9..a33c29e1d88d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/rest.py index 867f6fa2cfae..bb45c09ed2cd 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/client.py index 73fc60885d67..ab706f6ae554 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RoutesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RoutesClient._read_environment_variables() + ) self._client_cert_source = RoutesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RoutesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/pagers.py index 5f0292895d68..b2780c0e7414 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/base.py index ca41b5765bdc..cfb3ac6037dd 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/rest.py index e94080e45b0c..83b9b5fac751 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/client.py index 26eba8800d8a..f9d90a8d5212 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class SecurityPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SecurityPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SecurityPoliciesTransport]] _transport_registry["rest"] = SecurityPoliciesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SecurityPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SecurityPoliciesClient._read_environment_variables() + ) self._client_cert_source = SecurityPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SecurityPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/pagers.py index c33fc4d3d8ac..859c2c94c7d4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/base.py index d0243b7683b6..0e5ab1e15615 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/rest.py index 5b975b99af23..44da391cb31e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1134,9 +1134,7 @@ def __call__( """ - http_options = ( - _BaseSecurityPoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseSecurityPoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseSecurityPoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2100,15 +2098,12 @@ def __call__( """ - http_options = ( - _BaseSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ) + http_options = _BaseSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_preconfigured_expression_sets( - request, metadata + request, metadata = ( + self._interceptor.pre_list_preconfigured_expression_sets( + request, metadata + ) ) transcoded_request = _BaseSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_transcoded_request( http_options, request @@ -2171,11 +2166,10 @@ def __call__( resp = self._interceptor.post_list_preconfigured_expression_sets(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_preconfigured_expression_sets_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_preconfigured_expression_sets_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2978,9 +2972,7 @@ def __call__( """ - http_options = ( - _BaseSecurityPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSecurityPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -3143,7 +3135,9 @@ def list_preconfigured_expression_sets( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListPreconfiguredExpressionSets(self._session, self._host, self._interceptor) # type: ignore + return self._ListPreconfiguredExpressionSets( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/client.py index eb17df805c2e..10b122d0db6b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class ServiceAttachmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ServiceAttachmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ServiceAttachmentsTransport]] _transport_registry["rest"] = ServiceAttachmentsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServiceAttachmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServiceAttachmentsClient._read_environment_variables() + ) self._client_cert_source = ServiceAttachmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServiceAttachmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/pagers.py index 7bdc429e632d..104002945fc2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/__init__.py index 636b3cbe6749..e75723ac4a42 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ServiceAttachmentsRestInterceptor, ServiceAttachmentsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ServiceAttachmentsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ServiceAttachmentsTransport]] _transport_registry["rest"] = ServiceAttachmentsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/base.py index 62c53df7d7fa..61350b1fbc73 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/rest.py index f02404ee0f4f..120a3c1b6c8d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -731,9 +731,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseServiceAttachmentsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1287,9 +1285,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseServiceAttachmentsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2027,9 +2023,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseServiceAttachmentsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2180,9 +2174,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/client.py index 020cb9dd5d0c..18d0260d818c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -78,9 +78,7 @@ class SnapshotSettingsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SnapshotSettingsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SnapshotSettingsServiceTransport]] _transport_registry["rest"] = SnapshotSettingsServiceRestTransport def get_transport_class( @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SnapshotSettingsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SnapshotSettingsServiceClient._read_environment_variables() + ) self._client_cert_source = ( SnapshotSettingsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -646,8 +642,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SnapshotSettingsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/__init__.py index 83b20168d6c6..a3107dbdce8d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SnapshotSettingsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SnapshotSettingsServiceTransport]] _transport_registry["rest"] = SnapshotSettingsServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/base.py index 3aeb3f9a05c3..44f050b7d643 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/rest.py index 9f3b99463b70..16d140eb7a0e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/client.py index 8e160c695ddf..b8bd82685201 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SnapshotsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SnapshotsClient._read_environment_variables() + ) self._client_cert_source = SnapshotsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SnapshotsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/pagers.py index 8e51adfdfd39..3df16f96ad59 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/base.py index b1facbd30add..0bd0be84c1c4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/rest.py index 3b5372d636bb..54a48bdc5fd0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/client.py index ec3024dac042..3cde14ada239 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class SslCertificatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SslCertificatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SslCertificatesTransport]] _transport_registry["rest"] = SslCertificatesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SslCertificatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SslCertificatesClient._read_environment_variables() + ) self._client_cert_source = SslCertificatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SslCertificatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/pagers.py index a459ce81e532..231b98d90a7b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/base.py index 3025d742bc4e..ddb0bb52eb4f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/rest.py index 785cf92579a7..8e25398b30a7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -562,9 +562,7 @@ def __call__( """ - http_options = ( - _BaseSslCertificatesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseSslCertificatesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseSslCertificatesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1400,9 +1398,7 @@ def __call__( """ - http_options = ( - _BaseSslCertificatesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSslCertificatesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/client.py index 7f705181502c..b35d6c64286c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SslPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SslPoliciesClient._read_environment_variables() + ) self._client_cert_source = SslPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SslPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/pagers.py index 08a2137fce65..9d3db54315fa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/base.py index 2e50a8df74e7..fcbcac6d55e6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/rest.py index 031d8edf98b2..92e423fad419 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1462,9 +1462,7 @@ def __call__( """ - http_options = ( - _BaseSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() - ) + http_options = _BaseSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() request, metadata = self._interceptor.pre_list_available_features( request, metadata @@ -1795,9 +1793,7 @@ def __call__( """ - http_options = ( - _BaseSslPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSslPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/client.py index a7d4ee5a7c13..3ada28b79f4b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class StoragePoolTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[StoragePoolTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[StoragePoolTypesTransport]] _transport_registry["rest"] = StoragePoolTypesRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = StoragePoolTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + StoragePoolTypesClient._read_environment_variables() + ) self._client_cert_source = StoragePoolTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(StoragePoolTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/pagers.py index 5f242e591547..a75743df6cfb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/base.py index a0320b788896..44642907f366 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/rest.py index b85e3d7a21cc..dd42327c05be 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -395,9 +395,7 @@ def __call__( """ - http_options = ( - _BaseStoragePoolTypesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseStoragePoolTypesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseStoragePoolTypesRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/client.py index 727adff2fd5c..a395d453774e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = StoragePoolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + StoragePoolsClient._read_environment_variables() + ) self._client_cert_source = StoragePoolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(StoragePoolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/pagers.py index 6114e726b878..b6e9507b9340 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/base.py index 63cb39d86276..d4baf966100d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/rest.py index 779874eea2cb..f0efb927c0f6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -2175,9 +2175,7 @@ def __call__( """ - http_options = ( - _BaseStoragePoolsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseStoragePoolsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/client.py index 8d08cab45d86..d59a2b7d4316 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SubnetworksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SubnetworksClient._read_environment_variables() + ) self._client_cert_source = SubnetworksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SubnetworksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/pagers.py index 7142ffc15088..6df969a1afe2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/base.py index 0c5a85443e6c..11e7b32654ec 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/rest.py index cc211bcf8ff7..e99befaaf8ca 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -2688,9 +2688,7 @@ def __call__( """ - http_options = ( - _BaseSubnetworksRestTransport._BaseSetPrivateIpGoogleAccess._get_http_options() - ) + http_options = _BaseSubnetworksRestTransport._BaseSetPrivateIpGoogleAccess._get_http_options() request, metadata = self._interceptor.pre_set_private_ip_google_access( request, metadata @@ -2842,9 +2840,7 @@ def __call__( """ - http_options = ( - _BaseSubnetworksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSubnetworksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -3023,7 +3019,9 @@ def set_private_ip_google_access( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetPrivateIpGoogleAccess(self._session, self._host, self._interceptor) # type: ignore + return self._SetPrivateIpGoogleAccess( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/client.py index 5a1efc6055aa..3c2369afcadf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class TargetGrpcProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetGrpcProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetGrpcProxiesTransport]] _transport_registry["rest"] = TargetGrpcProxiesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetGrpcProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetGrpcProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetGrpcProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetGrpcProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/pagers.py index c85bc07452c6..fd96b0b2913c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/base.py index e59e26b74626..f2ce43fb7999 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/rest.py index d5f60b2854ae..11e37b541723 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1412,9 +1412,7 @@ def __call__( """ - http_options = ( - _BaseTargetGrpcProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetGrpcProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/client.py index cc9150396c13..5867e6d26df3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class TargetHttpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetHttpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetHttpProxiesTransport]] _transport_registry["rest"] = TargetHttpProxiesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetHttpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetHttpProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetHttpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetHttpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/pagers.py index adc3f5d35289..e03f42fa7a5a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/base.py index eff5349c8019..d65f6307de5c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/rest.py index bdf7990a1de7..93fed1c1bf66 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -671,9 +671,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpProxiesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetHttpProxiesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetHttpProxiesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1868,9 +1866,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetHttpProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/client.py index 3c2c96b19e25..46c9a6fcbf2b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class TargetHttpsProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetHttpsProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetHttpsProxiesTransport]] _transport_registry["rest"] = TargetHttpsProxiesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetHttpsProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetHttpsProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetHttpsProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetHttpsProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/pagers.py index c942abe6e835..d9384a17611e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/__init__.py index b590b838910b..5aaf31dbadf8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import TargetHttpsProxiesRestInterceptor, TargetHttpsProxiesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[TargetHttpsProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[TargetHttpsProxiesTransport]] _transport_registry["rest"] = TargetHttpsProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/base.py index fcf9b48ce81c..25347813db15 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/rest.py index f46d40c43d92..91c736842f78 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -896,9 +896,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetHttpsProxiesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1941,9 +1939,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetCertificateMap._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetCertificateMap._get_http_options() request, metadata = self._interceptor.pre_set_certificate_map( request, metadata @@ -2124,9 +2120,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetQuicOverride._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetQuicOverride._get_http_options() request, metadata = self._interceptor.pre_set_quic_override( request, metadata @@ -2307,9 +2301,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() request, metadata = self._interceptor.pre_set_ssl_certificates( request, metadata @@ -2492,9 +2484,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetSslPolicy._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetSslPolicy._get_http_options() request, metadata = self._interceptor.pre_set_ssl_policy(request, metadata) transcoded_request = _BaseTargetHttpsProxiesRestTransport._BaseSetSslPolicy._get_transcoded_request( @@ -2825,9 +2815,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/client.py index 78b9d7708d04..a9bfe8db5b51 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class TargetInstancesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetInstancesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetInstancesTransport]] _transport_registry["rest"] = TargetInstancesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetInstancesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetInstancesClient._read_environment_variables() + ) self._client_cert_source = TargetInstancesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetInstancesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/pagers.py index 24de387175a7..e28abefac8e9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/base.py index f6699e68683c..5dfde8b86761 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/rest.py index f7be612b3833..b54bc61da392 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -619,9 +619,7 @@ def __call__( """ - http_options = ( - _BaseTargetInstancesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetInstancesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetInstancesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1463,9 +1461,7 @@ def __call__( """ - http_options = ( - _BaseTargetInstancesRestTransport._BaseSetSecurityPolicy._get_http_options() - ) + http_options = _BaseTargetInstancesRestTransport._BaseSetSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_security_policy( request, metadata @@ -1618,9 +1614,7 @@ def __call__( """ - http_options = ( - _BaseTargetInstancesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetInstancesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/client.py index 917b3f596094..d6ba8053975c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetPoolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetPoolsClient._read_environment_variables() + ) self._client_cert_source = TargetPoolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetPoolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/pagers.py index dfb93f39a70e..b9850946bd15 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/base.py index cf6ef8c47e97..4c425c3a2e61 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/rest.py index 9bbef28c9369..de99d4a080b0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -2996,9 +2996,7 @@ def __call__( """ - http_options = ( - _BaseTargetPoolsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetPoolsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/client.py index 9de5f6351af6..f1b6bbe80b1e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class TargetSslProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetSslProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetSslProxiesTransport]] _transport_registry["rest"] = TargetSslProxiesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetSslProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetSslProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetSslProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetSslProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/pagers.py index 8c2e9ba63659..acfa9e0d15d8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/base.py index 34c4b72ba2df..d5e5c228481e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/rest.py index bd3912731aae..9b9cb18778e5 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1481,9 +1481,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetBackendService._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetBackendService._get_http_options() request, metadata = self._interceptor.pre_set_backend_service( request, metadata @@ -1664,9 +1662,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetCertificateMap._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetCertificateMap._get_http_options() request, metadata = self._interceptor.pre_set_certificate_map( request, metadata @@ -1846,9 +1842,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetProxyHeader._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetProxyHeader._get_http_options() request, metadata = self._interceptor.pre_set_proxy_header( request, metadata @@ -2029,9 +2023,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetSslCertificates._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetSslCertificates._get_http_options() request, metadata = self._interceptor.pre_set_ssl_certificates( request, metadata @@ -2364,9 +2356,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/client.py index 100e58441b3e..054dd079b2c8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class TargetTcpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetTcpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetTcpProxiesTransport]] _transport_registry["rest"] = TargetTcpProxiesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetTcpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetTcpProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetTcpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetTcpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/pagers.py index 6aac88432c91..9ceedc867e7e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/base.py index 823e6a94936e..b08ff767ab7c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/rest.py index 2d090500f048..7dc4c1a3e9c4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -674,9 +674,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetTcpProxiesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1519,9 +1517,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseSetBackendService._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseSetBackendService._get_http_options() request, metadata = self._interceptor.pre_set_backend_service( request, metadata @@ -1701,9 +1697,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseSetProxyHeader._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseSetProxyHeader._get_http_options() request, metadata = self._interceptor.pre_set_proxy_header( request, metadata @@ -1856,9 +1850,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/client.py index b8336f01424f..ba0e1b9220a6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class TargetVpnGatewaysClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetVpnGatewaysTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetVpnGatewaysTransport]] _transport_registry["rest"] = TargetVpnGatewaysRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetVpnGatewaysClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetVpnGatewaysClient._read_environment_variables() + ) self._client_cert_source = TargetVpnGatewaysClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetVpnGatewaysTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/pagers.py index db8ab7a1d11e..dd1393871f0a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/base.py index 6c1054ca3275..15984235259a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/rest.py index 2e575af6a30f..845b5a8714a0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -618,9 +618,7 @@ def __call__( """ - http_options = ( - _BaseTargetVpnGatewaysRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetVpnGatewaysRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetVpnGatewaysRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1614,9 +1612,7 @@ def __call__( """ - http_options = ( - _BaseTargetVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/client.py index acd5d9075cdb..54668e26b968 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UrlMapsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UrlMapsClient._read_environment_variables() + ) self._client_cert_source = UrlMapsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UrlMapsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/pagers.py index 70d5512347e1..986ebfc5b723 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/base.py index 05888e83bd08..534064afd69e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/rest.py index e0c1358c240c..2b06acdab1bb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/client.py index dabe27bd311c..9681123be4f8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VpnGatewaysClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VpnGatewaysClient._read_environment_variables() + ) self._client_cert_source = VpnGatewaysClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VpnGatewaysTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/pagers.py index 236bdf0cc377..209b84a9849b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/base.py index a56d1945d50c..95bc6334f371 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/rest.py index a6488b60e624..b76f711dfdeb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1803,9 +1803,7 @@ def __call__( """ - http_options = ( - _BaseVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/client.py index 793496c10e30..2fad6094fd6f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VpnTunnelsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VpnTunnelsClient._read_environment_variables() + ) self._client_cert_source = VpnTunnelsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VpnTunnelsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/pagers.py index 3e68265cc9e1..9d90ed0a43bc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/base.py index 98a29683af9c..c8bf7e256eaf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/rest.py index bfe59d9bd95a..9cc78f887a13 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/client.py index af0c5e1fc90a..dd25f9398eea 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = WireGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + WireGroupsClient._read_environment_variables() + ) self._client_cert_source = WireGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(WireGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/pagers.py index 8340a9ee4870..5fb759bcef39 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/base.py index b90e3ffae9db..5f1614d53dc3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/rest.py index 90642004e18c..ab6739979721 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/client.py index 5982e663fb91..f07b2544a190 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class ZoneOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ZoneOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ZoneOperationsTransport]] _transport_registry["rest"] = ZoneOperationsRestTransport def get_transport_class( @@ -597,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ZoneOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ZoneOperationsClient._read_environment_variables() + ) self._client_cert_source = ZoneOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -636,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ZoneOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/pagers.py index 4a47ec4d4a79..6c1e9073d7c3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/base.py index 659b4cb7fe0e..a8a405888b96 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/rest.py index 1e906f24158f..c4f190c90180 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/client.py index 3f7666101966..94e88b6aad2a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class ZoneVmExtensionPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ZoneVmExtensionPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ZoneVmExtensionPoliciesTransport]] _transport_registry["rest"] = ZoneVmExtensionPoliciesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ZoneVmExtensionPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ZoneVmExtensionPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( ZoneVmExtensionPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ZoneVmExtensionPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/pagers.py index ced5c7e591a0..95fbda14f571 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/__init__.py index 601f34f0d2db..1b0b868b7c67 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ZoneVmExtensionPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ZoneVmExtensionPoliciesTransport]] _transport_registry["rest"] = ZoneVmExtensionPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/base.py index 489a82d5ea88..c2c2136835be 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/rest.py index 80bc37f48848..3a214e812f7e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -533,9 +533,7 @@ def __call__( """ - http_options = ( - _BaseZoneVmExtensionPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseZoneVmExtensionPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseZoneVmExtensionPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -854,9 +852,7 @@ def __call__( """ - http_options = ( - _BaseZoneVmExtensionPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseZoneVmExtensionPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseZoneVmExtensionPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -1180,9 +1176,7 @@ def __call__( """ - http_options = ( - _BaseZoneVmExtensionPoliciesRestTransport._BaseUpdate._get_http_options() - ) + http_options = _BaseZoneVmExtensionPoliciesRestTransport._BaseUpdate._get_http_options() request, metadata = self._interceptor.pre_update(request, metadata) transcoded_request = _BaseZoneVmExtensionPoliciesRestTransport._BaseUpdate._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/client.py index 394f551da266..b2a639827266 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ZonesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ZonesClient._read_environment_variables() + ) self._client_cert_source = ZonesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ZonesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/pagers.py index 534d671e7281..3f0d47afd015 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/base.py index 67fb34005a8f..e923070fa93e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/rest.py index 5427838e719d..4bd099b1821e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/types/compute.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/types/compute.py index 3d5db5710cde..6ea00c84eeb1 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/types/compute.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/types/compute.py @@ -2399,6 +2399,7 @@ class State(proto.Enum): This value has been deprecated and is no longer used. """ + UNDEFINED_STATE = 0 AVAILABLE = 442079913 DEGRADED = 396890926 @@ -2875,6 +2876,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -2895,6 +2897,7 @@ class Type(proto.Enum): ONE_TO_ONE_NAT (84090205): No description available. """ + UNDEFINED_TYPE = 0 DIRECT_IPV6 = 4397213 ONE_TO_ONE_NAT = 84090205 @@ -4866,6 +4869,7 @@ class AddressType(proto.Enum): UNSPECIFIED_TYPE (53933922): No description available. """ + UNDEFINED_ADDRESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -4886,6 +4890,7 @@ class IpVersion(proto.Enum): UNSPECIFIED_VERSION (21850000): No description available. """ + UNDEFINED_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -4906,6 +4911,7 @@ class Ipv6EndpointType(proto.Enum): VM (2743): Reserved IPv6 address can be used on VM. """ + UNDEFINED_IPV6_ENDPOINT_TYPE = 0 NETLB = 74173363 VM = 2743 @@ -4935,6 +4941,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -5008,6 +5015,7 @@ class Purpose(proto.Enum): VPC_PEERING (400800170): IP range for peer networks. """ + UNDEFINED_PURPOSE = 0 DNS_RESOLVER = 476114556 GCE_ENDPOINT = 230515243 @@ -5037,6 +5045,7 @@ class Status(proto.Enum): RESERVING (514587225): Address is being reserved. """ + UNDEFINED_STATUS = 0 IN_USE = 17393485 RESERVED = 432241448 @@ -5475,6 +5484,7 @@ class PerformanceMonitoringUnit(proto.Enum): STANDARD (484642493): Most documented core/L2 events. """ + UNDEFINED_PERFORMANCE_MONITORING_UNIT = 0 ARCHITECTURAL = 155113693 ENHANCED = 476873590 @@ -13690,6 +13700,7 @@ class Views(proto.Enum): WITH_UTILIZATION (504090633): Utilization data is included in the response. """ + UNDEFINED_VIEWS = 0 DEFAULT = 115302945 WITH_UTILIZATION = 504090633 @@ -15528,6 +15539,7 @@ class VmFamily(proto.Enum): VM_FAMILY_CLOUD_TPU_POD_SLICE_TPU7X (485271888): No description available. """ + UNDEFINED_VM_FAMILY = 0 VM_FAMILY_CLOUD_TPU_DEVICE_CT3 = 42845948 VM_FAMILY_CLOUD_TPU_LITE_DEVICE_CT5L = 108020067 @@ -15555,6 +15567,7 @@ class WorkloadType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_WORKLOAD_TYPE = 0 BATCH = 62971674 SERVING = 17781740 @@ -15682,6 +15695,7 @@ class ServiceShareType(proto.Enum): SERVICE_SHARE_TYPE_UNSPECIFIED (279057148): No description available. """ + UNDEFINED_SERVICE_SHARE_TYPE = 0 ALLOW_ALL = 475536235 DISALLOW_ALL = 277786301 @@ -15785,6 +15799,7 @@ class HealthStatus(proto.Enum): The health status of the reservation is unspecified. """ + UNDEFINED_HEALTH_STATUS = 0 DEGRADED = 396890926 HEALTHY = 439801213 @@ -15873,6 +15888,7 @@ class Interface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -15966,6 +15982,7 @@ class MaintenanceInterval(proto.Enum): available. RECURRENT is used for GEN3 and Slice of Hardware VMs. """ + UNDEFINED_MAINTENANCE_INTERVAL = 0 AS_NEEDED = 500724834 PERIODIC = 142804635 @@ -16793,6 +16810,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -16815,6 +16833,7 @@ class Interface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -16837,6 +16856,7 @@ class Mode(proto.Enum): virtual machine at a time can be attached to a disk in read-write mode. """ + UNDEFINED_MODE = 0 READ_ONLY = 91950261 READ_WRITE = 173607894 @@ -16856,6 +16876,7 @@ class SavedState(proto.Enum): PRESERVED (254159736): Disk state has been preserved. """ + UNDEFINED_SAVED_STATE = 0 DISK_SAVED_STATE_UNSPECIFIED = 391290831 PRESERVED = 254159736 @@ -16873,6 +16894,7 @@ class Type(proto.Enum): SCRATCH (496778970): No description available. """ + UNDEFINED_TYPE = 0 PERSISTENT = 460683927 SCRATCH = 496778970 @@ -17247,6 +17269,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -17270,6 +17293,7 @@ class OnUpdateAction(proto.Enum): Use the existing disk, this is the default behaviour. """ + UNDEFINED_ON_UPDATE_ACTION = 0 RECREATE_DISK = 494767853 RECREATE_DISK_IF_SOURCE_CHANGED = 398099712 @@ -17534,6 +17558,7 @@ class LogType(proto.Enum): LOG_TYPE_UNSPECIFIED (154527053): Default case. Should never be this. """ + UNDEFINED_LOG_TYPE = 0 ADMIN_READ = 128951462 DATA_READ = 305224971 @@ -17718,6 +17743,7 @@ class Status(proto.Enum): Autoscaler backend hasn't read new/updated configuration """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 DELETING = 528602024 @@ -17765,13 +17791,13 @@ class Status(proto.Enum): number=138946292, optional=True, ) - scaling_schedule_status: MutableMapping[ - str, "ScalingScheduleStatus" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=465950178, - message="ScalingScheduleStatus", + scaling_schedule_status: MutableMapping[str, "ScalingScheduleStatus"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=465950178, + message="ScalingScheduleStatus", + ) ) self_link: str = proto.Field( proto.STRING, @@ -18164,6 +18190,7 @@ class Type(proto.Enum): autoscalers: in at least one of the zones you're using there is a resource stockout. """ + UNDEFINED_TYPE = 0 ALL_INSTANCES_UNHEALTHY = 404965477 BACKEND_SERVICE_DOES_NOT_EXIST = 191417626 @@ -18346,6 +18373,7 @@ class Mode(proto.Enum): Automatically create VMs according to the policy, but do not scale the MIG in. """ + UNDEFINED_MODE = 0 OFF = 78159 ON = 2527 @@ -18405,13 +18433,13 @@ class Mode(proto.Enum): optional=True, message="AutoscalingPolicyScaleInControl", ) - scaling_schedules: MutableMapping[ - str, "AutoscalingPolicyScalingSchedule" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=355416580, - message="AutoscalingPolicyScalingSchedule", + scaling_schedules: MutableMapping[str, "AutoscalingPolicyScalingSchedule"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=355416580, + message="AutoscalingPolicyScalingSchedule", + ) ) @@ -18479,6 +18507,7 @@ class PredictiveMethod(proto.Enum): PREDICTIVE_METHOD_UNSPECIFIED (52410265): No description available. """ + UNDEFINED_PREDICTIVE_METHOD = 0 NONE = 2402104 OPTIMIZE_AVAILABILITY = 11629437 @@ -18619,6 +18648,7 @@ class UtilizationTargetType(proto.Enum): the utilization target value to perform autoscaling. """ + UNDEFINED_UTILIZATION_TARGET_TYPE = 0 DELTA_PER_MINUTE = 87432861 DELTA_PER_SECOND = 255180029 @@ -19057,6 +19087,7 @@ class BalancingMode(proto.Enum): UTILIZATION (157008386): Balance based on the backend utilization. """ + UNDEFINED_BALANCING_MODE = 0 CONNECTION = 246311646 CUSTOM_METRICS = 331575765 @@ -19088,6 +19119,7 @@ class Preference(proto.Enum): PREFERRED (418847841): Traffic will be sent to this backend first. """ + UNDEFINED_PREFERENCE = 0 DEFAULT = 115302945 PREFERENCE_UNSPECIFIED = 496219571 @@ -19109,6 +19141,7 @@ class TrafficDuration(proto.Enum): TRAFFIC_DURATION_UNSPECIFIED (265201166): Traffic duration is unspecified. """ + UNDEFINED_TRAFFIC_DURATION = 0 LONG = 2342524 SHORT = 78875740 @@ -19326,6 +19359,7 @@ class CompressionMode(proto.Enum): responses cached by Cloud CDN will not be served to clients. """ + UNDEFINED_COMPRESSION_MODE = 0 AUTOMATIC = 165298699 DISABLED = 516696700 @@ -19349,6 +19383,7 @@ class LoadBalancingScheme(proto.Enum): Signifies that this will be used for internal Application Load Balancers. """ + UNDEFINED_LOAD_BALANCING_SCHEME = 0 EXTERNAL_MANAGED = 512006923 INTERNAL_MANAGED = 37350397 @@ -19714,6 +19749,7 @@ class CacheMode(proto.Enum): performance and increasing load on the origin server. """ + UNDEFINED_CACHE_MODE = 0 CACHE_ALL_STATIC = 355027945 FORCE_CACHE_ALL = 486026928 @@ -20793,6 +20829,7 @@ class CompressionMode(proto.Enum): responses cached by Cloud CDN will not be served to clients. """ + UNDEFINED_COMPRESSION_MODE = 0 AUTOMATIC = 165298699 DISABLED = 516696700 @@ -20826,6 +20863,7 @@ class ExternalManagedMigrationState(proto.Enum): TEST_BY_PERCENTAGE (513738389): No description available. """ + UNDEFINED_EXTERNAL_MANAGED_MIGRATION_STATE = 0 PREPARE = 399612135 TEST_ALL_TRAFFIC = 79728882 @@ -20893,6 +20931,7 @@ class IpAddressSelectionPolicy(proto.Enum): IPv6 address over its IPv4 address (provided there is a healthy IPv6 address). """ + UNDEFINED_IP_ADDRESS_SELECTION_POLICY = 0 IPV4_ONLY = 22373798 IPV6_ONLY = 79632100 @@ -20931,6 +20970,7 @@ class LoadBalancingScheme(proto.Enum): INVALID_LOAD_BALANCING_SCHEME (275352060): No description available. """ + UNDEFINED_LOAD_BALANCING_SCHEME = 0 EXTERNAL = 35607499 EXTERNAL_MANAGED = 512006923 @@ -21062,6 +21102,7 @@ class LocalityLbPolicy(proto.Enum): to use for computing the weights are specified via the customMetrics fields. """ + UNDEFINED_LOCALITY_LB_POLICY = 0 INVALID_LB_POLICY = 323318707 LEAST_REQUEST = 46604921 @@ -21111,6 +21152,7 @@ class Protocol(proto.Enum): protocol, it can be used with any L3/L4 Forwarding Rules. """ + UNDEFINED_PROTOCOL = 0 GRPC = 2196510 H2C = 70809 @@ -21188,6 +21230,7 @@ class SessionAffinity(proto.Enum): same backend VM while that VM remains healthy, as long as the cookie has not expired. """ + UNDEFINED_SESSION_AFFINITY = 0 CLIENT_IP = 345665051 CLIENT_IP_NO_DESTINATION = 106122516 @@ -21762,6 +21805,7 @@ class CacheMode(proto.Enum): performance and increasing load on the origin server. """ + UNDEFINED_CACHE_MODE = 0 CACHE_ALL_STATIC = 355027945 FORCE_CACHE_ALL = 486026928 @@ -22011,6 +22055,7 @@ class ConnectionPersistenceOnUnhealthyBackends(proto.Enum): NEVER_PERSIST (138646241): No description available. """ + UNDEFINED_CONNECTION_PERSISTENCE_ON_UNHEALTHY_BACKENDS = 0 ALWAYS_PERSIST = 38400900 DEFAULT_FOR_PROTOCOL = 145265356 @@ -22045,6 +22090,7 @@ class TrackingMode(proto.Enum): PER_SESSION (182099252): No description available. """ + UNDEFINED_TRACKING_MODE = 0 INVALID_TRACKING_MODE = 49234371 PER_CONNECTION = 85162848 @@ -22460,6 +22506,7 @@ class FastIPMove(proto.Enum): GARP_RA (527352630): No description available. """ + UNDEFINED_FAST_I_P_MOVE = 0 DISABLED = 516696700 GARP_RA = 527352630 @@ -22968,6 +23015,7 @@ class Name(proto.Enum): to use for computing the weights are specified via the customMetrics fields. """ + UNDEFINED_NAME = 0 INVALID_LB_POLICY = 323318707 LEAST_REQUEST = 46604921 @@ -23048,6 +23096,7 @@ class OptionalMode(proto.Enum): INCLUDE_ALL_OPTIONAL (535606965): All optional fields. """ + UNDEFINED_OPTIONAL_MODE = 0 CUSTOM = 388595569 EXCLUDE_ALL_OPTIONAL = 168636099 @@ -23174,6 +23223,7 @@ class Spillover(proto.Enum): ZONAL_AFFINITY_STAY_WITHIN_ZONE (12177782): No description available. """ + UNDEFINED_SPILLOVER = 0 ZONAL_AFFINITY_DISABLED = 230207960 ZONAL_AFFINITY_SPILL_CROSS_ZONE = 251048410 @@ -23338,12 +23388,12 @@ class BackendServiceTlsSettings(proto.Message): number=114030, optional=True, ) - subject_alt_names: MutableSequence[ - "BackendServiceTlsSettingsSubjectAltName" - ] = proto.RepeatedField( - proto.MESSAGE, - number=330029535, - message="BackendServiceTlsSettingsSubjectAltName", + subject_alt_names: MutableSequence["BackendServiceTlsSettingsSubjectAltName"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=330029535, + message="BackendServiceTlsSettingsSubjectAltName", + ) ) @@ -23581,6 +23631,7 @@ class Diagnostic(proto.Enum): REVERSE_CONCATENATED_PATH_DOWN (479337129): No description available. """ + UNDEFINED_DIAGNOSTIC = 0 ADMINISTRATIVELY_DOWN = 121685798 CONCATENATED_PATH_DOWN = 26186892 @@ -23612,6 +23663,7 @@ class State(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATE = 0 ADMIN_DOWN = 128544690 DOWN = 2104482 @@ -23790,6 +23842,7 @@ class BfdSessionInitializationMode(proto.Enum): PASSIVE (462813959): No description available. """ + UNDEFINED_BFD_SESSION_INITIALIZATION_MODE = 0 ACTIVE = 314733318 DISABLED = 516696700 @@ -23827,6 +23880,7 @@ class LocalDiagnostic(proto.Enum): REVERSE_CONCATENATED_PATH_DOWN (479337129): No description available. """ + UNDEFINED_LOCAL_DIAGNOSTIC = 0 ADMINISTRATIVELY_DOWN = 121685798 CONCATENATED_PATH_DOWN = 26186892 @@ -23858,6 +23912,7 @@ class LocalState(proto.Enum): UP (2715): No description available. """ + UNDEFINED_LOCAL_STATE = 0 ADMIN_DOWN = 128544690 DOWN = 2104482 @@ -24014,6 +24069,7 @@ class Origin(proto.Enum): BGP_ORIGIN_INCOMPLETE (452839811): No description available. """ + UNDEFINED_ORIGIN = 0 BGP_ORIGIN_EGP = 378906473 BGP_ORIGIN_IGP = 378910317 @@ -24079,6 +24135,7 @@ class Type(proto.Enum): AS_PATH_TYPE_SET (302584650): No description available. """ + UNDEFINED_TYPE = 0 AS_PATH_TYPE_SEQUENCE = 362887609 AS_PATH_TYPE_SET = 302584650 @@ -24627,6 +24684,7 @@ class Status(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DONE = 2104194 @@ -25082,12 +25140,12 @@ class CalendarModeAdviceResponse(proto.Message): their obtainability and minimize cost. """ - recommendations: MutableSequence[ - "CalendarModeRecommendation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=324515802, - message="CalendarModeRecommendation", + recommendations: MutableSequence["CalendarModeRecommendation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=324515802, + message="CalendarModeRecommendation", + ) ) @@ -25132,13 +25190,13 @@ class CalendarModeRecommendation(proto.Message): correspond to keys specified in the request. """ - recommendations_per_spec: MutableMapping[ - str, "FutureResourcesRecommendation" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=61331554, - message="FutureResourcesRecommendation", + recommendations_per_spec: MutableMapping[str, "FutureResourcesRecommendation"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=61331554, + message="FutureResourcesRecommendation", + ) ) @@ -25962,6 +26020,7 @@ class Category(proto.Enum): MACHINE (469553191): No description available. """ + UNDEFINED_CATEGORY = 0 CATEGORY_UNSPECIFIED = 509189462 LICENSE = 347869217 @@ -25987,6 +26046,7 @@ class Plan(proto.Enum): TWELVE_MONTH (173083962): No description available. """ + UNDEFINED_PLAN = 0 INVALID = 530283991 THIRTY_SIX_MONTH = 266295942 @@ -26015,6 +26075,7 @@ class Status(proto.Enum): NOT_YET_ACTIVE (20607337): No description available. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 CANCELLED = 41957681 @@ -26132,6 +26193,7 @@ class Type(proto.Enum): ``optional Type type`` definition. This ensures that the public documentation displays the new enum Type. """ + UNDEFINED_TYPE = 0 ACCELERATOR_OPTIMIZED = 280848403 ACCELERATOR_OPTIMIZED_A3 = 158574526 @@ -26822,12 +26884,12 @@ class CompositeHealthChecksScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - composite_health_checks: MutableSequence[ - "CompositeHealthCheck" - ] = proto.RepeatedField( - proto.MESSAGE, - number=517891062, - message="CompositeHealthCheck", + composite_health_checks: MutableSequence["CompositeHealthCheck"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=517891062, + message="CompositeHealthCheck", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -26875,6 +26937,7 @@ class ConfidentialInstanceType(proto.Enum): TDX (82920): Intel Trust Domain eXtension. """ + UNDEFINED_CONFIDENTIAL_INSTANCE_TYPE = 0 CONFIDENTIAL_INSTANCE_TYPE_UNSPECIFIED = 115021829 SEV = 81988 @@ -34060,6 +34123,7 @@ class State(proto.Enum): OBSOLETE (66532761): No description available. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DELETED = 120962041 @@ -35004,6 +35068,7 @@ class AccessMode(proto.Enum): The default AccessMode, means the disk can be attached to single instance in RW mode. """ + UNDEFINED_ACCESS_MODE = 0 READ_ONLY_MANY = 63460265 READ_WRITE_MANY = 488743208 @@ -35024,6 +35089,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -35044,6 +35110,7 @@ class Interface(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -35079,6 +35146,7 @@ class Status(proto.Enum): Disk is currently unavailable and cannot be accessed, attached or detached. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -35099,6 +35167,7 @@ class StorageType(proto.Enum): SSD (82404): No description available. """ + UNDEFINED_STORAGE_TYPE = 0 HDD = 71368 SSD = 82404 @@ -35119,13 +35188,13 @@ class StorageType(proto.Enum): optional=True, message="DiskAsyncReplication", ) - async_secondary_disks: MutableMapping[ - str, "DiskAsyncReplicationList" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=322925608, - message="DiskAsyncReplicationList", + async_secondary_disks: MutableMapping[str, "DiskAsyncReplicationList"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=322925608, + message="DiskAsyncReplicationList", + ) ) creation_timestamp: str = proto.Field( proto.STRING, @@ -35674,6 +35743,7 @@ class InstantiateFrom(proto.Enum): boot disk, additional read-write disks. """ + UNDEFINED_INSTANTIATE_FROM = 0 ATTACH_READ_ONLY = 513775419 BLANK = 63281460 @@ -35909,6 +35979,7 @@ class State(proto.Enum): STOPPING (350791796): Replication is stopping. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 CREATED = 135924424 @@ -35985,6 +36056,7 @@ class Policy(proto.Enum): Only allowlisted regions will be able to create region scoped snapshots """ + UNDEFINED_POLICY = 0 ALL_REGIONS = 273143585 POLICY_UNSPECIFIED = 197974922 @@ -36581,6 +36653,7 @@ class TargetShape(proto.Enum): between any two zones. Recommended for highly available serving workloads. """ + UNDEFINED_TARGET_SHAPE = 0 ANY = 64972 ANY_SINGLE_ZONE = 61100880 @@ -37006,6 +37079,7 @@ class Type(proto.Enum): The peering route corresponding to subnetwork range. """ + UNDEFINED_TYPE = 0 DYNAMIC_PEERING_ROUTE = 469794858 STATIC_PEERING_ROUTE = 473407545 @@ -37409,6 +37483,7 @@ class RedundancyType(proto.Enum): addresses that are redundant with eatch other. """ + UNDEFINED_REDUNDANCY_TYPE = 0 FOUR_IPS_REDUNDANCY = 520087913 SINGLE_IP_INTERNALLY_REDUNDANT = 133914873 @@ -37642,6 +37717,7 @@ class FileType(proto.Enum): X509 (2674086): No description available. """ + UNDEFINED_FILE_TYPE = 0 BIN = 65767 UNDEFINED = 137851184 @@ -37870,6 +37946,7 @@ class Direction(proto.Enum): Indicates that firewall should apply to incoming traffic. """ + UNDEFINED_DIRECTION = 0 EGRESS = 432880501 INGRESS = 516931221 @@ -38088,6 +38165,7 @@ class Metadata(proto.Enum): INCLUDE_ALL_METADATA (164619908): No description available. """ + UNDEFINED_METADATA = 0 EXCLUDE_ALL_METADATA = 334519954 INCLUDE_ALL_METADATA = 164619908 @@ -38352,6 +38430,7 @@ class PolicySource(proto.Enum): USER_DEFINED (491485557): No description available. """ + UNDEFINED_POLICY_SOURCE = 0 SYSTEM = 313484847 USER_DEFINED = 491485557 @@ -38371,6 +38450,7 @@ class PolicyType(proto.Enum): VPC_POLICY (74319208): No description available. """ + UNDEFINED_POLICY_TYPE = 0 RDMA_ROCE_POLICY = 148757145 VPC_POLICY = 74319208 @@ -38755,6 +38835,7 @@ class Direction(proto.Enum): INGRESS (516931221): No description available. """ + UNDEFINED_DIRECTION = 0 EGRESS = 432880501 INGRESS = 516931221 @@ -38772,6 +38853,7 @@ class TargetType(proto.Enum): INTERNAL_MANAGED_LB (309241080): No description available. """ + UNDEFINED_TARGET_TYPE = 0 INSTANCES = 131337822 INTERNAL_MANAGED_LB = 309241080 @@ -38840,12 +38922,12 @@ class TargetType(proto.Enum): proto.STRING, number=528230647, ) - target_secure_tags: MutableSequence[ - "FirewallPolicyRuleSecureTag" - ] = proto.RepeatedField( - proto.MESSAGE, - number=468132403, - message="FirewallPolicyRuleSecureTag", + target_secure_tags: MutableSequence["FirewallPolicyRuleSecureTag"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=468132403, + message="FirewallPolicyRuleSecureTag", + ) ) target_service_accounts: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -39020,6 +39102,7 @@ class DestNetworkContext(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_DEST_NETWORK_CONTEXT = 0 class DestNetworkScope(proto.Enum): @@ -39032,6 +39115,7 @@ class DestNetworkScope(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_DEST_NETWORK_SCOPE = 0 class DestNetworkType(proto.Enum): @@ -39052,6 +39136,7 @@ class DestNetworkType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_DEST_NETWORK_TYPE = 0 class SrcNetworkContext(proto.Enum): @@ -39074,6 +39159,7 @@ class SrcNetworkContext(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_SRC_NETWORK_CONTEXT = 0 class SrcNetworkScope(proto.Enum): @@ -39086,6 +39172,7 @@ class SrcNetworkScope(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_SRC_NETWORK_SCOPE = 0 class SrcNetworkType(proto.Enum): @@ -39108,6 +39195,7 @@ class SrcNetworkType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_SRC_NETWORK_TYPE = 0 dest_address_groups: MutableSequence[str] = proto.RepeatedField( @@ -39145,12 +39233,12 @@ class SrcNetworkType(proto.Enum): proto.STRING, number=119896492, ) - layer4_configs: MutableSequence[ - "FirewallPolicyRuleMatcherLayer4Config" - ] = proto.RepeatedField( - proto.MESSAGE, - number=373534261, - message="FirewallPolicyRuleMatcherLayer4Config", + layer4_configs: MutableSequence["FirewallPolicyRuleMatcherLayer4Config"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=373534261, + message="FirewallPolicyRuleMatcherLayer4Config", + ) ) src_address_groups: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -39187,12 +39275,12 @@ class SrcNetworkType(proto.Enum): proto.STRING, number=99086742, ) - src_secure_tags: MutableSequence[ - "FirewallPolicyRuleSecureTag" - ] = proto.RepeatedField( - proto.MESSAGE, - number=508791302, - message="FirewallPolicyRuleSecureTag", + src_secure_tags: MutableSequence["FirewallPolicyRuleSecureTag"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=508791302, + message="FirewallPolicyRuleSecureTag", + ) ) src_threat_intelligences: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -39271,6 +39359,7 @@ class State(proto.Enum): INEFFECTIVE (304458242): No description available. """ + UNDEFINED_STATE = 0 EFFECTIVE = 244201863 INEFFECTIVE = 304458242 @@ -39956,6 +40045,7 @@ class ExternalManagedBackendBucketMigrationState(proto.Enum): TEST_BY_PERCENTAGE (513738389): No description available. """ + UNDEFINED_EXTERNAL_MANAGED_BACKEND_BUCKET_MIGRATION_STATE = 0 PREPARE = 399612135 TEST_ALL_TRAFFIC = 79728882 @@ -39990,6 +40080,7 @@ class IPProtocolEnum(proto.Enum): UDP (83873): No description available. """ + UNDEFINED_I_P_PROTOCOL_ENUM = 0 AH = 2087 ESP = 68962 @@ -40014,6 +40105,7 @@ class IpVersion(proto.Enum): UNSPECIFIED_VERSION (21850000): No description available. """ + UNDEFINED_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -40042,6 +40134,7 @@ class LoadBalancingScheme(proto.Enum): INVALID (530283991): No description available. """ + UNDEFINED_LOAD_BALANCING_SCHEME = 0 EXTERNAL = 35607499 EXTERNAL_MANAGED = 512006923 @@ -40079,6 +40172,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -40113,6 +40207,7 @@ class PscConnectionStatus(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_PSC_CONNECTION_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -40758,6 +40853,7 @@ class DeploymentType(proto.Enum): The reserved capacity is made up of highly flexible, logical reservation blocks. """ + UNDEFINED_DEPLOYMENT_TYPE = 0 DENSE = 64932607 DEPLOYMENT_TYPE_UNSPECIFIED = 234847180 @@ -40778,6 +40874,7 @@ class PlanningStatus(proto.Enum): Future Reservation has been submitted for evaluation by GCP. """ + UNDEFINED_PLANNING_STATUS = 0 DRAFT = 65307009 PLANNING_STATUS_UNSPECIFIED = 252728940 @@ -40808,6 +40905,7 @@ class ProtectionTier(proto.Enum): expected to continue as normal using the redundancies. """ + UNDEFINED_PROTECTION_TIER = 0 CAPACITY_OPTIMIZED = 17430466 PROTECTION_TIER_UNSPECIFIED = 262261984 @@ -40833,6 +40931,7 @@ class ReservationMode(proto.Enum): RESERVATION_MODE_UNSPECIFIED (233810606): No description available. """ + UNDEFINED_RESERVATION_MODE = 0 CALENDAR = 67431230 DEFAULT = 115302945 @@ -40855,6 +40954,7 @@ class SchedulingType(proto.Enum): reservation. Instead, each instance has its own maintenance window. """ + UNDEFINED_SCHEDULING_TYPE = 0 GROUPED = 474540862 GROUP_MAINTENANCE_TYPE_UNSPECIFIED = 447183678 @@ -41045,6 +41145,7 @@ class CommitmentPlan(proto.Enum): TWELVE_MONTH (173083962): No description available. """ + UNDEFINED_COMMITMENT_PLAN = 0 INVALID = 530283991 THIRTY_SIX_MONTH = 266295942 @@ -41068,6 +41169,7 @@ class PreviousCommitmentTerms(proto.Enum): No changes to associated parents Committed Used Discount(s) terms. """ + UNDEFINED_PREVIOUS_COMMITMENT_TERMS = 0 EXTEND = 448639770 PREVIOUSCOMMITMENTTERM_UNSPECIFIED = 98482448 @@ -41211,6 +41313,7 @@ class AmendmentStatus(proto.Enum): AMENDMENT_STATUS_UNSPECIFIED (412250332): No description available. """ + UNDEFINED_AMENDMENT_STATUS = 0 AMENDMENT_APPROVED = 150573001 AMENDMENT_DECLINED = 70395200 @@ -41266,6 +41369,7 @@ class ProcurementStatus(proto.Enum): being created to provide total_count reserved instance slots. This state will not persist past start_time + 24h. """ + UNDEFINED_PROCUREMENT_STATUS = 0 APPROVED = 357258935 CANCELLED = 41957681 @@ -41450,6 +41554,7 @@ class ProcurementStatus(proto.Enum): being created to provide total_count reserved instance slots. This state will not persist past start_time + 24h. """ + UNDEFINED_PROCUREMENT_STATUS = 0 APPROVED = 357258935 CANCELLED = 41957681 @@ -41865,6 +41970,7 @@ class RecommendationType(proto.Enum): RECOMMENDATION_TYPE_UNSPECIFIED (140641624): Default value, unused. """ + UNDEFINED_RECOMMENDATION_TYPE = 0 FUTURE_RESERVATION = 41036592 RECOMMENDATION_TYPE_UNSPECIFIED = 140641624 @@ -41955,6 +42061,7 @@ class Status(proto.Enum): However, another location was better and was recommended. """ + UNDEFINED_STATUS = 0 CONDITIONS_NOT_MET = 363628457 NOT_SUPPORTED = 317950466 @@ -42027,6 +42134,7 @@ class DeploymentType(proto.Enum): The reserved capacity is made up of highly flexible, logical reservation blocks. """ + UNDEFINED_DEPLOYMENT_TYPE = 0 DENSE = 64932607 DEPLOYMENT_TYPE_UNSPECIFIED = 234847180 @@ -42108,6 +42216,7 @@ class VmFamily(proto.Enum): VM_FAMILY_CLOUD_TPU_POD_SLICE_TPU7X (485271888): No description available. """ + UNDEFINED_VM_FAMILY = 0 VM_FAMILY_CLOUD_TPU_DEVICE_CT3 = 42845948 VM_FAMILY_CLOUD_TPU_LITE_DEVICE_CT5L = 108020067 @@ -42134,6 +42243,7 @@ class WorkloadType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_WORKLOAD_TYPE = 0 BATCH = 62971674 SERVING = 17781740 @@ -42186,6 +42296,7 @@ class DiskInterface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_DISK_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -42215,13 +42326,13 @@ class FutureResourcesSpecLocationPolicy(proto.Message): ALLOWed. """ - locations: MutableMapping[ - str, "FutureResourcesSpecLocationPolicyLocation" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=413423454, - message="FutureResourcesSpecLocationPolicyLocation", + locations: MutableMapping[str, "FutureResourcesSpecLocationPolicyLocation"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=413423454, + message="FutureResourcesSpecLocationPolicyLocation", + ) ) @@ -42253,6 +42364,7 @@ class Preference(proto.Enum): PREFERENCE_UNSPECIFIED (496219571): Default value, unused. """ + UNDEFINED_PREFERENCE = 0 ALLOW = 62368553 DENY = 2094604 @@ -42296,12 +42408,12 @@ class FutureResourcesSpecSpecificSKUResources(proto.Message): number=77317349, optional=True, ) - local_ssd_partitions: MutableSequence[ - "FutureResourcesSpecLocalSsdPartition" - ] = proto.RepeatedField( - proto.MESSAGE, - number=470688568, - message="FutureResourcesSpecLocalSsdPartition", + local_ssd_partitions: MutableSequence["FutureResourcesSpecLocalSsdPartition"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=470688568, + message="FutureResourcesSpecLocalSsdPartition", + ) ) machine_type: str = proto.Field( proto.STRING, @@ -42442,6 +42554,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -42569,6 +42682,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -44907,6 +45021,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 FULL = 2169487 @@ -44987,6 +45102,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 FULL = 2169487 @@ -46475,6 +46591,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 FULL = 2169487 @@ -47042,6 +47159,7 @@ class View(proto.Enum): FULL (2169487): Includes detailed topology view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 BLOCK_VIEW_UNSPECIFIED = 275070479 @@ -47142,6 +47260,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 SUB_BLOCK_VIEW_BASIC = 236009797 SUB_BLOCK_VIEW_FULL = 440711800 @@ -47987,6 +48106,7 @@ class Views(proto.Enum): WITH_UTILIZATION (504090633): Utilization data is included in the response. """ + UNDEFINED_VIEWS = 0 DEFAULT = 115302945 WITH_UTILIZATION = 504090633 @@ -48890,6 +49010,7 @@ class ScopedResourceStatus(proto.Enum): SCOPED_RESOURCE_STATUS_UNSPECIFIED (437941996): Default value. This value is unused. """ + UNDEFINED_SCOPED_RESOURCE_STATUS = 0 SCOPED_RESOURCE_STATUS_DELETING = 404198387 SCOPED_RESOURCE_STATUS_UNSPECIFIED = 437941996 @@ -48917,12 +49038,12 @@ class ScopedResourceStatus(proto.Enum): number=3355, optional=True, ) - instance_selectors: MutableSequence[ - "GlobalVmExtensionPolicyInstanceSelector" - ] = proto.RepeatedField( - proto.MESSAGE, - number=520298826, - message="GlobalVmExtensionPolicyInstanceSelector", + instance_selectors: MutableSequence["GlobalVmExtensionPolicyInstanceSelector"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=520298826, + message="GlobalVmExtensionPolicyInstanceSelector", + ) ) kind: str = proto.Field( proto.STRING, @@ -49230,6 +49351,7 @@ class PredefinedRolloutPlan(proto.Enum): SLOW_ROLLOUT (31032659): No description available. """ + UNDEFINED_PREDEFINED_ROLLOUT_PLAN = 0 FAST_ROLLOUT = 207153326 ROLLOUT_PLAN_UNSPECIFIED = 144511983 @@ -49339,6 +49461,7 @@ class State(proto.Enum): STATE_UNSPECIFIED (470755401): Default value. This value is unused. """ + UNDEFINED_STATE = 0 STATE_CANCELLED = 534636259 STATE_COMPLETED = 265728989 @@ -49441,6 +49564,7 @@ class SchedulingType(proto.Enum): reservation. Instead, each instance has its own maintenance window. """ + UNDEFINED_SCHEDULING_TYPE = 0 GROUPED = 474540862 GROUP_MAINTENANCE_TYPE_UNSPECIFIED = 447183678 @@ -49701,6 +49825,7 @@ class Type(proto.Enum): WINDOWS (456863331): No description available. """ + UNDEFINED_TYPE = 0 BARE_METAL_LINUX_COMPATIBLE = 354232740 FEATURE_TYPE_UNSPECIFIED = 531767259 @@ -49851,6 +49976,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -49869,6 +49995,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -50036,6 +50163,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -50054,6 +50182,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -50221,6 +50350,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -50239,6 +50369,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -50297,12 +50428,12 @@ class HealthAggregationPoliciesScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - health_aggregation_policies: MutableSequence[ - "HealthAggregationPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=87589904, - message="HealthAggregationPolicy", + health_aggregation_policies: MutableSequence["HealthAggregationPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=87589904, + message="HealthAggregationPolicy", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -50447,6 +50578,7 @@ class PolicyType(proto.Enum): DNS_PUBLIC_IP_POLICY (366354794): No description available. """ + UNDEFINED_POLICY_TYPE = 0 BACKEND_SERVICE_POLICY = 415582023 DNS_PUBLIC_IP_POLICY = 366354794 @@ -50848,6 +50980,7 @@ class Type(proto.Enum): TCP (82881): No description available. """ + UNDEFINED_TYPE = 0 GRPC = 2196510 GRPC_WITH_TLS = 268089571 @@ -51254,6 +51387,7 @@ class HealthStatusAggregationPolicy(proto.Enum): NO_AGGREGATION (426445124): No description available. """ + UNDEFINED_HEALTH_STATUS_AGGREGATION_POLICY = 0 AND = 64951 NO_AGGREGATION = 426445124 @@ -51282,6 +51416,7 @@ class HealthStatusAggregationStrategy(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_HEALTH_STATUS_AGGREGATION_STRATEGY = 0 creation_timestamp: str = proto.Field( @@ -51672,6 +51807,7 @@ class SourceType(proto.Enum): BACKEND_SERVICE (285792202): No description available. """ + UNDEFINED_SOURCE_TYPE = 0 BACKEND_SERVICE = 285792202 @@ -51998,6 +52134,7 @@ class HealthState(proto.Enum): UNHEALTHY (462118084): No description available. """ + UNDEFINED_HEALTH_STATE = 0 HEALTHY = 439801213 UNHEALTHY = 462118084 @@ -52015,6 +52152,7 @@ class Ipv6HealthState(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_IPV6_HEALTH_STATE = 0 class WeightError(proto.Enum): @@ -52051,6 +52189,7 @@ class WeightError(proto.Enum): updated to ENABLE or DRY_RUN and there has not been sufficient time to parse and report the backend weight. """ + UNDEFINED_WEIGHT_ERROR = 0 INVALID_WEIGHT = 383698400 MISSING_WEIGHT = 384027537 @@ -52180,6 +52319,7 @@ class HealthState(proto.Enum): UNKNOWN (433141802): No description available. """ + UNDEFINED_HEALTH_STATE = 0 DRAINING = 480455402 HEALTHY = 439801213 @@ -52202,6 +52342,7 @@ class Ipv6HealthState(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_IPV6_HEALTH_STATE = 0 backend_service: "BackendServiceReference" = proto.Field( @@ -52943,6 +53084,7 @@ class RedirectResponseCode(proto.Enum): Http Status Code 307 - Temporary Redirect maintaining HTTP method. """ + UNDEFINED_REDIRECT_RESPONSE_CODE = 0 FOUND = 67084130 MOVED_PERMANENTLY_DEFAULT = 386698449 @@ -53230,12 +53372,12 @@ class HttpRouteAction(proto.Message): optional=True, message="UrlRewrite", ) - weighted_backend_services: MutableSequence[ - "WeightedBackendService" - ] = proto.RepeatedField( - proto.MESSAGE, - number=337028049, - message="WeightedBackendService", + weighted_backend_services: MutableSequence["WeightedBackendService"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=337028049, + message="WeightedBackendService", + ) ) @@ -53620,12 +53762,12 @@ class HttpRouteRuleMatch(proto.Message): number=257898968, optional=True, ) - query_parameter_matches: MutableSequence[ - "HttpQueryParameterMatch" - ] = proto.RepeatedField( - proto.MESSAGE, - number=286231270, - message="HttpQueryParameterMatch", + query_parameter_matches: MutableSequence["HttpQueryParameterMatch"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=286231270, + message="HttpQueryParameterMatch", + ) ) regex_match: str = proto.Field( proto.STRING, @@ -53995,6 +54137,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -54011,6 +54154,7 @@ class SourceType(proto.Enum): RAW (80904): No description available. """ + UNDEFINED_SOURCE_TYPE = 0 RAW = 80904 @@ -54033,6 +54177,7 @@ class Status(proto.Enum): READY (77848963): Image has been successfully created. """ + UNDEFINED_STATUS = 0 DELETING = 528602024 FAILED = 455706685 @@ -60093,6 +60238,7 @@ class KeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_KEY_REVOCATION_ACTION_TYPE = 0 KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 467110106 NONE = 2402104 @@ -60113,6 +60259,7 @@ class PostKeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_POST_KEY_REVOCATION_ACTION_TYPE = 0 NOOP = 2402146 POST_KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 228738393 @@ -60142,6 +60289,7 @@ class PrivateIpv6GoogleAccess(proto.Enum): Each network interface inherits PrivateIpv6GoogleAccess from its subnetwork. """ + UNDEFINED_PRIVATE_IPV6_GOOGLE_ACCESS = 0 ENABLE_BIDIRECTIONAL_ACCESS_TO_GOOGLE = 427975994 ENABLE_OUTBOUND_VM_ACCESS_TO_GOOGLE = 288210263 @@ -60190,6 +60338,7 @@ class Status(proto.Enum): The instance has stopped (either by explicit action or underlying failure). """ + UNDEFINED_STATUS = 0 DEPROVISIONING = 428935662 PENDING = 35394935 @@ -61250,6 +61399,7 @@ class FailoverAction(proto.Enum): UNKNOWN (433141802): No description available. """ + UNDEFINED_FAILOVER_ACTION = 0 NO_FAILOVER = 480957872 UNKNOWN = 433141802 @@ -61273,6 +61423,7 @@ class ListManagedInstancesResults(proto.Enum): listManagedInstances API method. maxResults and pageToken query parameters are respected. """ + UNDEFINED_LIST_MANAGED_INSTANCES_RESULTS = 0 PAGELESS = 32183464 PAGINATED = 40190637 @@ -61283,12 +61434,12 @@ class ListManagedInstancesResults(proto.Enum): optional=True, message="InstanceGroupManagerAllInstancesConfig", ) - auto_healing_policies: MutableSequence[ - "InstanceGroupManagerAutoHealingPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=456799109, - message="InstanceGroupManagerAutoHealingPolicy", + auto_healing_policies: MutableSequence["InstanceGroupManagerAutoHealingPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=456799109, + message="InstanceGroupManagerAutoHealingPolicy", + ) ) base_instance_name: str = proto.Field( proto.STRING, @@ -62020,6 +62171,7 @@ class DefaultActionOnFailure(proto.Enum): REPAIR (266277773): No description available. """ + UNDEFINED_DEFAULT_ACTION_ON_FAILURE = 0 DELETE = 402225579 DO_NOTHING = 451307513 @@ -62048,6 +62200,7 @@ class ForceUpdateOnRepair(proto.Enum): YES (87751): No description available. """ + UNDEFINED_FORCE_UPDATE_ON_REPAIR = 0 NO = 2497 YES = 87751 @@ -62080,6 +62233,7 @@ class OnFailedHealthCheck(proto.Enum): instanceLifecyclePolicy.defaultActionOnFailure field. """ + UNDEFINED_ON_FAILED_HEALTH_CHECK = 0 DEFAULT_ACTION = 463967764 @@ -62145,6 +62299,7 @@ class AllowChangingZone(proto.Enum): MIG can select a different zone for the VM during a repair. """ + UNDEFINED_ALLOW_CHANGING_ZONE = 0 NO = 2497 YES = 87751 @@ -62381,6 +62536,7 @@ class State(proto.Enum): SUCCEEDED (511103553): The request succeeded. """ + UNDEFINED_STATE = 0 ACCEPTED = 246714279 CANCELLED = 41957681 @@ -62682,6 +62838,7 @@ class Mode(proto.Enum): the standby pool when the group scales out, and replenishes the standby pool afterwards. """ + UNDEFINED_MODE = 0 MANUAL = 119397318 SCALE_OUT_POOL = 635394 @@ -63015,6 +63172,7 @@ class Mode(proto.Enum): If mode is unspecified, MIG will behave as in the default ``INDIVIDUAL`` mode. """ + UNDEFINED_MODE = 0 BULK = 2050322 INDIVIDUAL = 438800025 @@ -63179,6 +63337,7 @@ class InstanceRedistributionType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_INSTANCE_REDISTRIBUTION_TYPE = 0 class MinimalAction(proto.Enum): @@ -63210,6 +63369,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -63235,6 +63395,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 class ReplacementMethod(proto.Enum): @@ -63252,6 +63413,7 @@ class ReplacementMethod(proto.Enum): Default option: instances will be deleted and created (with a new name) """ + UNDEFINED_REPLACEMENT_METHOD = 0 RECREATE = 522644719 SUBSTITUTE = 280924314 @@ -63276,6 +63438,7 @@ class Type(proto.Enum): to existing VMs only when you selectively target specific or all VMs to be updated. """ + UNDEFINED_TYPE = 0 OPPORTUNISTIC = 429530089 @@ -63496,6 +63659,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -63526,6 +63690,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 all_instances: bool = proto.Field( @@ -63681,6 +63846,7 @@ class AcceleratorTopologyHealth(proto.Enum): infrastructure unsuitable for forming a working inter-chip connected group. """ + UNDEFINED_ACCELERATOR_TOPOLOGY_HEALTH = 0 DEGRADED = 396890926 HEALTHY = 439801213 @@ -63937,12 +64103,12 @@ class InstanceGroupManagersScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - instance_group_managers: MutableSequence[ - "InstanceGroupManager" - ] = proto.RepeatedField( - proto.MESSAGE, - number=214072592, - message="InstanceGroupManager", + instance_group_managers: MutableSequence["InstanceGroupManager"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=214072592, + message="InstanceGroupManager", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -63960,12 +64126,12 @@ class InstanceGroupManagersSetAutoHealingRequest(proto.Message): """ - auto_healing_policies: MutableSequence[ - "InstanceGroupManagerAutoHealingPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=456799109, - message="InstanceGroupManagerAutoHealingPolicy", + auto_healing_policies: MutableSequence["InstanceGroupManagerAutoHealingPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=456799109, + message="InstanceGroupManagerAutoHealingPolicy", + ) ) @@ -64249,6 +64415,7 @@ class InstanceState(proto.Enum): Includes instances in the generated list only if they have a RUNNING state. """ + UNDEFINED_INSTANCE_STATE = 0 ALL = 64897 RUNNING = 121282975 @@ -64637,6 +64804,7 @@ class Action(proto.Enum): performed as post-instance creation (subject to future extensions). """ + UNDEFINED_ACTION = 0 ABANDONING = 388244813 ADOPTING = 414293554 @@ -64963,6 +65131,7 @@ class KeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_KEY_REVOCATION_ACTION_TYPE = 0 KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 467110106 NONE = 2402104 @@ -64983,6 +65152,7 @@ class PostKeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_POST_KEY_REVOCATION_ACTION_TYPE = 0 NOOP = 2402146 POST_KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 228738393 @@ -65013,6 +65183,7 @@ class PrivateIpv6GoogleAccess(proto.Enum): Each network interface inherits PrivateIpv6GoogleAccess from its subnetwork. """ + UNDEFINED_PRIVATE_IPV6_GOOGLE_ACCESS = 0 ENABLE_BIDIRECTIONAL_ACCESS_TO_GOOGLE = 427975994 ENABLE_OUTBOUND_VM_ACCESS_TO_GOOGLE = 288210263 @@ -65685,6 +65856,7 @@ class Status(proto.Enum): The instance has stopped (either by explicit action or underlying failure). """ + UNDEFINED_STATUS = 0 DEPROVISIONING = 428935662 PENDING = 35394935 @@ -65740,13 +65912,13 @@ class InstancesBulkInsertOperationMetadata(proto.Message): name is key). Example key: zones/us-central1-a """ - per_location_status: MutableMapping[ - str, "BulkInsertOperationStatus" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=167851162, - message="BulkInsertOperationStatus", + per_location_status: MutableMapping[str, "BulkInsertOperationStatus"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=167851162, + message="BulkInsertOperationStatus", + ) ) @@ -65848,6 +66020,7 @@ class Type(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TYPE = 0 HIERARCHY = 69902869 NETWORK = 413984270 @@ -65971,6 +66144,7 @@ class DisruptionSchedule(proto.Enum): IMMEDIATE (152881041): Default value. Disrupt the VM immediately. """ + UNDEFINED_DISRUPTION_SCHEDULE = 0 DISRUPTION_SCHEDULE_UNSPECIFIED = 332543835 FUTURE = 474513859 @@ -65981,12 +66155,12 @@ class DisruptionSchedule(proto.Enum): number=95871619, optional=True, ) - fault_reasons: MutableSequence[ - "InstancesReportHostAsFaultyRequestFaultReason" - ] = proto.RepeatedField( - proto.MESSAGE, - number=168056210, - message="InstancesReportHostAsFaultyRequestFaultReason", + fault_reasons: MutableSequence["InstancesReportHostAsFaultyRequestFaultReason"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=168056210, + message="InstancesReportHostAsFaultyRequestFaultReason", + ) ) @@ -66022,6 +66196,7 @@ class Behavior(proto.Enum): UNRECOVERABLE_GPU_ERROR (363710747): No description available. """ + UNDEFINED_BEHAVIOR = 0 BEHAVIOR_UNSPECIFIED = 85734570 PERFORMANCE = 135701520 @@ -66480,6 +66655,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -66506,6 +66682,7 @@ class Status(proto.Enum): InstantSnapshot is currently unavailable and cannot be used for Disk restoration """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -67158,6 +67335,7 @@ class AvailableFeatures(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_AVAILABLE_FEATURES = 0 class InterconnectType(proto.Enum): @@ -67187,6 +67365,7 @@ class InterconnectType(proto.Enum): A partner-managed interconnection shared between customers via partner. """ + UNDEFINED_INTERCONNECT_TYPE = 0 DEDICATED = 258411983 IT_PRIVATE = 335677007 @@ -67215,6 +67394,7 @@ class LinkType(proto.Enum): LINK_TYPE_ETHERNET_400G_LR4 (127023690): 400G Ethernet, LR4 Optics. """ + UNDEFINED_LINK_TYPE = 0 LINK_TYPE_ETHERNET_100G_LR = 337672551 LINK_TYPE_ETHERNET_10G_LR = 236739749 @@ -67248,6 +67428,7 @@ class OperationalStatus(proto.Enum): attachments may be provisioned on this interconnect. """ + UNDEFINED_OPERATIONAL_STATUS = 0 OS_ACTIVE = 55721409 OS_UNPROVISIONED = 239771840 @@ -67262,6 +67443,7 @@ class RequestedFeatures(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_REQUESTED_FEATURES = 0 class State(proto.Enum): @@ -67291,6 +67473,7 @@ class State(proto.Enum): attachments may be provisioned on this interconnect. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 UNPROVISIONED = 517333979 @@ -67308,6 +67491,7 @@ class Subzone(proto.Enum): SUBZONE_B (291575439): Subzone B. """ + UNDEFINED_SUBZONE = 0 SUBZONE_A = 291575438 SUBZONE_B = 291575439 @@ -67354,12 +67538,12 @@ class Subzone(proto.Enum): number=422937596, optional=True, ) - expected_outages: MutableSequence[ - "InterconnectOutageNotification" - ] = proto.RepeatedField( - proto.MESSAGE, - number=264484123, - message="InterconnectOutageNotification", + expected_outages: MutableSequence["InterconnectOutageNotification"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=264484123, + message="InterconnectOutageNotification", + ) ) google_ip_address: str = proto.Field( proto.STRING, @@ -67596,6 +67780,7 @@ class TrafficClass(proto.Enum): Traffic Class 6, corresponding to DSCP ranges (48-63) 11xxxx. """ + UNDEFINED_TRAFFIC_CLASS = 0 TC1 = 82850 TC2 = 82851 @@ -68163,6 +68348,7 @@ class Bandwidth(proto.Enum): BPS_5G (355358572): 5 Gbit/s """ + UNDEFINED_BANDWIDTH = 0 BPS_100G = 49547952 BPS_100M = 49547958 @@ -68207,6 +68393,7 @@ class EdgeAvailabilityDomain(proto.Enum): AVAILABILITY_DOMAIN_ANY (375256373): No description available. """ + UNDEFINED_EDGE_AVAILABILITY_DOMAIN = 0 AVAILABILITY_DOMAIN_1 = 349552090 AVAILABILITY_DOMAIN_2 = 349552091 @@ -68249,6 +68436,7 @@ class Encryption(proto.Enum): receive traffic from such interconnect attachment. """ + UNDEFINED_ENCRYPTION = 0 IPSEC = 69882282 NONE = 2402104 @@ -68276,6 +68464,7 @@ class OperationalStatus(proto.Enum): Indicates that attachment is not ready to use yet, because turnup is not complete. """ + UNDEFINED_OPERATIONAL_STATUS = 0 OS_ACTIVE = 55721409 OS_UNPROVISIONED = 239771840 @@ -68299,6 +68488,7 @@ class StackType(proto.Enum): The interconnect attachment will only be assigned IPv4 addresses. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -68358,6 +68548,7 @@ class State(proto.Enum): Indicates that attachment is not ready to use yet, because turnup is not complete. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DEFUNCT = 115891759 @@ -68397,6 +68588,7 @@ class Type(proto.Enum): Attachment to a partner interconnect, created by the partner. """ + UNDEFINED_TYPE = 0 DEDICATED = 258411983 L2_DEDICATED = 336595510 @@ -68789,6 +68981,7 @@ class BgpMd5(proto.Enum): MD5_UNSUPPORTED: BGP MD5 authentication must not be configured """ + UNDEFINED_BGP_MD5 = 0 MD5_OPTIONAL = 532156673 MD5_REQUIRED = 218034496 @@ -68916,13 +69109,13 @@ class InterconnectAttachmentGroup(proto.Message): This field is a member of `oneof`_ ``_self_link``. """ - attachments: MutableMapping[ - str, "InterconnectAttachmentGroupAttachment" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=334744496, - message="InterconnectAttachmentGroupAttachment", + attachments: MutableMapping[str, "InterconnectAttachmentGroupAttachment"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=334744496, + message="InterconnectAttachmentGroupAttachment", + ) ) configured: "InterconnectAttachmentGroupConfigured" = proto.Field( proto.MESSAGE, @@ -69059,6 +69252,7 @@ class EffectiveSla(proto.Enum): PRODUCTION_NON_CRITICAL (117399223): No description available. """ + UNDEFINED_EFFECTIVE_SLA = 0 EFFECTIVE_SLA_UNSPECIFIED = 491000744 NO_SLA = 161460618 @@ -69150,6 +69344,7 @@ class BlockerType(proto.Enum): OTHER (75532016): No description available. """ + UNDEFINED_BLOCKER_TYPE = 0 BLOCKER_TYPE_UNSPECIFIED = 429793623 INCOMPATIBLE_METROS = 290410432 @@ -69224,6 +69419,7 @@ class AvailabilitySla(proto.Enum): PRODUCTION_NON_CRITICAL (117399223): No description available. """ + UNDEFINED_AVAILABILITY_SLA = 0 AVAILABILITY_SLA_UNSPECIFIED = 11186044 NO_SLA = 161460618 @@ -69247,12 +69443,12 @@ class InterconnectAttachmentGroupLogicalStructure(proto.Message): """ - regions: MutableSequence[ - "InterconnectAttachmentGroupLogicalStructureRegion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=12367871, - message="InterconnectAttachmentGroupLogicalStructureRegion", + regions: MutableSequence["InterconnectAttachmentGroupLogicalStructureRegion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12367871, + message="InterconnectAttachmentGroupLogicalStructureRegion", + ) ) @@ -69540,6 +69736,7 @@ class GroupStatus(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_GROUP_STATUS = 0 DEGRADED = 396890926 FULLY_DOWN = 255514647 @@ -69631,6 +69828,7 @@ class IsActive(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_IS_ACTIVE = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -69675,6 +69873,7 @@ class Status(proto.Enum): UNPROVISIONED (517333979): No description available. """ + UNDEFINED_STATUS = 0 ATTACHMENT_STATUS_UNKNOWN = 472477561 CONNECTION_DISABLED = 432687805 @@ -70104,12 +70303,12 @@ class InterconnectAttachmentsScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - interconnect_attachments: MutableSequence[ - "InterconnectAttachment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=425388415, - message="InterconnectAttachment", + interconnect_attachments: MutableSequence["InterconnectAttachment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=425388415, + message="InterconnectAttachment", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -70213,6 +70412,7 @@ class BundleAggregationType(proto.Enum): BUNDLE_AGGREGATION_TYPE_STATIC (50678873): LACP is disabled. """ + UNDEFINED_BUNDLE_AGGREGATION_TYPE = 0 BUNDLE_AGGREGATION_TYPE_LACP = 27758925 BUNDLE_AGGREGATION_TYPE_STATIC = 50678873 @@ -70238,16 +70438,17 @@ class BundleOperationalStatus(proto.Enum): the bundle (typically just one) have UP operational status. """ + UNDEFINED_BUNDLE_OPERATIONAL_STATUS = 0 BUNDLE_OPERATIONAL_STATUS_DOWN = 453842693 BUNDLE_OPERATIONAL_STATUS_UP = 161366462 - arp_caches: MutableSequence[ - "InterconnectDiagnosticsARPEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=414591761, - message="InterconnectDiagnosticsARPEntry", + arp_caches: MutableSequence["InterconnectDiagnosticsARPEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=414591761, + message="InterconnectDiagnosticsARPEntry", + ) ) bundle_aggregation_type: str = proto.Field( proto.STRING, @@ -70350,6 +70551,7 @@ class State(proto.Enum): this means the rest of the object should be empty. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DETACHED = 216562546 @@ -70445,6 +70647,7 @@ class State(proto.Enum): The value of the current optical power has not crossed a warning threshold. """ + UNDEFINED_STATE = 0 HIGH_ALARM = 305363284 HIGH_WARNING = 220984799 @@ -70527,16 +70730,17 @@ class OperationalStatus(proto.Enum): The interface has low level communication with the remote end. """ + UNDEFINED_OPERATIONAL_STATUS = 0 LINK_OPERATIONAL_STATUS_DOWN = 281653885 LINK_OPERATIONAL_STATUS_UP = 305879862 - arp_caches: MutableSequence[ - "InterconnectDiagnosticsARPEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=414591761, - message="InterconnectDiagnosticsARPEntry", + arp_caches: MutableSequence["InterconnectDiagnosticsARPEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=414591761, + message="InterconnectDiagnosticsARPEntry", + ) ) circuit_id: str = proto.Field( proto.STRING, @@ -70717,13 +70921,13 @@ class InterconnectGroup(proto.Message): optional=True, message="InterconnectGroupIntent", ) - interconnects: MutableMapping[ - str, "InterconnectGroupInterconnect" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=520187301, - message="InterconnectGroupInterconnect", + interconnects: MutableMapping[str, "InterconnectGroupInterconnect"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=520187301, + message="InterconnectGroupInterconnect", + ) ) kind: str = proto.Field( proto.STRING, @@ -70805,6 +71009,7 @@ class SupportedSla(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_SUPPORTED_SLA = 0 NO_SLA = 161460618 PRODUCTION_CRITICAL = 470416485 @@ -70892,6 +71097,7 @@ class BlockerType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_BLOCKER_TYPE = 0 INCOMPATIBLE_METROS = 290410432 NOT_AVAILABLE = 140722205 @@ -70964,6 +71170,7 @@ class TopologyCapability(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TOPOLOGY_CAPABILITY = 0 NO_SLA = 161460618 PRODUCTION_CRITICAL = 470416485 @@ -71007,12 +71214,12 @@ class InterconnectGroupPhysicalStructure(proto.Message): """ - metros: MutableSequence[ - "InterconnectGroupPhysicalStructureMetros" - ] = proto.RepeatedField( - proto.MESSAGE, - number=533067386, - message="InterconnectGroupPhysicalStructureMetros", + metros: MutableSequence["InterconnectGroupPhysicalStructureMetros"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=533067386, + message="InterconnectGroupPhysicalStructureMetros", + ) ) @@ -71145,6 +71352,7 @@ class IntentMismatchBehavior(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_INTENT_MISMATCH_BEHAVIOR = 0 CREATE = 385389820 REJECT = 266102687 @@ -71317,6 +71525,7 @@ class InterconnectType(proto.Enum): A partner-managed interconnection shared between customers via partner. """ + UNDEFINED_INTERCONNECT_TYPE = 0 DEDICATED = 258411983 IT_PRIVATE = 335677007 @@ -71346,6 +71555,7 @@ class LinkType(proto.Enum): LINK_TYPE_ETHERNET_400G_LR4 (127023690): 400G Ethernet, LR4 Optics. """ + UNDEFINED_LINK_TYPE = 0 LINK_TYPE_ETHERNET_100G_LR = 337672551 LINK_TYPE_ETHERNET_10G_LR = 236739749 @@ -71365,6 +71575,7 @@ class RequestedFeatures(proto.Enum): IF_MACSEC (396279300): Media Access Control security (MACsec) """ + UNDEFINED_REQUESTED_FEATURES = 0 IF_CROSS_SITE_NETWORK = 469111095 IF_L2_FORWARDING = 125563860 @@ -71610,6 +71821,7 @@ class GroupStatus(proto.Enum): GROUPS_STATUS_UNSPECIFIED (261932693): No description available. """ + UNDEFINED_GROUP_STATUS = 0 DEGRADED = 396890926 FULLY_DOWN = 255514647 @@ -71696,6 +71908,7 @@ class IsActive(proto.Enum): IS_ACTIVE_UNSPECIFIED (274948243): No description available. """ + UNDEFINED_IS_ACTIVE = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -71967,6 +72180,7 @@ class AvailableFeatures(proto.Enum): IF_MACSEC (396279300): Media Access Control security (MACsec) """ + UNDEFINED_AVAILABLE_FEATURES = 0 IF_CROSS_SITE_NETWORK = 469111095 IF_L2_FORWARDING = 125563860 @@ -71986,6 +72200,7 @@ class AvailableLinkTypes(proto.Enum): LINK_TYPE_ETHERNET_400G_LR4 (127023690): 400G Ethernet, LR4 Optics. """ + UNDEFINED_AVAILABLE_LINK_TYPES = 0 LINK_TYPE_ETHERNET_100G_LR = 337672551 LINK_TYPE_ETHERNET_10G_LR = 236739749 @@ -72028,6 +72243,7 @@ class Continent(proto.Enum): SOUTH_AMERICA (32597340): No description available. """ + UNDEFINED_CONTINENT = 0 AFRICA = 317443706 ASIA_PAC = 119782269 @@ -72062,6 +72278,7 @@ class Status(proto.Enum): The InterconnectLocation is closed for provisioning new Interconnects. """ + UNDEFINED_STATUS = 0 AVAILABLE = 442079913 CLOSED = 380163436 @@ -72141,23 +72358,23 @@ class Status(proto.Enum): number=536567094, optional=True, ) - region_infos: MutableSequence[ - "InterconnectLocationRegionInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=312194170, - message="InterconnectLocationRegionInfo", + region_infos: MutableSequence["InterconnectLocationRegionInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=312194170, + message="InterconnectLocationRegionInfo", + ) ) self_link: str = proto.Field( proto.STRING, number=456214797, optional=True, ) - single_region_production_critical_peer_locations: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=439537103, + single_region_production_critical_peer_locations: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=439537103, + ) ) status: str = proto.Field( proto.STRING, @@ -72331,6 +72548,7 @@ class LocationPresence(proto.Enum): [Deprecated] This region shares the same regional network presence as this InterconnectLocation. """ + UNDEFINED_LOCATION_PRESENCE = 0 GLOBAL = 494663587 LOCAL_REGION = 403535464 @@ -72395,12 +72613,12 @@ class InterconnectMacsec(proto.Message): number=532597451, optional=True, ) - pre_shared_keys: MutableSequence[ - "InterconnectMacsecPreSharedKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=420308466, - message="InterconnectMacsecPreSharedKey", + pre_shared_keys: MutableSequence["InterconnectMacsecPreSharedKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=420308466, + message="InterconnectMacsecPreSharedKey", + ) ) @@ -72420,12 +72638,12 @@ class InterconnectMacsecConfig(proto.Message): link. """ - pre_shared_keys: MutableSequence[ - "InterconnectMacsecConfigPreSharedKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=420308466, - message="InterconnectMacsecConfigPreSharedKey", + pre_shared_keys: MutableSequence["InterconnectMacsecConfigPreSharedKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=420308466, + message="InterconnectMacsecConfigPreSharedKey", + ) ) @@ -72636,6 +72854,7 @@ class IssueType(proto.Enum): window. The interconnect as a whole should remain up, albeit with reduced bandwidth. """ + UNDEFINED_ISSUE_TYPE = 0 IT_OUTAGE = 175779973 IT_PARTIAL_OUTAGE = 92103971 @@ -72662,6 +72881,7 @@ class Source(proto.Enum): NSRC_GOOGLE (510574562): [Deprecated] This notification was generated by Google. """ + UNDEFINED_SOURCE = 0 GOOGLE = 497439289 NSRC_GOOGLE = 510574562 @@ -72705,6 +72925,7 @@ class State(proto.Enum): [Deprecated] The outage associated with this notification was canceled before the outage was due to start. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 CANCELLED = 41957681 @@ -72959,6 +73180,7 @@ class Continent(proto.Enum): SOUTH_AMERICA (32597340): No description available. """ + UNDEFINED_CONTINENT = 0 AFRICA = 317443706 ASIA_PAC = 119782269 @@ -72984,6 +73206,7 @@ class Lacp(proto.Enum): bundleAggregationType as "static". GCP does not support LAGs without LACP, so requestedLinkCount must be 1. """ + UNDEFINED_LACP = 0 LACP_SUPPORTED = 339576113 LACP_UNSUPPORTED = 203930104 @@ -73012,6 +73235,7 @@ class Status(proto.Enum): The InterconnectRemoteLocation is closed for provisioning new Cross-Cloud Interconnects. """ + UNDEFINED_STATUS = 0 AVAILABLE = 442079913 CLOSED = 380163436 @@ -73204,6 +73428,7 @@ class PortPairRemoteLocation(proto.Enum): to provision a redundant pair of Cross-Cloud Interconnects using two different remote locations in the same city. """ + UNDEFINED_PORT_PAIR_REMOTE_LOCATION = 0 PORT_PAIR_MATCHING_REMOTE_LOCATION = 207291859 PORT_PAIR_UNCONSTRAINED_REMOTE_LOCATION = 60609829 @@ -73228,6 +73453,7 @@ class PortPairVlan(proto.Enum): PORT_PAIR_UNCONSTRAINED_VLAN (175227948): PORT_PAIR_UNCONSTRAINED_VLAN means there is no constraint. """ + UNDEFINED_PORT_PAIR_VLAN = 0 PORT_PAIR_MATCHING_VLAN = 250295358 PORT_PAIR_UNCONSTRAINED_VLAN = 175227948 @@ -73887,6 +74113,7 @@ class State(proto.Enum): TERMINATED (250018339): Reserved state. """ + UNDEFINED_STATE = 0 DISABLED = 516696700 ENABLED = 182130465 @@ -75481,6 +75708,7 @@ class AddressFamily(proto.Enum): UNSPECIFIED_IP_VERSION (72938440): No description available. """ + UNDEFINED_ADDRESS_FAMILY = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -75501,6 +75729,7 @@ class RouteType(proto.Enum): UNSPECIFIED_ROUTE_TYPE (248064440): No description available. """ + UNDEFINED_ROUTE_TYPE = 0 ADVERTISED = 20302109 LEARNED = 231892419 @@ -79446,6 +79675,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 FULL = 2169487 @@ -79991,6 +80221,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 FULL = 2169487 @@ -84427,6 +84658,7 @@ class Direction(proto.Enum): OUTGOING (307438444): For routes exported from local network. """ + UNDEFINED_DIRECTION = 0 INCOMING = 338552870 OUTGOING = 307438444 @@ -88234,6 +88466,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 FULL = 2169487 @@ -93967,6 +94200,7 @@ class Views(proto.Enum): WITH_UTILIZATION (504090633): Utilization data is included in the response. """ + UNDEFINED_VIEWS = 0 DEFAULT = 115302945 WITH_UTILIZATION = 504090633 @@ -97520,6 +97754,7 @@ class TargetShape(proto.Enum): impact of zonal failure. Recommended for highly available serving workloads. """ + UNDEFINED_TARGET_SHAPE = 0 ANY = 64972 ANY_SINGLE_ZONE = 61100880 @@ -97571,6 +97806,7 @@ class Preference(proto.Enum): PREFERENCE_UNSPECIFIED (496219571): Default value, unused. """ + UNDEFINED_PREFERENCE = 0 ALLOW = 62368553 DENY = 2094604 @@ -97781,6 +98017,7 @@ class Status(proto.Enum): UPLOADING (267603489): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -97860,12 +98097,12 @@ class Status(proto.Enum): number=456214797, optional=True, ) - source_disk_encryption_keys: MutableSequence[ - "SourceDiskEncryptionKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=370408498, - message="SourceDiskEncryptionKey", + source_disk_encryption_keys: MutableSequence["SourceDiskEncryptionKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=370408498, + message="SourceDiskEncryptionKey", + ) ) source_instance: str = proto.Field( proto.STRING, @@ -98076,6 +98313,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -98563,6 +98801,7 @@ class CurrentAction(proto.Enum): performed as post-instance creation (subject to future extensions). """ + UNDEFINED_CURRENT_ACTION = 0 ABANDONING = 388244813 ADOPTING = 414293554 @@ -98619,6 +98858,7 @@ class InstanceStatus(proto.Enum): The instance has stopped (either by explicit action or underlying failure). """ + UNDEFINED_INSTANCE_STATUS = 0 DEPROVISIONING = 428935662 PENDING = 35394935 @@ -98652,6 +98892,7 @@ class TargetStatus(proto.Enum): The managed instance will eventually be DELETED. """ + UNDEFINED_TARGET_STATUS = 0 ABANDONED = 81797556 DELETED = 120962041 @@ -98677,12 +98918,12 @@ class TargetStatus(proto.Enum): number=18257045, optional=True, ) - instance_health: MutableSequence[ - "ManagedInstanceInstanceHealth" - ] = proto.RepeatedField( - proto.MESSAGE, - number=382667078, - message="ManagedInstanceInstanceHealth", + instance_health: MutableSequence["ManagedInstanceInstanceHealth"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=382667078, + message="ManagedInstanceInstanceHealth", + ) ) instance_status: str = proto.Field( proto.STRING, @@ -98808,6 +99049,7 @@ class DetailedHealthState(proto.Enum): instance but its health is not known at the moment. """ + UNDEFINED_DETAILED_HEALTH_STATE = 0 DRAINING = 480455402 HEALTHY = 439801213 @@ -98912,6 +99154,7 @@ class ProvisioningModel(proto.Enum): Standard provisioning with user controlled runtime, no discounts. """ + UNDEFINED_PROVISIONING_MODEL = 0 FLEX_START = 101746812 RESERVATION_BOUND = 293538571 @@ -99119,6 +99362,7 @@ class FilterMatchCriteria(proto.Enum): set. AmetadataFilter must never be created with this value. """ + UNDEFINED_FILTER_MATCH_CRITERIA = 0 MATCH_ALL = 180663271 MATCH_ANY = 180663346 @@ -99905,6 +100149,7 @@ class AcceleratorTopologyState(proto.Enum): accelerator topology cannot be activated due to insufficient number of running VMs. """ + UNDEFINED_ACCELERATOR_TOPOLOGY_STATE = 0 ACTIVATING = 378825968 ACTIVE = 314733318 @@ -100100,12 +100345,12 @@ class NatIpInfo(proto.Message): This field is a member of `oneof`_ ``_nat_name``. """ - nat_ip_info_mappings: MutableSequence[ - "NatIpInfoNatIpInfoMapping" - ] = proto.RepeatedField( - proto.MESSAGE, - number=241401884, - message="NatIpInfoNatIpInfoMapping", + nat_ip_info_mappings: MutableSequence["NatIpInfoNatIpInfoMapping"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=241401884, + message="NatIpInfoNatIpInfoMapping", + ) ) nat_name: str = proto.Field( proto.STRING, @@ -100152,6 +100397,7 @@ class Mode(proto.Enum): MANUAL (119397318): No description available. """ + UNDEFINED_MODE = 0 AUTO = 2020783 MANUAL = 119397318 @@ -100169,6 +100415,7 @@ class Usage(proto.Enum): UNUSED (360643030): No description available. """ + UNDEFINED_USAGE = 0 IN_USE = 17393485 UNUSED = 360643030 @@ -100373,6 +100620,7 @@ class NetworkFirewallPolicyEnforcementOrder(proto.Enum): BEFORE_CLASSIC_FIREWALL (338458349): No description available. """ + UNDEFINED_NETWORK_FIREWALL_POLICY_ENFORCEMENT_ORDER = 0 AFTER_CLASSIC_FIREWALL = 154582608 BEFORE_CLASSIC_FIREWALL = 338458349 @@ -100590,17 +100838,18 @@ class ConnectionPreference(proto.Enum): INVALID (530283991): No description available. """ + UNDEFINED_CONNECTION_PREFERENCE = 0 ACCEPT_AUTOMATIC = 75250580 ACCEPT_MANUAL = 373061341 INVALID = 530283991 - connection_endpoints: MutableSequence[ - "NetworkAttachmentConnectedEndpoint" - ] = proto.RepeatedField( - proto.MESSAGE, - number=326078813, - message="NetworkAttachmentConnectedEndpoint", + connection_endpoints: MutableSequence["NetworkAttachmentConnectedEndpoint"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=326078813, + message="NetworkAttachmentConnectedEndpoint", + ) ) connection_preference: str = proto.Field( proto.STRING, @@ -100815,6 +101064,7 @@ class Status(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -101152,13 +101402,13 @@ def raw_page(self): number=3355, optional=True, ) - items: MutableMapping[ - str, "NetworkEdgeSecurityServicesScopedList" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=100526016, - message="NetworkEdgeSecurityServicesScopedList", + items: MutableMapping[str, "NetworkEdgeSecurityServicesScopedList"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=100526016, + message="NetworkEdgeSecurityServicesScopedList", + ) ) kind: str = proto.Field( proto.STRING, @@ -101203,12 +101453,12 @@ class NetworkEdgeSecurityServicesScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - network_edge_security_services: MutableSequence[ - "NetworkEdgeSecurityService" - ] = proto.RepeatedField( - proto.MESSAGE, - number=35530156, - message="NetworkEdgeSecurityService", + network_edge_security_services: MutableSequence["NetworkEdgeSecurityService"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=35530156, + message="NetworkEdgeSecurityService", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -101508,6 +101758,7 @@ class NetworkEndpointType(proto.Enum): The network endpoint is handled by specified serverless infrastructure. """ + UNDEFINED_NETWORK_ENDPOINT_TYPE = 0 GCE_VM_IP = 401880793 GCE_VM_IP_PORT = 501838375 @@ -102107,6 +102358,7 @@ class PscConnectionStatus(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_PSC_CONNECTION_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -102296,6 +102548,7 @@ class HealthStatus(proto.Enum): Health status for network endpoints will not be provided. """ + UNDEFINED_HEALTH_STATUS = 0 SHOW = 2544381 SKIP = 2547071 @@ -102418,12 +102671,12 @@ class NetworkEndpointGroupsScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - network_endpoint_groups: MutableSequence[ - "NetworkEndpointGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29346733, - message="NetworkEndpointGroup", + network_endpoint_groups: MutableSequence["NetworkEndpointGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29346733, + message="NetworkEndpointGroup", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -102735,6 +102988,7 @@ class IgmpQuery(proto.Enum): The network interface has enabled IGMP query - v2. """ + UNDEFINED_IGMP_QUERY = 0 IGMP_QUERY_DISABLED = 28285169 IGMP_QUERY_V2 = 333493457 @@ -102759,6 +103013,7 @@ class Ipv6AccessType(proto.Enum): UNSPECIFIED_IPV6_ACCESS_TYPE (313080613): No description available. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -102785,6 +103040,7 @@ class NicType(proto.Enum): VIRTIO_NET (452123481): VIRTIO """ + UNDEFINED_NIC_TYPE = 0 GVNIC = 68209305 IDPF = 2242641 @@ -102817,6 +103073,7 @@ class StackType(proto.Enum): UNSPECIFIED_STACK_TYPE (298084569): No description available. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -103160,6 +103417,7 @@ class StackType(proto.Enum): This Peering will only allow IPv4 traffic and routes to be exchanged, even if the matching peering is IPV4_IPV6. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -103180,6 +103438,7 @@ class State(proto.Enum): peer, including the case when peer does not exist. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -103210,6 +103469,7 @@ class UpdateStrategy(proto.Enum): Peerings with update strategy UNSPECIFIED are created with update strategy INDEPENDENT. """ + UNDEFINED_UPDATE_STRATEGY = 0 CONSENSUS = 203373655 INDEPENDENT = 127011674 @@ -103345,6 +103605,7 @@ class UpdateStrategy(proto.Enum): Peerings with update strategy UNSPECIFIED are created with update strategy INDEPENDENT. """ + UNDEFINED_UPDATE_STRATEGY = 0 CONSENSUS = 203373655 INDEPENDENT = 127011674 @@ -103419,6 +103680,7 @@ class DeleteStatus(proto.Enum): The peer network admin has requested deletion of this peering connection. """ + UNDEFINED_DELETE_STATUS = 0 DELETE_ACKNOWLEDGED = 325293916 DELETE_STATUS_UNSPECIFIED = 395396446 @@ -103449,6 +103711,7 @@ class UpdateStatus(proto.Enum): UPDATE_STATUS_UNSPECIFIED (120836480): No description available. """ + UNDEFINED_UPDATE_STATUS = 0 IN_SYNC = 2273653 PENDING_LOCAL_ACKNOWLEDMENT = 229926592 @@ -103519,6 +103782,7 @@ class StackType(proto.Enum): This Peering will only allow IPv4 traffic and routes to be exchanged, even if the matching peering is IPV4_IPV6. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -103575,6 +103839,7 @@ class TotalEgressBandwidthTier(proto.Enum): TIER_1 (326919444): No description available. """ + UNDEFINED_TOTAL_EGRESS_BANDWIDTH_TIER = 0 DEFAULT = 115302945 TIER_1 = 326919444 @@ -104098,6 +104363,7 @@ class DscpMode(proto.Enum): Allows to specify custom DSCP value from selected traffic_class range. """ + UNDEFINED_DSCP_MODE = 0 AUTO = 2020783 CUSTOM = 388595569 @@ -104129,6 +104395,7 @@ class TrafficClass(proto.Enum): Traffic Class 6, corresponding to DSCP ranges (48-63) 11xxxx. """ + UNDEFINED_TRAFFIC_CLASS = 0 TC1 = 82850 TC2 = 82851 @@ -104268,6 +104535,7 @@ class State(proto.Enum): STATE_UNSPECIFIED (470755401): No description available. """ + UNDEFINED_STATE = 0 EFFECTIVE = 244201863 INEFFECTIVE = 304458242 @@ -104434,6 +104702,7 @@ class Scope(proto.Enum): ZONE (2759596): No description available. """ + UNDEFINED_SCOPE = 0 REGION = 266017524 ZONE = 2759596 @@ -104718,6 +104987,7 @@ class AddressPurposes(proto.Enum): VPC_PEERING (400800170): IP range for peer networks. """ + UNDEFINED_ADDRESS_PURPOSES = 0 DNS_RESOLVER = 476114556 GCE_ENDPOINT = 230515243 @@ -104740,6 +105010,7 @@ class AllowAddressCreation(proto.Enum): ADDRESS_CREATION_BLOCKED (534937975): No description available. """ + UNDEFINED_ALLOW_ADDRESS_CREATION = 0 ADDRESS_CREATION_ALLOWED = 181903667 ADDRESS_CREATION_BLOCKED = 534937975 @@ -104757,6 +105028,7 @@ class AllowAliasIpRanges(proto.Enum): ALIAS_IP_RANGES_BLOCKED (281030444): No description available. """ + UNDEFINED_ALLOW_ALIAS_IP_RANGES = 0 ALIAS_IP_RANGES_ALLOWED = 464867048 ALIAS_IP_RANGES_BLOCKED = 281030444 @@ -104773,6 +105045,7 @@ class AllowAutoModeSubnet(proto.Enum): AUTO_MODE_SUBNET_BLOCKED (207206006): No description available. """ + UNDEFINED_ALLOW_AUTO_MODE_SUBNET = 0 AUTO_MODE_SUBNET_ALLOWED = 391042610 AUTO_MODE_SUBNET_BLOCKED = 207206006 @@ -104790,6 +105063,7 @@ class AllowClassDFirewalls(proto.Enum): CLASS_D_FIREWALLS_BLOCKED (164382782): No description available. """ + UNDEFINED_ALLOW_CLASS_D_FIREWALLS = 0 CLASS_D_FIREWALLS_ALLOWED = 348219386 CLASS_D_FIREWALLS_BLOCKED = 164382782 @@ -104806,6 +105080,7 @@ class AllowCloudNat(proto.Enum): CLOUD_NAT_BLOCKED (62094692): No description available. """ + UNDEFINED_ALLOW_CLOUD_NAT = 0 CLOUD_NAT_ALLOWED = 245931296 CLOUD_NAT_BLOCKED = 62094692 @@ -104822,6 +105097,7 @@ class AllowCloudRouter(proto.Enum): CLOUD_ROUTER_BLOCKED (181551680): No description available. """ + UNDEFINED_ALLOW_CLOUD_ROUTER = 0 CLOUD_ROUTER_ALLOWED = 365388284 CLOUD_ROUTER_BLOCKED = 181551680 @@ -104838,6 +105114,7 @@ class AllowDefaultNicAttachment(proto.Enum): DEFAULT_NIC_ATTACHMENT_BLOCKED (364604997): No description available. """ + UNDEFINED_ALLOW_DEFAULT_NIC_ATTACHMENT = 0 DEFAULT_NIC_ATTACHMENT_ALLOWED = 11570689 DEFAULT_NIC_ATTACHMENT_BLOCKED = 364604997 @@ -104855,6 +105132,7 @@ class AllowExternalIpAccess(proto.Enum): EXTERNAL_IP_ACCESS_BLOCKED (462564501): No description available. """ + UNDEFINED_ALLOW_EXTERNAL_IP_ACCESS = 0 EXTERNAL_IP_ACCESS_ALLOWED = 109530193 EXTERNAL_IP_ACCESS_BLOCKED = 462564501 @@ -104872,6 +105150,7 @@ class AllowFirewallPolicy(proto.Enum): FIREWALL_POLICY_BLOCKED (204651742): No description available. """ + UNDEFINED_ALLOW_FIREWALL_POLICY = 0 FIREWALL_POLICY_ALLOWED = 388488346 FIREWALL_POLICY_BLOCKED = 204651742 @@ -104888,6 +105167,7 @@ class AllowInterconnect(proto.Enum): INTERCONNECT_BLOCKED (515879707): No description available. """ + UNDEFINED_ALLOW_INTERCONNECT = 0 INTERCONNECT_ALLOWED = 162845399 INTERCONNECT_BLOCKED = 515879707 @@ -104904,6 +105184,7 @@ class AllowIpForwarding(proto.Enum): IP_FORWARDING_BLOCKED (505629858): No description available. """ + UNDEFINED_ALLOW_IP_FORWARDING = 0 IP_FORWARDING_ALLOWED = 152595550 IP_FORWARDING_BLOCKED = 505629858 @@ -104920,6 +105201,7 @@ class AllowLoadBalancing(proto.Enum): LOAD_BALANCING_BLOCKED (381442285): No description available. """ + UNDEFINED_ALLOW_LOAD_BALANCING = 0 LOAD_BALANCING_ALLOWED = 28407977 LOAD_BALANCING_BLOCKED = 381442285 @@ -104936,6 +105218,7 @@ class AllowMultiNicInSameNetwork(proto.Enum): MULTI_NIC_IN_SAME_NETWORK_BLOCKED (273718815): No description available. """ + UNDEFINED_ALLOW_MULTI_NIC_IN_SAME_NETWORK = 0 MULTI_NIC_IN_SAME_NETWORK_ALLOWED = 457555419 MULTI_NIC_IN_SAME_NETWORK_BLOCKED = 273718815 @@ -104953,6 +105236,7 @@ class AllowMultiNicInSameSubnetwork(proto.Enum): MULTI_NIC_IN_SAME_SUBNETWORK_BLOCKED (104207991): No description available. """ + UNDEFINED_ALLOW_MULTI_NIC_IN_SAME_SUBNETWORK = 0 MULTI_NIC_IN_SAME_SUBNETWORK_ALLOWED = 288044595 MULTI_NIC_IN_SAME_SUBNETWORK_BLOCKED = 104207991 @@ -104969,6 +105253,7 @@ class AllowMulticast(proto.Enum): MULTICAST_BLOCKED (397727845): No description available. """ + UNDEFINED_ALLOW_MULTICAST = 0 MULTICAST_ALLOWED = 44693537 MULTICAST_BLOCKED = 397727845 @@ -104985,6 +105270,7 @@ class AllowNcc(proto.Enum): NCC_BLOCKED (283390907): No description available. """ + UNDEFINED_ALLOW_NCC = 0 NCC_ALLOWED = 467227511 NCC_BLOCKED = 283390907 @@ -105001,6 +105287,7 @@ class AllowNetworkMigration(proto.Enum): NETWORK_MIGRATION_BLOCKED (367424074): No description available. """ + UNDEFINED_ALLOW_NETWORK_MIGRATION = 0 NETWORK_MIGRATION_ALLOWED = 14389766 NETWORK_MIGRATION_BLOCKED = 367424074 @@ -105017,6 +105304,7 @@ class AllowPacketMirroring(proto.Enum): PACKET_MIRRORING_BLOCKED (445450553): No description available. """ + UNDEFINED_ALLOW_PACKET_MIRRORING = 0 PACKET_MIRRORING_ALLOWED = 92416245 PACKET_MIRRORING_BLOCKED = 445450553 @@ -105033,6 +105321,7 @@ class AllowPrivateGoogleAccess(proto.Enum): PRIVATE_GOOGLE_ACCESS_BLOCKED (36950747): No description available. """ + UNDEFINED_ALLOW_PRIVATE_GOOGLE_ACCESS = 0 PRIVATE_GOOGLE_ACCESS_ALLOWED = 220787351 PRIVATE_GOOGLE_ACCESS_BLOCKED = 36950747 @@ -105049,6 +105338,7 @@ class AllowPsc(proto.Enum): PSC_BLOCKED (524593965): No description available. """ + UNDEFINED_ALLOW_PSC = 0 PSC_ALLOWED = 171559657 PSC_BLOCKED = 524593965 @@ -105065,6 +105355,7 @@ class AllowSameNetworkUnicast(proto.Enum): SAME_NETWORK_UNICAST_BLOCKED (512767122): No description available. """ + UNDEFINED_ALLOW_SAME_NETWORK_UNICAST = 0 SAME_NETWORK_UNICAST_ALLOWED = 159732814 SAME_NETWORK_UNICAST_BLOCKED = 512767122 @@ -105081,6 +105372,7 @@ class AllowStaticRoutes(proto.Enum): STATIC_ROUTES_BLOCKED (225212360): No description available. """ + UNDEFINED_ALLOW_STATIC_ROUTES = 0 STATIC_ROUTES_ALLOWED = 409048964 STATIC_ROUTES_BLOCKED = 225212360 @@ -105097,6 +105389,7 @@ class AllowSubInterfaces(proto.Enum): SUBINTERFACES_BLOCKED (511720199): No description available. """ + UNDEFINED_ALLOW_SUB_INTERFACES = 0 SUBINTERFACES_ALLOWED = 158685891 SUBINTERFACES_BLOCKED = 511720199 @@ -105113,6 +105406,7 @@ class AllowSubnetworkCreation(proto.Enum): SUBNETWORK_CREATION_BLOCKED (511615133): No description available. """ + UNDEFINED_ALLOW_SUBNETWORK_CREATION = 0 SUBNETWORK_CREATION_ALLOWED = 158580825 SUBNETWORK_CREATION_BLOCKED = 511615133 @@ -105130,6 +105424,7 @@ class AllowVpcFirewallRules(proto.Enum): VPC_FIREWALL_RULES_BLOCKED (305749403): No description available. """ + UNDEFINED_ALLOW_VPC_FIREWALL_RULES = 0 VPC_FIREWALL_RULES_ALLOWED = 489586007 VPC_FIREWALL_RULES_BLOCKED = 305749403 @@ -105146,6 +105441,7 @@ class AllowVpcPeering(proto.Enum): VPC_PEERING_BLOCKED (77628471): No description available. """ + UNDEFINED_ALLOW_VPC_PEERING = 0 VPC_PEERING_ALLOWED = 261465075 VPC_PEERING_BLOCKED = 77628471 @@ -105162,6 +105458,7 @@ class AllowVpn(proto.Enum): VPN_BLOCKED (515198305): No description available. """ + UNDEFINED_ALLOW_VPN = 0 VPN_ALLOWED = 162163997 VPN_BLOCKED = 515198305 @@ -105178,6 +105475,7 @@ class FirewallPolicyTypes(proto.Enum): VPC_POLICY (74319208): No description available. """ + UNDEFINED_FIREWALL_POLICY_TYPES = 0 RDMA_ROCE_POLICY = 148757145 VPC_POLICY = 74319208 @@ -105202,6 +105500,7 @@ class InterfaceTypes(proto.Enum): VIRTIO_NET (452123481): VIRTIO """ + UNDEFINED_INTERFACE_TYPES = 0 GVNIC = 68209305 IDPF = 2242641 @@ -105222,6 +105521,7 @@ class Multicast(proto.Enum): MULTICAST_ULL (532211630): No description available. """ + UNDEFINED_MULTICAST = 0 MULTICAST_SDN = 532209462 MULTICAST_ULL = 532211630 @@ -105238,6 +105538,7 @@ class SubnetPurposes(proto.Enum): SUBNET_PURPOSE_PRIVATE (404371008): No description available. """ + UNDEFINED_SUBNET_PURPOSES = 0 SUBNET_PURPOSE_CUSTOM_HARDWARE = 283160275 SUBNET_PURPOSE_PRIVATE = 404371008 @@ -105256,6 +105557,7 @@ class SubnetStackTypes(proto.Enum): SUBNET_STACK_TYPE_IPV6_ONLY (98889336): No description available. """ + UNDEFINED_SUBNET_STACK_TYPES = 0 SUBNET_STACK_TYPE_IPV4_IPV6 = 41454485 SUBNET_STACK_TYPE_IPV4_ONLY = 41631034 @@ -105293,6 +105595,7 @@ class SubnetworkPurposes(proto.Enum): Subnetwork used for Regional Envoy-based Load Balancing. """ + UNDEFINED_SUBNETWORK_PURPOSES = 0 GLOBAL_MANAGED_PROXY = 236463602 INTERNAL_HTTPS_LOAD_BALANCER = 248748889 @@ -105319,6 +105622,7 @@ class SubnetworkStackTypes(proto.Enum): New VMs in this subnet will only be assigned IPv6 addresses. """ + UNDEFINED_SUBNETWORK_STACK_TYPES = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -105336,6 +105640,7 @@ class Unicast(proto.Enum): UNICAST_ULL (379956325): No description available. """ + UNDEFINED_UNICAST = 0 UNICAST_SDN = 379954157 UNICAST_ULL = 379956325 @@ -105598,6 +105903,7 @@ class NetworkType(proto.Enum): VPC (85193): VPC network. """ + UNDEFINED_NETWORK_TYPE = 0 RDMA = 2510662 ULL = 84117 @@ -105618,6 +105924,7 @@ class RdmaSubtype(proto.Enum): RDMA over Converged Ethernet (RoCE) for Bare Metal. """ + UNDEFINED_RDMA_SUBTYPE = 0 FALCON = 455787729 ROCE = 2520927 @@ -105635,6 +105942,7 @@ class UllSubtype(proto.Enum): PARTICIPANT (236028691): Exchange participant. """ + UNDEFINED_ULL_SUBTYPE = 0 OPERATOR = 282073252 PARTICIPANT = 236028691 @@ -105649,6 +105957,7 @@ class VpcSubtype(proto.Enum): REGIONAL (92288543): Regionally bound VPC network. """ + UNDEFINED_VPC_SUBTYPE = 0 REGIONAL = 92288543 @@ -105837,6 +106146,7 @@ class BgpBestPathSelectionMode(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_BGP_BEST_PATH_SELECTION_MODE = 0 LEGACY = 94234569 STANDARD = 484642493 @@ -105857,6 +106167,7 @@ class BgpInterRegionCost(proto.Enum): DEFAULT (115302945): No description available. """ + UNDEFINED_BGP_INTER_REGION_COST = 0 ADD_COST_TO_MED = 490583004 DEFAULT = 115302945 @@ -105872,6 +106183,7 @@ class EffectiveBgpInterRegionCost(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_EFFECTIVE_BGP_INTER_REGION_COST = 0 class RoutingMode(proto.Enum): @@ -105890,6 +106202,7 @@ class RoutingMode(proto.Enum): REGIONAL (92288543): No description available. """ + UNDEFINED_ROUTING_MODE = 0 GLOBAL = 494663587 REGIONAL = 92288543 @@ -106101,6 +106414,7 @@ class Type(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TYPE = 0 HIERARCHY = 69902869 NETWORK = 413984270 @@ -106375,6 +106689,7 @@ class MaintenanceInterval(proto.Enum): available. RECURRENT is used for GEN3 and Slice of Hardware VMs. """ + UNDEFINED_MAINTENANCE_INTERVAL = 0 AS_NEEDED = 500724834 PERIODIC = 142804635 @@ -106411,6 +106726,7 @@ class MaintenancePolicy(proto.Enum): TERMINATE, and they will only restart if automaticRestart = true. """ + UNDEFINED_MAINTENANCE_POLICY = 0 DEFAULT = 115302945 MAINTENANCE_POLICY_UNSPECIFIED = 72964182 @@ -106433,6 +106749,7 @@ class Status(proto.Enum): READY (77848963): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -106655,6 +106972,7 @@ class Mode(proto.Enum): Autoscaling will only scale out and will not remove nodes. """ + UNDEFINED_MODE = 0 MODE_UNSPECIFIED = 371348091 OFF = 78159 @@ -106866,6 +107184,7 @@ class CpuOvercommitType(proto.Enum): NONE (2402104): No description available. """ + UNDEFINED_CPU_OVERCOMMIT_TYPE = 0 CPU_OVERCOMMIT_TYPE_UNSPECIFIED = 520665615 ENABLED = 182130465 @@ -106889,6 +107208,7 @@ class Status(proto.Enum): REPAIRING (413483285): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -106917,12 +107237,12 @@ class Status(proto.Enum): number=95594102, message="LocalDisk", ) - instance_consumption_data: MutableSequence[ - "InstanceConsumptionData" - ] = proto.RepeatedField( - proto.MESSAGE, - number=84715576, - message="InstanceConsumptionData", + instance_consumption_data: MutableSequence["InstanceConsumptionData"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=84715576, + message="InstanceConsumptionData", + ) ) instances: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -107289,6 +107609,7 @@ class CpuOvercommitType(proto.Enum): NONE (2402104): No description available. """ + UNDEFINED_CPU_OVERCOMMIT_TYPE = 0 CPU_OVERCOMMIT_TYPE_UNSPECIFIED = 520665615 ENABLED = 182130465 @@ -107311,6 +107632,7 @@ class Status(proto.Enum): READY (77848963): The node template is ready. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -108396,6 +108718,7 @@ class Status(proto.Enum): RUNNING (121282975): No description available. """ + UNDEFINED_STATUS = 0 DONE = 2104194 PENDING = 35394935 @@ -108998,6 +109321,7 @@ class Duration(proto.Enum): MINUTE (126786068): No description available. """ + UNDEFINED_DURATION = 0 DURATION_UNSPECIFIED = 529071340 HOUR = 2223588 @@ -109023,6 +109347,7 @@ class Type(proto.Enum): TYPE_UNSPECIFIED (437714322): No description available. """ + UNDEFINED_TYPE = 0 LOOPBACK = 356174219 RECEIVE = 189660867 @@ -109187,6 +109512,7 @@ class Enable(proto.Enum): TRUE (2583950): No description available. """ + UNDEFINED_ENABLE = 0 FALSE = 66658563 TRUE = 2583950 @@ -109390,6 +109716,7 @@ class Direction(proto.Enum): INGRESS (516931221): Only ingress traffic is mirrored. """ + UNDEFINED_DIRECTION = 0 BOTH = 2044801 EGRESS = 432880501 @@ -109545,19 +109872,19 @@ class PacketMirroringMirroredResourceInfo(proto.Message): will be mirrored. """ - instances: MutableSequence[ - "PacketMirroringMirroredResourceInfoInstanceInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29097598, - message="PacketMirroringMirroredResourceInfoInstanceInfo", + instances: MutableSequence["PacketMirroringMirroredResourceInfoInstanceInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29097598, + message="PacketMirroringMirroredResourceInfoInstanceInfo", + ) ) - subnetworks: MutableSequence[ - "PacketMirroringMirroredResourceInfoSubnetInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=415853125, - message="PacketMirroringMirroredResourceInfoSubnetInfo", + subnetworks: MutableSequence["PacketMirroringMirroredResourceInfoSubnetInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=415853125, + message="PacketMirroringMirroredResourceInfoSubnetInfo", + ) ) tags: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -114666,6 +114993,7 @@ class Status(proto.Enum): The per-instance configuration has been deleted, but the deletion is not yet applied. """ + UNDEFINED_STATUS = 0 APPLYING = 352003508 DELETING = 528602024 @@ -115246,21 +115574,21 @@ class PreservedState(proto.Message): number=95594102, message="PreservedStatePreservedDisk", ) - external_i_ps: MutableMapping[ - str, "PreservedStatePreservedNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=532687245, - message="PreservedStatePreservedNetworkIp", + external_i_ps: MutableMapping[str, "PreservedStatePreservedNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=532687245, + message="PreservedStatePreservedNetworkIp", + ) ) - internal_i_ps: MutableMapping[ - str, "PreservedStatePreservedNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=215731675, - message="PreservedStatePreservedNetworkIp", + internal_i_ps: MutableMapping[str, "PreservedStatePreservedNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=215731675, + message="PreservedStatePreservedNetworkIp", + ) ) metadata: MutableMapping[str, str] = proto.MapField( proto.STRING, @@ -115315,6 +115643,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -115336,6 +115665,7 @@ class Mode(proto.Enum): VM instance at a time can be attached to a disk inREAD_WRITE mode. """ + UNDEFINED_MODE = 0 READ_ONLY = 91950261 READ_WRITE = 173607894 @@ -115397,6 +115727,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -115508,6 +115839,7 @@ class ActivationStatus(proto.Enum): ENABLED (182130465): No description available. """ + UNDEFINED_ACTIVATION_STATUS = 0 ACTIVATION_STATE_UNSPECIFIED = 632160 DISABLED = 516696700 @@ -115704,6 +116036,7 @@ class PredefinedRolloutPlan(proto.Enum): ROLLOUT_PLAN_UNSPECIFIED (144511983): No description available. """ + UNDEFINED_PREDEFINED_ROLLOUT_PLAN = 0 ROLLOUT_PLAN_FAST_ROLLOUT = 167808726 ROLLOUT_PLAN_TWO_DAY_ROLLOUT = 349866771 @@ -115800,6 +116133,7 @@ class Stage(proto.Enum): STAGE_UNSPECIFIED (63695670): No description available. """ + UNDEFINED_STAGE = 0 DEPRECATED = 463360435 GA = 2266 @@ -115983,6 +116317,7 @@ class CloudArmorTier(proto.Enum): CA_STANDARD (13156734): No description available. """ + UNDEFINED_CLOUD_ARMOR_TIER = 0 CA_ENTERPRISE_ANNUAL = 219921116 CA_ENTERPRISE_PAYGO = 453530323 @@ -116010,6 +116345,7 @@ class DefaultNetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_DEFAULT_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -116034,6 +116370,7 @@ class ManagedProtectionTier(proto.Enum): CAMP_PLUS_PAYGO (165150985): Plus tier protection monthly. """ + UNDEFINED_MANAGED_PROTECTION_TIER = 0 CAMP_PLUS_ANNUAL = 406967142 CAMP_PLUS_PAYGO = 165150985 @@ -116055,6 +116392,7 @@ class VmDnsSetting(proto.Enum): ZONAL_ONLY (521198951): No description available. """ + UNDEFINED_VM_DNS_SETTING = 0 GLOBAL_DEFAULT = 345419141 UNSPECIFIED_VM_DNS_SETTING = 35691930 @@ -116075,6 +116413,7 @@ class XpnProjectStatus(proto.Enum): UNSPECIFIED_XPN_PROJECT_STATUS (340393257): No description available. """ + UNDEFINED_XPN_PROJECT_STATUS = 0 HOST = 2223528 UNSPECIFIED_XPN_PROJECT_STATUS = 340393257 @@ -116300,6 +116639,7 @@ class CloudArmorTier(proto.Enum): CA_STANDARD (13156734): Standard protection. """ + UNDEFINED_CLOUD_ARMOR_TIER = 0 CA_ENTERPRISE_ANNUAL = 219921116 CA_ENTERPRISE_PAYGO = 453530323 @@ -116345,6 +116685,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -116386,6 +116727,7 @@ class ManagedProtectionTier(proto.Enum): CA_STANDARD (13156734): Standard protection. """ + UNDEFINED_MANAGED_PROTECTION_TIER = 0 CAMP_PLUS_ANNUAL = 406967142 CAMP_PLUS_PAYGO = 165150985 @@ -116546,6 +116888,7 @@ class ByoipApiVersion(proto.Enum): deletion takes minutes and the BGP status can be modified. """ + UNDEFINED_BYOIP_API_VERSION = 0 V1 = 2715 V2 = 2716 @@ -116568,6 +116911,7 @@ class Ipv6AccessType(proto.Enum): Cloud. All children Public Delegated Prefixes will have IPv6 access type as INTERNAL. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -116601,6 +116945,7 @@ class PdpScope(proto.Enum): The public delegated prefix is regional only. The provisioning will take a few minutes. """ + UNDEFINED_PDP_SCOPE = 0 GLOBAL = 494663587 GLOBAL_AND_REGIONAL = 318053059 @@ -116644,6 +116989,7 @@ class Status(proto.Enum): VALIDATED (66197998): Reverse DNS lookup is successful. """ + UNDEFINED_STATUS = 0 ANNOUNCED_TO_INTERNET = 177880897 INITIAL = 518841124 @@ -117031,6 +117377,7 @@ class ByoipApiVersion(proto.Enum): delete. Announce and Withdraw APIs can be used on this prefix to change the BGP status. """ + UNDEFINED_BYOIP_API_VERSION = 0 V1 = 2715 V2 = 2716 @@ -117055,6 +117402,7 @@ class Ipv6AccessType(proto.Enum): delegated prefixes will have IPv6 access type as INTERNAL. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -117090,6 +117438,7 @@ class Mode(proto.Enum): allocatablePrefixLength. Parent public delegated prefix must have IPv6 access type as INTERNAL. """ + UNDEFINED_MODE = 0 DELEGATION = 264149288 EXTERNAL_IPV6_FORWARDING_RULE_CREATION = 398684356 @@ -117136,6 +117485,7 @@ class Status(proto.Enum): The public delegated prefix is currently withdrawn but ready to be announced. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 ANNOUNCED = 365103355 @@ -117485,6 +117835,7 @@ class Ipv6AccessType(proto.Enum): delegated prefixes will have IPv6 access type as INTERNAL. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -117520,6 +117871,7 @@ class Mode(proto.Enum): allocatablePrefixLength. Parent public delegated prefix must have IPv6 access type as INTERNAL. """ + UNDEFINED_MODE = 0 DELEGATION = 264149288 EXTERNAL_IPV6_FORWARDING_RULE_CREATION = 398684356 @@ -117539,6 +117891,7 @@ class Status(proto.Enum): INACTIVE (270421099): No description available. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -117616,12 +117969,12 @@ class PublicDelegatedPrefixesScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - public_delegated_prefixes: MutableSequence[ - "PublicDelegatedPrefix" - ] = proto.RepeatedField( - proto.MESSAGE, - number=315261206, - message="PublicDelegatedPrefix", + public_delegated_prefixes: MutableSequence["PublicDelegatedPrefix"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=315261206, + message="PublicDelegatedPrefix", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -117996,6 +118349,7 @@ class Metric(proto.Enum): XPN_SERVICE_PROJECTS (95191981): No description available. """ + UNDEFINED_METRIC = 0 A2_CPUS = 153206585 AFFINITY_GROUPS = 108303563 @@ -118236,6 +118590,7 @@ class RolloutStatus(proto.Enum): ROLLOUT_STATUS_UNSPECIFIED - Rollout status is not specified. The default value. """ + UNDEFINED_ROLLOUT_STATUS = 0 IN_PROGRESS = 469193735 ROLLOUT_STATUS_UNSPECIFIED = 26864568 @@ -118400,6 +118755,7 @@ class Code(proto.Enum): UNREACHABLE (13328052): A given scope cannot be reached. """ + UNDEFINED_CODE = 0 CLEANUP_FAILED = 150308440 DEPRECATED_RESOURCE_USED = 391835586 @@ -118505,6 +118861,7 @@ class ContainerType(proto.Enum): TAR (82821): No description available. """ + UNDEFINED_CONTAINER_TYPE = 0 TAR = 82821 @@ -118786,6 +119143,7 @@ class Status(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATUS = 0 DOWN = 2104482 UP = 2715 @@ -119564,6 +119922,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -119594,6 +119953,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 all_instances: bool = proto.Field( @@ -119881,12 +120241,12 @@ class RegionInstanceGroupManagersSetAutoHealingRequest(proto.Message): """ - auto_healing_policies: MutableSequence[ - "InstanceGroupManagerAutoHealingPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=456799109, - message="InstanceGroupManagerAutoHealingPolicy", + auto_healing_policies: MutableSequence["InstanceGroupManagerAutoHealingPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=456799109, + message="InstanceGroupManagerAutoHealingPolicy", + ) ) @@ -120127,6 +120487,7 @@ class InstanceState(proto.Enum): Instance is in RUNNING state if it is running. """ + UNDEFINED_INSTANCE_STATE = 0 ALL = 64897 RUNNING = 121282975 @@ -120370,6 +120731,7 @@ class Type(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TYPE = 0 HIERARCHY = 69902869 NETWORK = 413984270 @@ -122213,6 +122575,7 @@ class DeploymentType(proto.Enum): The reserved capacity is made up of highly flexible, logical reservation blocks. """ + UNDEFINED_DEPLOYMENT_TYPE = 0 DENSE = 64932607 DEPLOYMENT_TYPE_UNSPECIFIED = 234847180 @@ -122245,6 +122608,7 @@ class ProtectionTier(proto.Enum): expected to continue as normal using the redundancies. """ + UNDEFINED_PROTECTION_TIER = 0 CAPACITY_OPTIMIZED = 17430466 PROTECTION_TIER_UNSPECIFIED = 262261984 @@ -122272,6 +122636,7 @@ class ReservationMode(proto.Enum): RESERVATION_MODE_UNSPECIFIED (233810606): No description available. """ + UNDEFINED_RESERVATION_MODE = 0 CALENDAR = 67431230 DEFAULT = 115302945 @@ -122294,6 +122659,7 @@ class SchedulingType(proto.Enum): reservation. Instead, each instance has its own maintenance window. """ + UNDEFINED_SCHEDULING_TYPE = 0 GROUPED = 474540862 GROUP_MAINTENANCE_TYPE_UNSPECIFIED = 447183678 @@ -122327,6 +122693,7 @@ class Status(proto.Enum): UPDATING (494614342): Reservation update is in progress. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -122507,6 +122874,7 @@ class ReservationOperationalMode(proto.Enum): RESERVATION_OPERATIONAL_MODE_UNSPECIFIED (194296603): No description available. """ + UNDEFINED_RESERVATION_OPERATIONAL_MODE = 0 ALL_CAPACITY = 500029880 HIGHLY_AVAILABLE_CAPACITY = 110861600 @@ -122583,6 +122951,7 @@ class ConsumeReservationType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_CONSUME_RESERVATION_TYPE = 0 ANY_RESERVATION = 200008121 NO_RESERVATION = 169322030 @@ -122799,6 +123168,7 @@ class Status(proto.Enum): Reservation block has allocated all its resources. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -122927,6 +123297,7 @@ class HealthStatus(proto.Enum): The health status of the reservation block is unspecified. """ + UNDEFINED_HEALTH_STATUS = 0 DEGRADED = 396890926 HEALTHY = 439801213 @@ -122979,12 +123350,12 @@ class ReservationBlockPhysicalTopology(proto.Message): number=335221242, optional=True, ) - instances: MutableSequence[ - "ReservationBlockPhysicalTopologyInstance" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29097598, - message="ReservationBlockPhysicalTopologyInstance", + instances: MutableSequence["ReservationBlockPhysicalTopologyInstance"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29097598, + message="ReservationBlockPhysicalTopologyInstance", + ) ) @@ -123333,6 +123704,7 @@ class Status(proto.Enum): Reservation subBlock has allocated all its resources. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -123469,6 +123841,7 @@ class HealthStatus(proto.Enum): The health status of the reservation subBlock is unspecified. """ + UNDEFINED_HEALTH_STATUS = 0 DEGRADED = 396890926 HEALTHY = 439801213 @@ -123670,6 +124043,7 @@ class DisruptionSchedule(proto.Enum): IMMEDIATE (152881041): All VMs will be disrupted immediately. """ + UNDEFINED_DISRUPTION_SCHEDULE = 0 DISRUPTION_SCHEDULE_UNSPECIFIED = 332543835 IMMEDIATE = 152881041 @@ -123688,6 +124062,7 @@ class FailureComponent(proto.Enum): NVLINK_SWITCH (239107153): The NVLink switch experienced the fault. """ + UNDEFINED_FAILURE_COMPONENT = 0 FAILURE_COMPONENT_UNSPECIFIED = 332003744 MULTIPLE_FAULTY_HOSTS = 423545298 @@ -123750,6 +124125,7 @@ class Behavior(proto.Enum): SWITCH_FAILURE (254909279): The subBlock experienced a switch failure. """ + UNDEFINED_BEHAVIOR = 0 FAULT_BEHAVIOR_UNSPECIFIED = 447660743 GPU_ERROR = 198817909 @@ -123808,6 +124184,7 @@ class MaintenanceScope(proto.Enum): any VMs running on them. This is not allowed for Standard ExR """ + UNDEFINED_MAINTENANCE_SCOPE = 0 ALL = 64897 MAINTENANCE_SCOPE_UNSPECIFIED = 78827328 @@ -123860,6 +124237,7 @@ class MaintenanceScope(proto.Enum): any VMs running on them. This is not allowed for Standard ExR """ + UNDEFINED_MAINTENANCE_SCOPE = 0 ALL = 64897 MAINTENANCE_SCOPE_UNSPECIFIED = 78827328 @@ -124516,6 +124894,7 @@ class Type(proto.Enum): VCPU (2628978): No description available. """ + UNDEFINED_TYPE = 0 ACCELERATOR = 429815371 LOCAL_SSD = 508934896 @@ -124693,6 +125072,7 @@ class Status(proto.Enum): READY (77848963): Resource policy is ready to be used. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -124989,6 +125369,7 @@ class AcceleratorTopologyMode(proto.Enum): demand. At the time of VM creation, the chips are not connected. """ + UNDEFINED_ACCELERATOR_TOPOLOGY_MODE = 0 AUTO_CONNECT = 491872826 PROVISION_ONLY = 399134966 @@ -125005,6 +125386,7 @@ class Collocation(proto.Enum): UNSPECIFIED_COLLOCATION (464308205): No description available. """ + UNDEFINED_COLLOCATION = 0 COLLOCATED = 103257554 UNSPECIFIED_COLLOCATION = 464308205 @@ -125410,6 +125792,7 @@ class OnSourceDiskDelete(proto.Enum): UNSPECIFIED_ON_SOURCE_DISK_DELETE (239140769): No description available. """ + UNDEFINED_ON_SOURCE_DISK_DELETE = 0 APPLY_RETENTION_POLICY = 535071332 KEEP_AUTO_SNAPSHOTS = 258925689 @@ -125531,12 +125914,12 @@ class ResourcePolicyWeeklyCycle(proto.Message): of the week. """ - day_of_weeks: MutableSequence[ - "ResourcePolicyWeeklyCycleDayOfWeek" - ] = proto.RepeatedField( - proto.MESSAGE, - number=257871834, - message="ResourcePolicyWeeklyCycleDayOfWeek", + day_of_weeks: MutableSequence["ResourcePolicyWeeklyCycleDayOfWeek"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=257871834, + message="ResourcePolicyWeeklyCycleDayOfWeek", + ) ) @@ -125596,6 +125979,7 @@ class Day(proto.Enum): WEDNESDAY (422029110): No description available. """ + UNDEFINED_DAY = 0 FRIDAY = 471398751 INVALID = 530283991 @@ -125671,6 +126055,7 @@ class AcceleratorTopologyMode(proto.Enum): demand. At the time of VM creation, the chips are not connected. """ + UNDEFINED_ACCELERATOR_TOPOLOGY_MODE = 0 AUTO_CONNECT = 491872826 PROVISION_ONLY = 399134966 @@ -125689,6 +126074,7 @@ class MaxTopologyDistance(proto.Enum): SUBBLOCK (316202573): VMs must be provisioned in the same subblock. """ + UNDEFINED_MAX_TOPOLOGY_DISTANCE = 0 BLOCK = 63294573 CLUSTER = 516333018 @@ -125708,6 +126094,7 @@ class Type(proto.Enum): MIG provisions instances as close to each other as possible for high throughput. """ + UNDEFINED_TYPE = 0 HIGH_AVAILABILITY = 409487576 HIGH_THROUGHPUT = 146499815 @@ -126075,6 +126462,7 @@ class StopState(proto.Enum): STOPPING (350791796): The instance is stopping. """ + UNDEFINED_STOP_STATE = 0 PENDING_STOP = 362509770 STOPPING = 350791796 @@ -126091,6 +126479,7 @@ class TargetState(proto.Enum): STOPPED (444276141): The instance will be stopped. """ + UNDEFINED_TARGET_STATE = 0 DELETED = 120962041 STOPPED = 444276141 @@ -126460,6 +126849,7 @@ class State(proto.Enum): WAVE_FAILED (195452995): The product failed to process the wave. """ + UNDEFINED_STATE = 0 CANCELLED = 41957681 CANCELLING = 226950512 @@ -126640,6 +127030,7 @@ class LocationScope(proto.Enum): ZONAL (85547428): Zonal scope. """ + UNDEFINED_LOCATION_SCOPE = 0 LOCATION_SCOPE_UNSPECIFIED = 416410498 REGIONAL = 92288543 @@ -126781,12 +127172,12 @@ class RolloutPlanWaveOrchestrationOptions(proto.Message): This field is a member of `oneof`_ ``_max_concurrent_resources_per_location``. """ - delays: MutableSequence[ - "RolloutPlanWaveOrchestrationOptionsDelay" - ] = proto.RepeatedField( - proto.MESSAGE, - number=275150672, - message="RolloutPlanWaveOrchestrationOptionsDelay", + delays: MutableSequence["RolloutPlanWaveOrchestrationOptionsDelay"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=275150672, + message="RolloutPlanWaveOrchestrationOptionsDelay", + ) ) max_concurrent_locations: int = proto.Field( proto.INT64, @@ -126861,6 +127252,7 @@ class Delimiter(proto.Enum): batch as soon as the previous batch of LROs is done. """ + UNDEFINED_DELIMITER = 0 DELIMITER_BATCH = 253390530 DELIMITER_LOCATION = 189398797 @@ -126891,6 +127283,7 @@ class Type(proto.Enum): batch as soon as the previous batch of LROs is done. """ + UNDEFINED_TYPE = 0 TYPE_MINIMUM = 234909673 TYPE_OFFSET = 165747000 @@ -127662,6 +128055,7 @@ class NextHopOrigin(proto.Enum): INCOMPLETE (11941214): No description available. """ + UNDEFINED_NEXT_HOP_ORIGIN = 0 EGP = 68590 IGP = 72434 @@ -127690,6 +128084,7 @@ class RouteStatus(proto.Enum): This route is being processed internally. The status will change once processed. """ + UNDEFINED_ROUTE_STATUS = 0 ACTIVE = 314733318 DROPPED = 496235424 @@ -127719,6 +128114,7 @@ class RouteType(proto.Enum): TRANSIT (187793843): No description available. """ + UNDEFINED_ROUTE_TYPE = 0 BGP = 65707 STATIC = 308331118 @@ -127915,6 +128311,7 @@ class PathSegmentType(proto.Enum): AS_SET (329846453): No description available. """ + UNDEFINED_PATH_SEGMENT_TYPE = 0 AS_CONFED_SEQUENCE = 222152624 AS_CONFED_SET = 374040307 @@ -128089,6 +128486,7 @@ class Type(proto.Enum): ROUTE_POLICY_TYPE_IMPORT (397444755): The Route Policy is an Import Policy. """ + UNDEFINED_TYPE = 0 ROUTE_POLICY_TYPE_EXPORT = 293086882 ROUTE_POLICY_TYPE_IMPORT = 397444755 @@ -128304,12 +128702,12 @@ class Router(proto.Message): number=3292052, optional=True, ) - md5_authentication_keys: MutableSequence[ - "RouterMd5AuthenticationKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=71063322, - message="RouterMd5AuthenticationKey", + md5_authentication_keys: MutableSequence["RouterMd5AuthenticationKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=71063322, + message="RouterMd5AuthenticationKey", + ) ) name: str = proto.Field( proto.STRING, @@ -128540,6 +128938,7 @@ class AdvertiseMode(proto.Enum): DEFAULT (115302945): No description available. """ + UNDEFINED_ADVERTISE_MODE = 0 CUSTOM = 388595569 DEFAULT = 115302945 @@ -128555,6 +128954,7 @@ class AdvertisedGroups(proto.Enum): Advertise all available subnets (including peer VPC subnets). """ + UNDEFINED_ADVERTISED_GROUPS = 0 ALL_SUBNETS = 3622872 @@ -128567,12 +128967,12 @@ class AdvertisedGroups(proto.Enum): proto.STRING, number=21065526, ) - advertised_ip_ranges: MutableSequence[ - "RouterAdvertisedIpRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=35449932, - message="RouterAdvertisedIpRange", + advertised_ip_ranges: MutableSequence["RouterAdvertisedIpRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=35449932, + message="RouterAdvertisedIpRange", + ) ) asn: int = proto.Field( proto.UINT32, @@ -128781,6 +129181,7 @@ class AdvertiseMode(proto.Enum): DEFAULT (115302945): No description available. """ + UNDEFINED_ADVERTISE_MODE = 0 CUSTOM = 388595569 DEFAULT = 115302945 @@ -128796,6 +129197,7 @@ class AdvertisedGroups(proto.Enum): Advertise all available subnets (including peer VPC subnets). """ + UNDEFINED_ADVERTISED_GROUPS = 0 ALL_SUBNETS = 3622872 @@ -128816,6 +129218,7 @@ class Enable(proto.Enum): TRUE (2583950): No description available. """ + UNDEFINED_ENABLE = 0 FALSE = 66658563 TRUE = 2583950 @@ -128853,6 +129256,7 @@ class ManagementType(proto.Enum): Default value, the BGP peer is manually created and managed by user. """ + UNDEFINED_MANAGEMENT_TYPE = 0 MANAGED_BY_ATTACHMENT = 458926411 MANAGED_BY_USER = 317294067 @@ -128866,12 +129270,12 @@ class ManagementType(proto.Enum): proto.STRING, number=21065526, ) - advertised_ip_ranges: MutableSequence[ - "RouterAdvertisedIpRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=35449932, - message="RouterAdvertisedIpRange", + advertised_ip_ranges: MutableSequence["RouterAdvertisedIpRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=35449932, + message="RouterAdvertisedIpRange", + ) ) advertised_route_priority: int = proto.Field( proto.UINT32, @@ -128884,12 +129288,12 @@ class ManagementType(proto.Enum): optional=True, message="RouterBgpPeerBfd", ) - custom_learned_ip_ranges: MutableSequence[ - "RouterBgpPeerCustomLearnedIpRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=481363012, - message="RouterBgpPeerCustomLearnedIpRange", + custom_learned_ip_ranges: MutableSequence["RouterBgpPeerCustomLearnedIpRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=481363012, + message="RouterBgpPeerCustomLearnedIpRange", + ) ) custom_learned_route_priority: int = proto.Field( proto.INT32, @@ -129062,6 +129466,7 @@ class SessionInitializationMode(proto.Enum): PASSIVE (462813959): No description available. """ + UNDEFINED_SESSION_INITIALIZATION_MODE = 0 ACTIVE = 314733318 DISABLED = 516696700 @@ -129236,6 +129641,7 @@ class IpVersion(proto.Enum): IPV6 (2254343): No description available. """ + UNDEFINED_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -129271,6 +129677,7 @@ class ManagementType(proto.Enum): Default value, the interface is manually created and managed by user. """ + UNDEFINED_MANAGEMENT_TYPE = 0 MANAGED_BY_ATTACHMENT = 458926411 MANAGED_BY_USER = 317294067 @@ -129658,6 +130065,7 @@ class AutoNetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_AUTO_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -129682,6 +130090,7 @@ class EndpointTypes(proto.Enum): ENDPOINT_TYPE_VM (57095474): This is the default. """ + UNDEFINED_ENDPOINT_TYPES = 0 ENDPOINT_TYPE_MANAGED_PROXY_LB = 439196930 ENDPOINT_TYPE_SWG = 159344456 @@ -129712,6 +130121,7 @@ class NatIpAllocateOption(proto.Enum): specified Nat IPs are not enough then the Nat service fails for new VMs. """ + UNDEFINED_NAT_IP_ALLOCATE_OPTION = 0 AUTO_ONLY = 182333500 MANUAL_ONLY = 261251205 @@ -129747,6 +130157,7 @@ class SourceSubnetworkIpRangesToNat(proto.Enum): A list of Subnetworks are allowed to Nat (specified in the field subnetwork below) """ + UNDEFINED_SOURCE_SUBNETWORK_IP_RANGES_TO_NAT = 0 ALL_SUBNETWORKS_ALL_IP_RANGES = 179964376 ALL_SUBNETWORKS_ALL_PRIMARY_IP_RANGES = 185573819 @@ -129783,6 +130194,7 @@ class SourceSubnetworkIpRangesToNat64(proto.Enum): If this option is used, the nat64_subnetworks field must be specified. """ + UNDEFINED_SOURCE_SUBNETWORK_IP_RANGES_TO_NAT64 = 0 ALL_IPV6_SUBNETWORKS = 341632747 LIST_OF_IPV6_SUBNETWORKS = 521079860 @@ -129801,6 +130213,7 @@ class Type(proto.Enum): NAT used for public IP translation. This is the default. """ + UNDEFINED_TYPE = 0 PRIVATE = 403485027 PUBLIC = 223389289 @@ -129854,12 +130267,12 @@ class Type(proto.Enum): number=3373707, optional=True, ) - nat64_subnetworks: MutableSequence[ - "RouterNatSubnetworkToNat64" - ] = proto.RepeatedField( - proto.MESSAGE, - number=63585701, - message="RouterNatSubnetworkToNat64", + nat64_subnetworks: MutableSequence["RouterNatSubnetworkToNat64"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=63585701, + message="RouterNatSubnetworkToNat64", + ) ) nat_ip_allocate_option: str = proto.Field( proto.STRING, @@ -129972,6 +130385,7 @@ class Filter(proto.Enum): TRANSLATIONS_ONLY (357212649): Export logs for successful connections only. """ + UNDEFINED_FILTER = 0 ALL = 64897 ERRORS_ONLY = 307484672 @@ -130143,6 +130557,7 @@ class SourceIpRangesToNat(proto.Enum): PRIMARY_IP_RANGE (297109954): The primary range is allowed to Nat. """ + UNDEFINED_SOURCE_IP_RANGES_TO_NAT = 0 ALL_IP_RANGES = 35608496 LIST_OF_SECONDARY_IP_RANGES = 192289308 @@ -130416,6 +130831,7 @@ class Status(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATUS = 0 DOWN = 2104482 UNKNOWN = 433141802 @@ -130442,6 +130858,7 @@ class StatusReason(proto.Enum): STATUS_REASON_UNSPECIFIED (394331913): No description available. """ + UNDEFINED_STATUS_REASON = 0 IPV4_PEER_ON_IPV6_ONLY_CONNECTION = 435936662 IPV6_PEER_ON_IPV4_ONLY_CONNECTION = 436304082 @@ -130621,12 +131038,12 @@ class RouterStatusNatStatus(proto.Message): number=512367468, optional=True, ) - rule_status: MutableSequence[ - "RouterStatusNatStatusNatRuleStatus" - ] = proto.RepeatedField( - proto.MESSAGE, - number=140223125, - message="RouterStatusNatStatusNatRuleStatus", + rule_status: MutableSequence["RouterStatusNatStatusNatRuleStatus"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=140223125, + message="RouterStatusNatStatusNatRuleStatus", + ) ) user_allocated_nat_ip_resources: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -131082,6 +131499,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -131100,6 +131518,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -131250,6 +131669,7 @@ class Interface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -131271,6 +131691,7 @@ class Mode(proto.Enum): virtual machine at a time can be attached to a disk in read-write mode. """ + UNDEFINED_MODE = 0 READ_ONLY = 91950261 READ_WRITE = 173607894 @@ -131291,6 +131712,7 @@ class StorageBytesStatus(proto.Enum): UP_TO_DATE (101306702): No description available. """ + UNDEFINED_STORAGE_BYTES_STATUS = 0 UPDATING = 494614342 UP_TO_DATE = 101306702 @@ -131308,6 +131730,7 @@ class Type(proto.Enum): SCRATCH (496778970): No description available. """ + UNDEFINED_TYPE = 0 PERSISTENT = 460683927 SCRATCH = 496778970 @@ -131448,6 +131871,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -131469,6 +131893,7 @@ class StorageBytesStatus(proto.Enum): UP_TO_DATE (101306702): No description available. """ + UNDEFINED_STORAGE_BYTES_STATUS = 0 UPDATING = 494614342 UP_TO_DATE = 101306702 @@ -131547,6 +131972,7 @@ class State(proto.Enum): The current autoscaling recommendation is not influenced by this scaling schedule. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DISABLED = 516696700 @@ -131718,6 +132144,7 @@ class InstanceTerminationAction(proto.Enum): Stop the VM without storing in-memory content. default action. """ + UNDEFINED_INSTANCE_TERMINATION_ACTION = 0 DELETE = 402225579 INSTANCE_TERMINATION_ACTION_UNSPECIFIED = 92954803 @@ -131755,6 +132182,7 @@ class MaintenanceInterval(proto.Enum): available. RECURRENT is used for GEN3 and Slice of Hardware VMs. """ + UNDEFINED_MAINTENANCE_INTERVAL = 0 AS_NEEDED = 500724834 PERIODIC = 142804635 @@ -131785,6 +132213,7 @@ class OnHostMaintenance(proto.Enum): restarted outside the window of maintenance events. """ + UNDEFINED_ON_HOST_MAINTENANCE = 0 MIGRATE = 165699979 TERMINATE = 527617601 @@ -131808,6 +132237,7 @@ class ProvisioningModel(proto.Enum): Standard provisioning with user controlled runtime, no discounts. """ + UNDEFINED_PROVISIONING_MODEL = 0 FLEX_START = 101746812 RESERVATION_BOUND = 293538571 @@ -131983,6 +132413,7 @@ class Operator(proto.Enum): OPERATOR_UNSPECIFIED (128892924): No description available. """ + UNDEFINED_OPERATOR = 0 IN = 2341 NOT_IN = 161144369 @@ -132457,6 +132888,7 @@ class Type(proto.Enum): FIREWALL (219901184): No description available. """ + UNDEFINED_TYPE = 0 CLOUD_ARMOR = 260640373 CLOUD_ARMOR_EDGE = 250728775 @@ -132578,12 +133010,12 @@ class Type(proto.Enum): number=3575610, optional=True, ) - user_defined_fields: MutableSequence[ - "SecurityPolicyUserDefinedField" - ] = proto.RepeatedField( - proto.MESSAGE, - number=28312739, - message="SecurityPolicyUserDefinedField", + user_defined_fields: MutableSequence["SecurityPolicyUserDefinedField"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=28312739, + message="SecurityPolicyUserDefinedField", + ) ) @@ -132706,6 +133138,7 @@ class RuleVisibility(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_RULE_VISIBILITY = 0 PREMIUM = 399530551 STANDARD = 484642493 @@ -132862,6 +133295,7 @@ class Type(proto.Enum): UNSPECIFIED_TYPE (53933922): No description available. """ + UNDEFINED_TYPE = 0 HTTP_HEADER_HOST = 374321891 HTTP_PATH = 311503228 @@ -132932,6 +133366,7 @@ class JsonParsing(proto.Enum): STANDARD_WITH_GRAPHQL (106979218): No description available. """ + UNDEFINED_JSON_PARSING = 0 DISABLED = 516696700 STANDARD = 484642493 @@ -132949,6 +133384,7 @@ class LogLevel(proto.Enum): VERBOSE (532219234): No description available. """ + UNDEFINED_LOG_LEVEL = 0 NORMAL = 161067239 VERBOSE = 532219234 @@ -133135,6 +133571,7 @@ class DdosAdaptiveProtection(proto.Enum): PREVIEW (399798184): No description available. """ + UNDEFINED_DDOS_ADAPTIVE_PROTECTION = 0 DISABLED = 516696700 ENABLED = 182130465 @@ -133154,6 +133591,7 @@ class DdosProtection(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_DDOS_PROTECTION = 0 ADVANCED = 63789090 ADVANCED_PREVIEW = 40905867 @@ -133482,6 +133920,7 @@ class Direction(proto.Enum): INGRESS (516931221): No description available. """ + UNDEFINED_DIRECTION = 0 EGRESS = 432880501 INGRESS = 516931221 @@ -133683,6 +134122,7 @@ class VersionedExpr(proto.Enum): Matches the source IP address of a request to the IP ranges supplied in config. """ + UNDEFINED_VERSIONED_EXPR = 0 FIREWALL = 219901184 SRC_IPS_V1 = 70925961 @@ -133735,12 +134175,12 @@ class SecurityPolicyRuleMatcherConfig(proto.Message): proto.STRING, number=337357713, ) - layer4_configs: MutableSequence[ - "SecurityPolicyRuleMatcherConfigLayer4Config" - ] = proto.RepeatedField( - proto.MESSAGE, - number=373534261, - message="SecurityPolicyRuleMatcherConfigLayer4Config", + layer4_configs: MutableSequence["SecurityPolicyRuleMatcherConfigLayer4Config"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=373534261, + message="SecurityPolicyRuleMatcherConfigLayer4Config", + ) ) src_ip_ranges: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -133952,12 +134392,12 @@ class SecurityPolicyRulePreconfiguredWafConfig(proto.Message): preconfigured WAF evaluation. """ - exclusions: MutableSequence[ - "SecurityPolicyRulePreconfiguredWafConfigExclusion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=208665701, - message="SecurityPolicyRulePreconfiguredWafConfigExclusion", + exclusions: MutableSequence["SecurityPolicyRulePreconfiguredWafConfigExclusion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=208665701, + message="SecurityPolicyRulePreconfiguredWafConfigExclusion", + ) ) @@ -134090,6 +134530,7 @@ class Op(proto.Enum): The operator matches if the field value starts with the specified value. """ + UNDEFINED_OP = 0 CONTAINS = 215180831 ENDS_WITH = 490402221 @@ -134298,6 +134739,7 @@ class EnforceOnKey(proto.Enum): XFF_IP (438707118): No description available. """ + UNDEFINED_ENFORCE_ON_KEY = 0 ALL = 64897 ALL_IPS = 343973966 @@ -134498,6 +134940,7 @@ class EnforceOnKeyType(proto.Enum): XFF_IP (438707118): No description available. """ + UNDEFINED_ENFORCE_ON_KEY_TYPE = 0 ALL = 64897 ALL_IPS = 343973966 @@ -134600,6 +135043,7 @@ class Type(proto.Enum): GOOGLE_RECAPTCHA (518803009): No description available. """ + UNDEFINED_TYPE = 0 EXTERNAL_302 = 395733761 GOOGLE_RECAPTCHA = 518803009 @@ -134698,6 +135142,7 @@ class Base(proto.Enum): UDP (83873): No description available. """ + UNDEFINED_BASE = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -134933,6 +135378,7 @@ class Type(proto.Enum): SERVER_BINDING_TYPE_UNSPECIFIED (180825512): No description available. """ + UNDEFINED_TYPE = 0 RESTART_NODE_ON_ANY_SERVER = 502950985 RESTART_NODE_ON_MINIMAL_SERVERS = 204166495 @@ -135184,29 +135630,30 @@ class ConnectionPreference(proto.Enum): CONNECTION_PREFERENCE_UNSPECIFIED (34590772): No description available. """ + UNDEFINED_CONNECTION_PREFERENCE = 0 ACCEPT_AUTOMATIC = 75250580 ACCEPT_MANUAL = 373061341 CONNECTION_PREFERENCE_UNSPECIFIED = 34590772 - connected_endpoints: MutableSequence[ - "ServiceAttachmentConnectedEndpoint" - ] = proto.RepeatedField( - proto.MESSAGE, - number=72223688, - message="ServiceAttachmentConnectedEndpoint", + connected_endpoints: MutableSequence["ServiceAttachmentConnectedEndpoint"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=72223688, + message="ServiceAttachmentConnectedEndpoint", + ) ) connection_preference: str = proto.Field( proto.STRING, number=285818076, optional=True, ) - consumer_accept_lists: MutableSequence[ - "ServiceAttachmentConsumerProjectLimit" - ] = proto.RepeatedField( - proto.MESSAGE, - number=402725703, - message="ServiceAttachmentConsumerProjectLimit", + consumer_accept_lists: MutableSequence["ServiceAttachmentConsumerProjectLimit"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=402725703, + message="ServiceAttachmentConsumerProjectLimit", + ) ) consumer_reject_lists: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -135455,6 +135902,7 @@ class Status(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -135661,6 +136109,7 @@ class EncapsulationProfile(proto.Enum): UNSPECIFIED_ENCAPSULATION_PROFILE (368782710): No description available. """ + UNDEFINED_ENCAPSULATION_PROFILE = 0 GENEVE_SECURITY_V1 = 374039743 UNSPECIFIED_ENCAPSULATION_PROFILE = 368782710 @@ -135682,6 +136131,7 @@ class RoutingMode(proto.Enum): UNSPECIFIED_ROUTING_MODE (126139844): No description available. """ + UNDEFINED_ROUTING_MODE = 0 PACKET_INJECTION = 321485248 STANDARD_ROUTING = 141399332 @@ -136297,6 +136747,7 @@ class State(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_STATE = 0 ABANDONED = 81797556 DONE = 2104194 @@ -141191,6 +141642,7 @@ class ShareType(proto.Enum): Shared-reservation is open to specific projects """ + UNDEFINED_SHARE_TYPE = 0 LOCAL = 72607563 ORGANIZATION = 274978099 @@ -141992,6 +142444,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -142009,6 +142462,7 @@ class SnapshotType(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_SNAPSHOT_TYPE = 0 ARCHIVE = 506752162 STANDARD = 484642493 @@ -142032,6 +142486,7 @@ class Status(proto.Enum): UPLOADING (267603489): Snapshot is being uploaded. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -142055,6 +142510,7 @@ class StorageBytesStatus(proto.Enum): UP_TO_DATE (101306702): No description available. """ + UNDEFINED_STORAGE_BYTES_STATUS = 0 UPDATING = 494614342 UP_TO_DATE = 101306702 @@ -142515,6 +142971,7 @@ class Policy(proto.Enum): Only allowlisted regions will be able to restore region scoped snapshots """ + UNDEFINED_POLICY = 0 ALL_REGIONS = 273143585 POLICY_UNSPECIFIED = 197974922 @@ -142596,6 +143053,7 @@ class Policy(proto.Enum): STORAGE_LOCATION_POLICY_UNSPECIFIED (250644592): No description available. """ + UNDEFINED_POLICY = 0 LOCAL_REGION = 403535464 NEAREST_MULTI_REGION = 212467515 @@ -142852,6 +143310,7 @@ class KeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_KEY_REVOCATION_ACTION_TYPE = 0 KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 467110106 NONE = 2402104 @@ -142872,6 +143331,7 @@ class PostKeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_POST_KEY_REVOCATION_ACTION_TYPE = 0 NOOP = 2402146 POST_KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 228738393 @@ -143092,6 +143552,7 @@ class Type(proto.Enum): TYPE_UNSPECIFIED (437714322): No description available. """ + UNDEFINED_TYPE = 0 MANAGED = 479501183 SELF_MANAGED = 434437516 @@ -143384,6 +143845,7 @@ class Status(proto.Enum): managed SslCertificate resource. For details on which domain failed, consult domain_status field. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 MANAGED_CERTIFICATE_STATUS_UNSPECIFIED = 474800850 @@ -143799,6 +144261,7 @@ class MinTlsVersion(proto.Enum): TLS_1_3 (33116737): TLS 1.3 """ + UNDEFINED_MIN_TLS_VERSION = 0 TLS_1_0 = 33116734 TLS_1_1 = 33116735 @@ -143838,6 +144301,7 @@ class Profile(proto.Enum): SSL features, intended to meet stricter compliance requirements. """ + UNDEFINED_PROFILE = 0 COMPATIBLE = 179357396 CUSTOM = 388595569 @@ -144349,29 +144813,29 @@ class StatefulPolicyPreservedState(proto.Message): network interface name. """ - disks: MutableMapping[ - str, "StatefulPolicyPreservedStateDiskDevice" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=95594102, - message="StatefulPolicyPreservedStateDiskDevice", + disks: MutableMapping[str, "StatefulPolicyPreservedStateDiskDevice"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=95594102, + message="StatefulPolicyPreservedStateDiskDevice", + ) ) - external_i_ps: MutableMapping[ - str, "StatefulPolicyPreservedStateNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=532687245, - message="StatefulPolicyPreservedStateNetworkIp", + external_i_ps: MutableMapping[str, "StatefulPolicyPreservedStateNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=532687245, + message="StatefulPolicyPreservedStateNetworkIp", + ) ) - internal_i_ps: MutableMapping[ - str, "StatefulPolicyPreservedStateNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=215731675, - message="StatefulPolicyPreservedStateNetworkIp", + internal_i_ps: MutableMapping[str, "StatefulPolicyPreservedStateNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=215731675, + message="StatefulPolicyPreservedStateNetworkIp", + ) ) @@ -144410,6 +144874,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -144457,6 +144922,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -145122,6 +145588,7 @@ class CapacityProvisioningType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_CAPACITY_PROVISIONING_TYPE = 0 class PerformanceProvisioningType(proto.Enum): @@ -145139,6 +145606,7 @@ class PerformanceProvisioningType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_PERFORMANCE_PROVISIONING_TYPE = 0 class State(proto.Enum): @@ -145165,6 +145633,7 @@ class State(proto.Enum): READY (77848963): StoragePool is ready for use. """ + UNDEFINED_STATE = 0 CREATING = 455564985 DELETING = 528602024 @@ -145450,6 +145919,7 @@ class Status(proto.Enum): Disk is currently unavailable and cannot be accessed, attached or detached. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -146622,6 +147092,7 @@ class Ipv6AccessType(proto.Enum): UNSPECIFIED_IPV6_ACCESS_TYPE (313080613): No description available. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -146650,6 +147121,7 @@ class Ipv6GceEndpoint(proto.Enum): VM_ONLY (236773428): No description available. """ + UNDEFINED_IPV6_GCE_ENDPOINT = 0 VM_AND_FR = 41830108 VM_ONLY = 236773428 @@ -146674,6 +147146,7 @@ class PrivateIpv6GoogleAccess(proto.Enum): Outbound private IPv6 access from VMs in this subnet to Google services. """ + UNDEFINED_PRIVATE_IPV6_GOOGLE_ACCESS = 0 DISABLE_GOOGLE_ACCESS = 450958579 ENABLE_BIDIRECTIONAL_ACCESS_TO_GOOGLE = 427975994 @@ -146713,6 +147186,7 @@ class Purpose(proto.Enum): Subnetwork used for Regional Envoy-based Load Balancing. """ + UNDEFINED_PURPOSE = 0 GLOBAL_MANAGED_PROXY = 236463602 INTERNAL_HTTPS_LOAD_BALANCER = 248748889 @@ -146737,6 +147211,7 @@ class ResolveSubnetMask(proto.Enum): Only the primary range of the VM NIC will respond to ARP. """ + UNDEFINED_RESOLVE_SUBNET_MASK = 0 ARP_ALL_RANGES = 445655380 ARP_PRIMARY_RANGE = 120210048 @@ -146760,6 +147235,7 @@ class Role(proto.Enum): The BACKUP subnet that could be promoted to ACTIVE. """ + UNDEFINED_ROLE = 0 ACTIVE = 314733318 BACKUP = 341010882 @@ -146789,6 +147265,7 @@ class StackType(proto.Enum): UNSPECIFIED_STACK_TYPE (298084569): No description available. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -146813,6 +147290,7 @@ class State(proto.Enum): READY (77848963): Subnetwork is ready for use. """ + UNDEFINED_STATE = 0 DRAINING = 480455402 READY = 77848963 @@ -146949,12 +147427,12 @@ class State(proto.Enum): number=3506294, optional=True, ) - secondary_ip_ranges: MutableSequence[ - "SubnetworkSecondaryRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=136658915, - message="SubnetworkSecondaryRange", + secondary_ip_ranges: MutableSequence["SubnetworkSecondaryRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=136658915, + message="SubnetworkSecondaryRange", + ) ) self_link: str = proto.Field( proto.STRING, @@ -147225,6 +147703,7 @@ class AggregationInterval(proto.Enum): INTERVAL_5_SEC (72752429): No description available. """ + UNDEFINED_AGGREGATION_INTERVAL = 0 INTERVAL_10_MIN = 487155916 INTERVAL_15_MIN = 491773521 @@ -147250,6 +147729,7 @@ class Metadata(proto.Enum): INCLUDE_ALL_METADATA (164619908): No description available. """ + UNDEFINED_METADATA = 0 CUSTOM_METADATA = 62450749 EXCLUDE_ALL_METADATA = 334519954 @@ -147658,6 +148138,7 @@ class Policy(proto.Enum): substantial imbalance in the count of clients and backends. """ + UNDEFINED_POLICY = 0 CONSISTENT_HASH_SUBSETTING = 108989492 NONE = 2402104 @@ -148039,6 +148520,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -148057,6 +148539,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -148817,6 +149300,7 @@ class QuicOverride(proto.Enum): option is implicit if no QUIC override has been specified in the request. """ + UNDEFINED_QUIC_OVERRIDE = 0 DISABLE = 241807048 ENABLE = 438835587 @@ -149164,6 +149648,7 @@ class QuicOverride(proto.Enum): option is implicit if no QUIC override has been specified in the request. """ + UNDEFINED_QUIC_OVERRIDE = 0 DISABLE = 241807048 ENABLE = 438835587 @@ -149228,6 +149713,7 @@ class TlsEarlyData(proto.Enum): security stance and mitigated the risk of replay attacks using other mechanisms. """ + UNDEFINED_TLS_EARLY_DATA = 0 DISABLED = 516696700 PERMISSIVE = 504345247 @@ -149604,6 +150090,7 @@ class NatPolicy(proto.Enum): NO_NAT (161455491): No NAT performed. """ + UNDEFINED_NAT_POLICY = 0 NO_NAT = 161455491 @@ -150034,6 +150521,7 @@ class SessionAffinity(proto.Enum): same backend VM while that VM remains healthy, as long as the cookie has not expired. """ + UNDEFINED_SESSION_AFFINITY = 0 CLIENT_IP = 345665051 CLIENT_IP_NO_DESTINATION = 106122516 @@ -150491,6 +150979,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -150618,6 +151107,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -150828,6 +151318,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -150944,6 +151435,7 @@ class LoadBalancingScheme(proto.Enum): INTERNAL_MANAGED (37350397): No description available. """ + UNDEFINED_LOAD_BALANCING_SCHEME = 0 EXTERNAL = 35607499 EXTERNAL_MANAGED = 512006923 @@ -150962,6 +151454,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -151295,6 +151788,7 @@ class Status(proto.Enum): READY (77848963): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -154311,6 +154805,7 @@ class MaintenanceReasons(proto.Enum): Maintenance due to planned update to the instance. """ + UNDEFINED_MAINTENANCE_REASONS = 0 FAILURE_DISK = 8573778 FAILURE_GPU = 467876919 @@ -154345,6 +154840,7 @@ class MaintenanceStatus(proto.Enum): Unknown maintenance status. Do not use this value. """ + UNDEFINED_MAINTENANCE_STATUS = 0 ONGOING = 473158491 PENDING = 35394935 @@ -154369,6 +154865,7 @@ class Type(proto.Enum): Unscheduled maintenance (e.g. emergency maintenance during uptime guarantee). """ + UNDEFINED_TYPE = 0 MULTIPLE = 362714640 SCHEDULED = 478400653 @@ -155207,6 +155704,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -155223,6 +155721,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 instance: str = proto.Field( @@ -157466,6 +157965,7 @@ class LoadBalancingSchemes(proto.Enum): inference is not possible, EXTERNAL will be used as the default type. """ + UNDEFINED_LOAD_BALANCING_SCHEMES = 0 EXTERNAL = 35607499 EXTERNAL_MANAGED = 512006923 @@ -157664,6 +158164,7 @@ class Ipv6AccessType(proto.Enum): addresses that are only accessible over the VPC network. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -157702,6 +158203,7 @@ class Purpose(proto.Enum): Subnetwork used for Regional Envoy-based Load Balancing. """ + UNDEFINED_PURPOSE = 0 GLOBAL_MANAGED_PROXY = 236463602 INTERNAL_HTTPS_LOAD_BALANCER = 248748889 @@ -157731,6 +158233,7 @@ class Role(proto.Enum): The BACKUP subnet that could be promoted to ACTIVE. """ + UNDEFINED_ROLE = 0 ACTIVE = 314733318 BACKUP = 341010882 @@ -157758,6 +158261,7 @@ class StackType(proto.Enum): New VMs in this subnet will only be assigned IPv6 addresses. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -157798,12 +158302,12 @@ class StackType(proto.Enum): number=3506294, optional=True, ) - secondary_ip_ranges: MutableSequence[ - "UsableSubnetworkSecondaryRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=136658915, - message="UsableSubnetworkSecondaryRange", + secondary_ip_ranges: MutableSequence["UsableSubnetworkSecondaryRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=136658915, + message="UsableSubnetworkSecondaryRange", + ) ) stack_type: str = proto.Field( proto.STRING, @@ -158442,6 +158946,7 @@ class State(proto.Enum): STATE_UNSPECIFIED (470755401): Default value. Do not use. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DELETING = 528602024 @@ -158457,13 +158962,13 @@ class State(proto.Enum): number=422937596, optional=True, ) - extension_policies: MutableMapping[ - str, "VmExtensionPolicyExtensionPolicy" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=227761488, - message="VmExtensionPolicyExtensionPolicy", + extension_policies: MutableMapping[str, "VmExtensionPolicyExtensionPolicy"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=227761488, + message="VmExtensionPolicyExtensionPolicy", + ) ) global_resource_link: str = proto.Field( proto.STRING, @@ -158475,12 +158980,12 @@ class State(proto.Enum): number=3355, optional=True, ) - instance_selectors: MutableSequence[ - "VmExtensionPolicyInstanceSelector" - ] = proto.RepeatedField( - proto.MESSAGE, - number=520298826, - message="VmExtensionPolicyInstanceSelector", + instance_selectors: MutableSequence["VmExtensionPolicyInstanceSelector"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=520298826, + message="VmExtensionPolicyInstanceSelector", + ) ) kind: str = proto.Field( proto.STRING, @@ -158910,6 +159415,7 @@ class GatewayIpVersion(proto.Enum): Every HA-VPN gateway interface is configured with an IPv6 address. """ + UNDEFINED_GATEWAY_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -158932,6 +159438,7 @@ class StackType(proto.Enum): IPV6_ONLY (79632100): Enable VPN gateway with only IPv6 protocol. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -158997,12 +159504,12 @@ class StackType(proto.Enum): number=425908881, optional=True, ) - vpn_interfaces: MutableSequence[ - "VpnGatewayVpnGatewayInterface" - ] = proto.RepeatedField( - proto.MESSAGE, - number=91842181, - message="VpnGatewayVpnGatewayInterface", + vpn_interfaces: MutableSequence["VpnGatewayVpnGatewayInterface"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=91842181, + message="VpnGatewayVpnGatewayInterface", + ) ) @@ -159172,12 +159679,12 @@ class VpnGatewayStatus(proto.Message): VpnGateway. """ - vpn_connections: MutableSequence[ - "VpnGatewayStatusVpnConnection" - ] = proto.RepeatedField( - proto.MESSAGE, - number=439334538, - message="VpnGatewayStatusVpnConnection", + vpn_connections: MutableSequence["VpnGatewayStatusVpnConnection"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=439334538, + message="VpnGatewayStatusVpnConnection", + ) ) @@ -159229,6 +159736,7 @@ class State(proto.Enum): redundancy from the Cloud VPN gateway to the peer gateway """ + UNDEFINED_STATE = 0 CONNECTION_REDUNDANCY_MET = 505242907 CONNECTION_REDUNDANCY_NOT_MET = 511863311 @@ -159245,6 +159753,7 @@ class UnsatisfiedReason(proto.Enum): INCOMPLETE_TUNNELS_COVERAGE (55917437): No description available. """ + UNDEFINED_UNSATISFIED_REASON = 0 INCOMPLETE_TUNNELS_COVERAGE = 55917437 @@ -159708,6 +160217,7 @@ class CapacityTier(proto.Enum): HIGH: A VPN tunnel which can support up to 6 Gbps. """ + UNDEFINED_CAPACITY_TIER = 0 DEFAULT = 115302945 HIGH = 2217378 @@ -159789,6 +160299,7 @@ class Status(proto.Enum): ForwardingRule and Route resources are needed to setup VPN tunnel. """ + UNDEFINED_STATUS = 0 ALLOCATING_RESOURCES = 320922816 AUTHORIZATION_ERROR = 23580290 @@ -160493,6 +161004,7 @@ class Code(proto.Enum): UNREACHABLE (13328052): A given scope cannot be reached. """ + UNDEFINED_CODE = 0 CLEANUP_FAILED = 150308440 DEPRECATED_RESOURCE_USED = 391835586 @@ -160666,6 +161178,7 @@ class Code(proto.Enum): UNREACHABLE (13328052): A given scope cannot be reached. """ + UNDEFINED_CODE = 0 CLEANUP_FAILED = 150308440 DEPRECATED_RESOURCE_USED = 391835586 @@ -161044,13 +161557,13 @@ class WireGroupEndpoint(proto.Message): - Value: an Interconnect object. """ - interconnects: MutableMapping[ - str, "WireGroupEndpointInterconnect" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=520187301, - message="WireGroupEndpointInterconnect", + interconnects: MutableMapping[str, "WireGroupEndpointInterconnect"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=520187301, + message="WireGroupEndpointInterconnect", + ) ) @@ -161281,6 +161794,7 @@ class Type(proto.Enum): A single pseudowire over two Interconnect connections with no redundancy. """ + UNDEFINED_TYPE = 0 BOX_AND_CROSS = 311344644 REDUNDANT = 3891405 @@ -161416,6 +161930,7 @@ class BandwidthAllocation(proto.Enum): bandwidth from unused or underused wires to other wires in the group. """ + UNDEFINED_BANDWIDTH_ALLOCATION = 0 ALLOCATE_PER_WIRE = 358730057 SHARED_WITH_WIRE_GROUP = 286454628 @@ -161441,6 +161956,7 @@ class FaultResponse(proto.Enum): NONE (2402104): Default. """ + UNDEFINED_FAULT_RESPONSE = 0 DISABLE_PORT = 287086488 NONE = 2402104 @@ -161682,6 +162198,7 @@ class Type(proto.Enum): XPN_RESOURCE_TYPE_UNSPECIFIED (151607034): No description available. """ + UNDEFINED_TYPE = 0 PROJECT = 408671993 XPN_RESOURCE_TYPE_UNSPECIFIED = 151607034 @@ -161771,6 +162288,7 @@ class Status(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATUS = 0 DOWN = 2104482 UP = 2715 diff --git a/packages/google-cloud-compute-v1beta/mypy.ini b/packages/google-cloud-compute-v1beta/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-compute-v1beta/mypy.ini +++ b/packages/google-cloud-compute-v1beta/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-compute-v1beta/noxfile.py b/packages/google-cloud-compute-v1beta/noxfile.py index 61015edd1168..568e329618f5 100644 --- a/packages/google-cloud-compute-v1beta/noxfile.py +++ b/packages/google-cloud-compute-v1beta/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-compute-v1beta/samples/generated_samples/compute_v1beta_generated_organization_security_policies_list_preconfigured_expression_sets_sync.py b/packages/google-cloud-compute-v1beta/samples/generated_samples/compute_v1beta_generated_organization_security_policies_list_preconfigured_expression_sets_sync.py index f2e65cc5958a..e674c39dd2ab 100644 --- a/packages/google-cloud-compute-v1beta/samples/generated_samples/compute_v1beta_generated_organization_security_policies_list_preconfigured_expression_sets_sync.py +++ b/packages/google-cloud-compute-v1beta/samples/generated_samples/compute_v1beta_generated_organization_security_policies_list_preconfigured_expression_sets_sync.py @@ -39,9 +39,7 @@ def sample_list_preconfigured_expression_sets(): client = compute_v1beta.OrganizationSecurityPoliciesClient() # Initialize request argument(s) - request = ( - compute_v1beta.ListPreconfiguredExpressionSetsOrganizationSecurityPoliciesRequest() - ) + request = compute_v1beta.ListPreconfiguredExpressionSetsOrganizationSecurityPoliciesRequest() # Make the request response = client.list_preconfigured_expression_sets(request=request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_accelerator_types.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_accelerator_types.py index fee2f79912bd..75038fc1e664 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_accelerator_types.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_accelerator_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_accelerator_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_accelerator_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_accelerator_types_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_addresses.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_addresses.py index ea0cc7be4527..f8905413a979 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_addresses.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_addresses.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -873,10 +873,9 @@ def test_addresses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -921,10 +920,9 @@ def test_addresses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_addresses_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3561,9 +3558,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_advice.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_advice.py index 6d39fc532c00..3a5a920a599e 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_advice.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_advice.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -849,10 +854,9 @@ def test_advice_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -897,10 +901,9 @@ def test_advice_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -936,10 +939,9 @@ def test_advice_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_autoscalers.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_autoscalers.py index 1b16666ad7ac..2e74a0e3adf5 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_autoscalers.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_autoscalers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_autoscalers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_autoscalers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_autoscalers_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3150,9 +3147,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_buckets.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_buckets.py index 4d0a279f9cac..c3cd7aaf3c96 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_buckets.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_buckets.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -902,10 +902,9 @@ def test_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -950,10 +949,9 @@ def test_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +987,9 @@ def test_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1171,9 +1168,9 @@ def test_add_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key(request) @@ -1377,9 +1374,9 @@ def test_add_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key_unary(request) @@ -2256,9 +2253,9 @@ def test_delete_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key(request) @@ -2484,9 +2481,9 @@ def test_delete_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key_unary(request) @@ -5041,9 +5038,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_services.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_services.py index b30bf34cd11d..5b305c073129 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_services.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_backend_services_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_backend_services_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_backend_services_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1185,9 +1182,9 @@ def test_add_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key(request) @@ -1391,9 +1388,9 @@ def test_add_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key_unary(request) @@ -2270,9 +2267,9 @@ def test_delete_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key(request) @@ -2498,9 +2495,9 @@ def test_delete_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key_unary(request) @@ -5460,9 +5457,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -5670,9 +5667,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -5880,9 +5877,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_cross_site_networks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_cross_site_networks.py index 20e3c2fdfe5b..43d1becd7ec3 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_cross_site_networks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_cross_site_networks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_cross_site_networks_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_cross_site_networks_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_cross_site_networks_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_settings_service.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_settings_service.py index 9518206ddb1d..0b749d119948 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_settings_service.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_settings_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -934,10 +934,9 @@ def test_disk_settings_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -982,10 +981,9 @@ def test_disk_settings_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1021,10 +1019,9 @@ def test_disk_settings_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_types.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_types.py index 39bb2a70ef60..c152449b572c 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_types.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -868,10 +873,9 @@ def test_disk_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -916,10 +920,9 @@ def test_disk_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +958,9 @@ def test_disk_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disks.py index c55ea4e2cb1e..ed414792a241 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -852,10 +852,9 @@ def test_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -900,10 +899,9 @@ def test_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -939,10 +937,9 @@ def test_disks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1122,9 +1119,9 @@ def test_add_resource_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies(request) @@ -1340,9 +1337,9 @@ def test_add_resource_policies_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies_unary(request) @@ -6553,9 +6550,9 @@ def test_stop_async_replication_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication(request) @@ -6763,9 +6760,9 @@ def test_stop_async_replication_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication_unary(request) @@ -7396,9 +7393,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_external_vpn_gateways.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_external_vpn_gateways.py index 75c4918d1cf9..1569ae94d510 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_external_vpn_gateways.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_external_vpn_gateways.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_external_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_external_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_external_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2863,9 +2860,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewall_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewall_policies.py index f011aa9933bd..8ae0a8c2b3ad 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewall_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewall_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_firewall_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_firewall_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_firewall_policies_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4621,9 +4618,9 @@ def test_list_associations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_associations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_associations] = ( + mock_rpc + ) request = {} client.list_associations(request) @@ -6351,9 +6348,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -6552,9 +6549,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) @@ -7746,9 +7743,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewalls.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewalls.py index ca4e89586bb0..4a3cde12d1b0 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewalls.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewalls.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -873,10 +873,9 @@ def test_firewalls_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -921,10 +920,9 @@ def test_firewalls_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_firewalls_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2784,9 +2781,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_forwarding_rules.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_forwarding_rules.py index 878594d9ffe6..20ebdbabd59e 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_forwarding_rules.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_forwarding_rules.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4051,9 +4048,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_future_reservations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_future_reservations.py index 46f5b33aeb6d..dfbf7b3e1a42 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_future_reservations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_future_reservations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_future_reservations_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_future_reservations_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_future_reservations_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_addresses.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_addresses.py index e68e3b16b19c..357a1329ad8f 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_addresses.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_addresses.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_global_addresses_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_global_addresses_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_global_addresses_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3231,9 +3228,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_forwarding_rules.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_forwarding_rules.py index dbbabc24b173..0487e757c354 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_forwarding_rules.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_forwarding_rules.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_global_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_global_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_global_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3683,9 +3680,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_network_endpoint_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_network_endpoint_groups.py index e1d065f154df..fb18d21f1298 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_network_endpoint_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_network_endpoint_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_global_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_global_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_global_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3361,9 +3358,9 @@ def test_list_network_endpoints_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_endpoints - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_endpoints] = ( + mock_rpc + ) request = {} client.list_network_endpoints(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_operations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_operations.py index 8264be7f13c2..3559a78b0472 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_operations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_global_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_global_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_global_operations_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_organization_operations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_organization_operations.py index 83063507e9a5..13309c8f8b1b 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_organization_operations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_organization_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -969,10 +974,9 @@ def test_global_organization_operations_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1021,9 @@ def test_global_organization_operations_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1056,10 +1059,9 @@ def test_global_organization_operations_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_public_delegated_prefixes.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_public_delegated_prefixes.py index 7a51edd17212..e3d7c0e6b4cc 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_public_delegated_prefixes.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_public_delegated_prefixes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -987,10 +987,9 @@ def test_global_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1034,9 @@ def test_global_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1074,10 +1072,9 @@ def test_global_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_sour "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_vm_extension_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_vm_extension_policies.py index 75a8cd3d9513..64639ea0e5ce 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_vm_extension_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_vm_extension_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -950,10 +950,9 @@ def test_global_vm_extension_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +997,9 @@ def test_global_vm_extension_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1035,9 @@ def test_global_vm_extension_policies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_health_checks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_health_checks.py index e4384e336929..d94bffa56826 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_health_checks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_health_checks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -885,10 +885,9 @@ def test_health_checks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -933,10 +932,9 @@ def test_health_checks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_health_checks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3062,9 +3059,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_image_family_views.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_image_family_views.py index ed1d235cfc41..7e0b5956a22c 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_image_family_views.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_image_family_views.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -909,10 +914,9 @@ def test_image_family_views_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +961,9 @@ def test_image_family_views_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -996,10 +999,9 @@ def test_image_family_views_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_images.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_images.py index fb0b9a52b69f..167ac34f6523 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_images.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_images.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -856,10 +856,9 @@ def test_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -904,10 +903,9 @@ def test_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -943,10 +941,9 @@ def test_images_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4172,9 +4169,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_manager_resize_requests.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_manager_resize_requests.py index c622445cc1f2..072a7f08bbe1 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_manager_resize_requests.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_manager_resize_requests.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -997,10 +997,9 @@ def test_instance_group_manager_resize_requests_client_get_mtls_endpoint_and_cer client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1044,9 @@ def test_instance_group_manager_resize_requests_client_get_mtls_endpoint_and_cer client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1084,10 +1082,9 @@ def test_instance_group_manager_resize_requests_client_get_mtls_endpoint_and_cer "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_managers.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_managers.py index ce0fc032fa22..43198f8e2a49 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_managers.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_managers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_instance_group_managers_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_instance_group_managers_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_instance_group_managers_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1213,9 +1210,9 @@ def test_abandon_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances(request) @@ -1432,9 +1429,9 @@ def test_abandon_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances_unary(request) @@ -2369,9 +2366,9 @@ def test_create_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances(request) @@ -2588,9 +2585,9 @@ def test_create_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances_unary(request) @@ -3225,9 +3222,9 @@ def test_delete_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances(request) @@ -3444,9 +3441,9 @@ def test_delete_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances_unary(request) @@ -5520,9 +5517,9 @@ def test_list_managed_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_managed_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_managed_instances] = ( + mock_rpc + ) request = {} client.list_managed_instances(request) @@ -7017,9 +7014,9 @@ def test_recreate_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances(request) @@ -7238,9 +7235,9 @@ def test_recreate_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances_unary(request) @@ -8359,9 +8356,9 @@ def test_resume_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances(request) @@ -8578,9 +8575,9 @@ def test_resume_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances_unary(request) @@ -9260,9 +9257,9 @@ def test_set_instance_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template(request) @@ -9482,9 +9479,9 @@ def test_set_instance_template_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template_unary(request) @@ -9701,9 +9698,9 @@ def test_set_target_pools_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools(request) @@ -9920,9 +9917,9 @@ def test_set_target_pools_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools_unary(request) @@ -11007,9 +11004,9 @@ def test_suspend_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances(request) @@ -11226,9 +11223,9 @@ def test_suspend_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances_unary(request) @@ -11447,9 +11444,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_groups.py index f00b2680e3b4..0f8de64231fc 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -902,10 +902,9 @@ def test_instance_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -950,10 +949,9 @@ def test_instance_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +987,9 @@ def test_instance_groups_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3440,10 +3437,10 @@ def test_list_instances_rest_pager(transport: str = "rest"): "zone": "sample2", "instance_group": "sample3", } - sample_request[ - "instance_groups_list_instances_request_resource" - ] = compute.InstanceGroupsListInstancesRequest( - instance_state="instance_state_value" + sample_request["instance_groups_list_instances_request_resource"] = ( + compute.InstanceGroupsListInstancesRequest( + instance_state="instance_state_value" + ) ) pager = client.list_instances(request=sample_request) @@ -3478,9 +3475,9 @@ def test_remove_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_instances] = ( + mock_rpc + ) request = {} client.remove_instances(request) @@ -3697,9 +3694,9 @@ def test_remove_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_instances] = ( + mock_rpc + ) request = {} client.remove_instances_unary(request) @@ -4352,9 +4349,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_settings_service.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_settings_service.py index f6e9e5173dcb..f1c5c4518517 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_settings_service.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_settings_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -940,10 +940,9 @@ def test_instance_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +987,9 @@ def test_instance_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1025,9 @@ def test_instance_settings_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_templates.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_templates.py index 716274added0..c3a0775d91c2 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_templates.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_templates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,22 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.compute_v1beta.services.instance_templates import ( InstanceTemplatesClient, @@ -926,10 +926,9 @@ def test_instance_templates_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -974,10 +973,9 @@ def test_instance_templates_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1013,10 +1011,9 @@ def test_instance_templates_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3118,9 +3115,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instances.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instances.py index 060066f1a40a..97801806a702 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instances.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instances.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,22 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.compute_v1beta.services.instances import ( InstancesClient, @@ -874,10 +874,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -922,10 +921,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -961,10 +959,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1141,9 +1138,9 @@ def test_add_access_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_access_config] = ( + mock_rpc + ) request = {} client.add_access_config(request) @@ -1385,9 +1382,9 @@ def test_add_access_config_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_access_config] = ( + mock_rpc + ) request = {} client.add_access_config_unary(request) @@ -1632,9 +1629,9 @@ def test_add_network_interface_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_network_interface - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_network_interface] = ( + mock_rpc + ) request = {} client.add_network_interface(request) @@ -1858,9 +1855,9 @@ def test_add_network_interface_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_network_interface - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_network_interface] = ( + mock_rpc + ) request = {} client.add_network_interface_unary(request) @@ -2084,9 +2081,9 @@ def test_add_resource_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies(request) @@ -2306,9 +2303,9 @@ def test_add_resource_policies_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies_unary(request) @@ -4100,9 +4097,9 @@ def test_delete_access_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_access_config] = ( + mock_rpc + ) request = {} client.delete_access_config(request) @@ -4354,9 +4351,9 @@ def test_delete_access_config_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_access_config] = ( + mock_rpc + ) request = {} client.delete_access_config_unary(request) @@ -5990,9 +5987,9 @@ def test_get_guest_attributes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_guest_attributes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_guest_attributes] = ( + mock_rpc + ) request = {} client.get_guest_attributes(request) @@ -6414,9 +6411,9 @@ def test_get_partner_metadata_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_partner_metadata - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_partner_metadata] = ( + mock_rpc + ) request = {} client.get_partner_metadata(request) @@ -6827,9 +6824,9 @@ def test_get_serial_port_output_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serial_port_output - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serial_port_output] = ( + mock_rpc + ) request = {} client.get_serial_port_output(request) @@ -8462,9 +8459,9 @@ def test_patch_partner_metadata_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_partner_metadata - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_partner_metadata] = ( + mock_rpc + ) request = {} client.patch_partner_metadata(request) @@ -8684,9 +8681,9 @@ def test_patch_partner_metadata_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_partner_metadata - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_partner_metadata] = ( + mock_rpc + ) request = {} client.patch_partner_metadata_unary(request) @@ -8905,9 +8902,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -9118,9 +9115,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -9776,9 +9773,9 @@ def test_report_host_as_faulty_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_host_as_faulty - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_host_as_faulty] = ( + mock_rpc + ) request = {} client.report_host_as_faulty(request) @@ -9998,9 +9995,9 @@ def test_report_host_as_faulty_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_host_as_faulty - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_host_as_faulty] = ( + mock_rpc + ) request = {} client.report_host_as_faulty_unary(request) @@ -11709,9 +11706,9 @@ def test_set_disk_auto_delete_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_disk_auto_delete - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_disk_auto_delete] = ( + mock_rpc + ) request = {} client.set_disk_auto_delete(request) @@ -11963,9 +11960,9 @@ def test_set_disk_auto_delete_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_disk_auto_delete - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_disk_auto_delete] = ( + mock_rpc + ) request = {} client.set_disk_auto_delete_unary(request) @@ -12861,9 +12858,9 @@ def test_set_machine_resources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_resources] = ( + mock_rpc + ) request = {} client.set_machine_resources(request) @@ -13083,9 +13080,9 @@ def test_set_machine_resources_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_resources] = ( + mock_rpc + ) request = {} client.set_machine_resources_unary(request) @@ -13302,9 +13299,9 @@ def test_set_machine_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_type] = ( + mock_rpc + ) request = {} client.set_machine_type(request) @@ -13521,9 +13518,9 @@ def test_set_machine_type_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_type] = ( + mock_rpc + ) request = {} client.set_machine_type_unary(request) @@ -14168,9 +14165,9 @@ def test_set_min_cpu_platform_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_min_cpu_platform - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_min_cpu_platform] = ( + mock_rpc + ) request = {} client.set_min_cpu_platform(request) @@ -14389,9 +14386,9 @@ def test_set_min_cpu_platform_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_min_cpu_platform - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_min_cpu_platform] = ( + mock_rpc + ) request = {} client.set_min_cpu_platform_unary(request) @@ -15468,9 +15465,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -15689,9 +15686,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -15910,9 +15907,9 @@ def test_set_service_account_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_service_account] = ( + mock_rpc + ) request = {} client.set_service_account(request) @@ -16131,9 +16128,9 @@ def test_set_service_account_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_service_account] = ( + mock_rpc + ) request = {} client.set_service_account_unary(request) @@ -19890,9 +19887,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -20567,9 +20564,9 @@ def test_update_access_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_access_config] = ( + mock_rpc + ) request = {} client.update_access_config(request) @@ -20813,9 +20810,9 @@ def test_update_access_config_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_access_config] = ( + mock_rpc + ) request = {} client.update_access_config_unary(request) @@ -21060,9 +21057,9 @@ def test_update_display_device_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_display_device - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_display_device] = ( + mock_rpc + ) request = {} client.update_display_device(request) @@ -21278,9 +21275,9 @@ def test_update_display_device_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_display_device - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_display_device] = ( + mock_rpc + ) request = {} client.update_display_device_unary(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instant_snapshots.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instant_snapshots.py index bbc1cd418df5..0c94f7039080 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instant_snapshots.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instant_snapshots.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_instant_snapshots_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_instant_snapshots_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_instant_snapshots_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3615,9 +3612,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachment_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachment_groups.py index a0b4624793a7..74b9cb16c21d 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachment_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachment_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -976,10 +976,9 @@ def test_interconnect_attachment_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1023,9 @@ def test_interconnect_attachment_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1061,9 @@ def test_interconnect_attachment_groups_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1298,9 +1295,9 @@ def test_delete_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -1504,9 +1501,9 @@ def test_delete_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -1706,9 +1703,9 @@ def test_get_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -2065,9 +2062,9 @@ def test_get_operational_status_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_operational_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_operational_status] = ( + mock_rpc + ) request = {} client.get_operational_status(request) @@ -2105,9 +2102,9 @@ def test_get_operational_status_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -2998,9 +2995,9 @@ def test_patch_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -3230,9 +3227,9 @@ def test_patch_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -3622,9 +3619,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachments.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachments.py index c1622261df4a..7f8d79155cad 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachments.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_interconnect_attachments_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_interconnect_attachments_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_interconnect_attachments_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3701,9 +3698,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_groups.py index b10c0537b302..5ede3b3f3932 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_interconnect_groups_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_interconnect_groups_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_interconnect_groups_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2400,9 +2397,9 @@ def test_get_operational_status_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_operational_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_operational_status] = ( + mock_rpc + ) request = {} client.get_operational_status(request) @@ -3952,9 +3949,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_locations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_locations.py index ab4a8f499923..eb96c74240d7 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_locations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_locations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -930,10 +935,9 @@ def test_interconnect_locations_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -978,10 +982,9 @@ def test_interconnect_locations_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1020,9 @@ def test_interconnect_locations_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_remote_locations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_remote_locations.py index 37f31775babc..921c1a6c8d95 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_remote_locations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_remote_locations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -967,10 +972,9 @@ def test_interconnect_remote_locations_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1019,9 @@ def test_interconnect_remote_locations_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1054,10 +1057,9 @@ def test_interconnect_remote_locations_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1283,9 +1285,9 @@ def test_get_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectRemoteLocation" - ] = "interconnect_remote_location_value" + jsonified_request["interconnectRemoteLocation"] = ( + "interconnect_remote_location_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnects.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnects.py index ecedc5e68258..9a0228fbc653 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnects.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnects.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -898,10 +898,9 @@ def test_interconnects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +945,9 @@ def test_interconnects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +983,9 @@ def test_interconnects_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1941,9 +1938,9 @@ def test_get_macsec_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_macsec_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_macsec_config] = ( + mock_rpc + ) request = {} client.get_macsec_config(request) @@ -3593,9 +3590,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_license_codes.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_license_codes.py index 6a47722b07fc..fa07eb410708 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_license_codes.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_license_codes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +882,9 @@ def test_license_codes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +929,9 @@ def test_license_codes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +967,9 @@ def test_license_codes_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1336,9 +1338,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_licenses.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_licenses.py index 28bf7233db62..a14a3130ab45 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_licenses.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_licenses.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -870,10 +870,9 @@ def test_licenses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -918,10 +917,9 @@ def test_licenses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +955,9 @@ def test_licenses_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2813,9 +2810,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_images.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_images.py index fc6b4ec33121..c2b052af115f 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_images.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_images.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,22 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.compute_v1beta.services.machine_images import ( MachineImagesClient, @@ -899,10 +899,9 @@ def test_machine_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -947,10 +946,9 @@ def test_machine_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +984,9 @@ def test_machine_images_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3228,9 +3225,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_types.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_types.py index fba67b51c627..11105f345663 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_types.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -878,10 +883,9 @@ def test_machine_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -926,10 +930,9 @@ def test_machine_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +968,9 @@ def test_machine_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_attachments.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_attachments.py index 1047ce28a088..7987dfdd357c 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_attachments.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_attachments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_network_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_network_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_network_attachments_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3661,9 +3658,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_edge_security_services.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_edge_security_services.py index eb2422b8e510..22e78f9b494e 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_edge_security_services.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_edge_security_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_network_edge_security_services_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_network_edge_security_services_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_network_edge_security_services_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1576,9 +1573,9 @@ def test_delete_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -1790,9 +1787,9 @@ def test_delete_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -2000,9 +1997,9 @@ def test_get_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -2644,9 +2641,9 @@ def test_patch_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -2878,9 +2875,9 @@ def test_patch_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_endpoint_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_endpoint_groups.py index f436c424552a..ed5f3fc906bd 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_endpoint_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_endpoint_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3700,9 +3697,9 @@ def test_list_network_endpoints_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_endpoints - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_endpoints] = ( + mock_rpc + ) request = {} client.list_network_endpoints(request) @@ -3982,16 +3979,16 @@ def test_list_network_endpoints_rest_pager(transport: str = "rest"): "zone": "sample2", "network_endpoint_group": "sample3", } - sample_request[ - "network_endpoint_groups_list_endpoints_request_resource" - ] = compute.NetworkEndpointGroupsListEndpointsRequest( - endpoint_filters=[ - compute.NetworkEndpointGroupsListEndpointsRequestNetworkEndpointFilter( - network_endpoint=compute.NetworkEndpoint( - annotations={"key_value": "value_value"} + sample_request["network_endpoint_groups_list_endpoints_request_resource"] = ( + compute.NetworkEndpointGroupsListEndpointsRequest( + endpoint_filters=[ + compute.NetworkEndpointGroupsListEndpointsRequestNetworkEndpointFilter( + network_endpoint=compute.NetworkEndpoint( + annotations={"key_value": "value_value"} + ) ) - ) - ] + ] + ) ) pager = client.list_network_endpoints(request=sample_request) @@ -4030,9 +4027,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_firewall_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_firewall_policies.py index 1a356e2fcf4e..e6b9b73a5ab0 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_firewall_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_firewall_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_network_firewall_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_network_firewall_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_network_firewall_policies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -6572,9 +6569,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -6784,9 +6781,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) @@ -8040,9 +8037,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_profiles.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_profiles.py index 2d2727807528..f2b2deb3a16a 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_profiles.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_profiles.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -909,10 +914,9 @@ def test_network_profiles_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +961,9 @@ def test_network_profiles_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -996,10 +999,9 @@ def test_network_profiles_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_networks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_networks.py index 58eb0c99ffb4..a60ad1270cf6 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_networks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_networks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -870,10 +870,9 @@ def test_networks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -918,10 +917,9 @@ def test_networks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +955,9 @@ def test_networks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3404,9 +3401,9 @@ def test_list_peering_routes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_peering_routes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_peering_routes] = ( + mock_rpc + ) request = {} client.list_peering_routes(request) @@ -4500,9 +4497,9 @@ def test_request_remove_peering_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.request_remove_peering - ] = mock_rpc + client._transport._wrapped_methods[client._transport.request_remove_peering] = ( + mock_rpc + ) request = {} client.request_remove_peering(request) @@ -4711,9 +4708,9 @@ def test_request_remove_peering_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.request_remove_peering - ] = mock_rpc + client._transport._wrapped_methods[client._transport.request_remove_peering] = ( + mock_rpc + ) request = {} client.request_remove_peering_unary(request) @@ -4922,9 +4919,9 @@ def test_switch_to_custom_mode_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switch_to_custom_mode - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switch_to_custom_mode] = ( + mock_rpc + ) request = {} client.switch_to_custom_mode(request) @@ -5125,9 +5122,9 @@ def test_switch_to_custom_mode_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switch_to_custom_mode - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switch_to_custom_mode] = ( + mock_rpc + ) request = {} client.switch_to_custom_mode_unary(request) @@ -5327,9 +5324,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_groups.py index 7deda36dffba..10a2089c566b 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +877,9 @@ def test_node_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +924,9 @@ def test_node_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +962,9 @@ def test_node_groups_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4548,9 +4545,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -4769,9 +4766,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -5199,9 +5196,9 @@ def test_set_node_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_node_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_node_template] = ( + mock_rpc + ) request = {} client.set_node_template(request) @@ -5418,9 +5415,9 @@ def test_set_node_template_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_node_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_node_template] = ( + mock_rpc + ) request = {} client.set_node_template_unary(request) @@ -6083,9 +6080,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_templates.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_templates.py index b8c1a66d9185..88e25fa0b2cc 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_templates.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_templates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -898,10 +898,9 @@ def test_node_templates_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +945,9 @@ def test_node_templates_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +983,9 @@ def test_node_templates_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3157,9 +3154,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_types.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_types.py index 7645a420c574..d1110570af81 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_types.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -868,10 +873,9 @@ def test_node_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -916,10 +920,9 @@ def test_node_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +958,9 @@ def test_node_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_organization_security_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_organization_security_policies.py index 85f0f48ec955..4f90c09b14e6 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_organization_security_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_organization_security_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -976,10 +976,9 @@ def test_organization_security_policies_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1023,9 @@ def test_organization_security_policies_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1061,9 @@ def test_organization_security_policies_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3879,9 +3876,9 @@ def test_list_associations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_associations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_associations] = ( + mock_rpc + ) request = {} client.list_associations(request) @@ -5210,9 +5207,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -5411,9 +5408,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_packet_mirrorings.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_packet_mirrorings.py index 009d6a206cbb..0cd320263265 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_packet_mirrorings.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_packet_mirrorings.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_packet_mirrorings_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_packet_mirrorings_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_packet_mirrorings_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3213,9 +3210,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_preview_features.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_preview_features.py index fb88498ce90f..7fce90e1f598 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_preview_features.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_preview_features.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_preview_features_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_preview_features_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_preview_features_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_projects.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_projects.py index cec41ccc6088..429c920cfbab 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_projects.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_projects.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -870,10 +870,9 @@ def test_projects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -918,10 +917,9 @@ def test_projects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +955,9 @@ def test_projects_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1137,9 +1134,9 @@ def test_disable_xpn_host_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_host - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_host] = ( + mock_rpc + ) request = {} client.disable_xpn_host(request) @@ -1323,9 +1320,9 @@ def test_disable_xpn_host_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_host - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_host] = ( + mock_rpc + ) request = {} client.disable_xpn_host_unary(request) @@ -1511,9 +1508,9 @@ def test_disable_xpn_resource_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_resource] = ( + mock_rpc + ) request = {} client.disable_xpn_resource(request) @@ -1714,9 +1711,9 @@ def test_disable_xpn_resource_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_resource] = ( + mock_rpc + ) request = {} client.disable_xpn_resource_unary(request) @@ -2283,9 +2280,9 @@ def test_enable_xpn_resource_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_xpn_resource] = ( + mock_rpc + ) request = {} client.enable_xpn_resource(request) @@ -2486,9 +2483,9 @@ def test_enable_xpn_resource_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_xpn_resource] = ( + mock_rpc + ) request = {} client.enable_xpn_resource_unary(request) @@ -3038,9 +3035,9 @@ def test_get_xpn_resources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_xpn_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_xpn_resources] = ( + mock_rpc + ) request = {} client.get_xpn_resources(request) @@ -3538,9 +3535,9 @@ def test_list_xpn_hosts_rest_pager(transport: str = "rest"): req.side_effect = return_values sample_request = {"project": "sample1"} - sample_request[ - "projects_list_xpn_hosts_request_resource" - ] = compute.ProjectsListXpnHostsRequest(organization="organization_value") + sample_request["projects_list_xpn_hosts_request_resource"] = ( + compute.ProjectsListXpnHostsRequest(organization="organization_value") + ) pager = client.list_xpn_hosts(request=sample_request) @@ -4366,9 +4363,9 @@ def test_set_cloud_armor_tier_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_cloud_armor_tier - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_cloud_armor_tier] = ( + mock_rpc + ) request = {} client.set_cloud_armor_tier(request) @@ -4569,9 +4566,9 @@ def test_set_cloud_armor_tier_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_cloud_armor_tier - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_cloud_armor_tier] = ( + mock_rpc + ) request = {} client.set_cloud_armor_tier_unary(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_advertised_prefixes.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_advertised_prefixes.py index fabf3be5a0ee..e4e0bf66fcdc 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_advertised_prefixes.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_advertised_prefixes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -945,10 +945,9 @@ def test_public_advertised_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +992,9 @@ def test_public_advertised_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1030,9 @@ def test_public_advertised_prefixes_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_delegated_prefixes.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_delegated_prefixes.py index a893596f5f52..66199becb623 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_delegated_prefixes.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_delegated_prefixes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_autoscalers.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_autoscalers.py index 5449ae093b4e..357a96bae4ca 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_autoscalers.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_autoscalers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_region_autoscalers_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_region_autoscalers_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_region_autoscalers_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2929,9 +2926,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_buckets.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_buckets.py index 4430aa571f10..5acdd4b993f9 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_buckets.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_buckets.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_region_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_region_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_region_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3656,9 +3653,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_services.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_services.py index f1ddb1a78d1a..f29510d9b771 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_services.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_region_backend_services_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_region_backend_services_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_region_backend_services_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3849,9 +3846,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -4070,9 +4067,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -4291,9 +4288,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_commitments.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_commitments.py index aa2b3eb1696a..356f1c1f9a2d 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_commitments.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_commitments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_region_commitments_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_region_commitments_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_region_commitments_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2349,9 +2346,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3014,9 +3011,9 @@ def test_update_reservations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_reservations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_reservations] = ( + mock_rpc + ) request = {} client.update_reservations(request) @@ -3247,9 +3244,9 @@ def test_update_reservations_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_reservations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_reservations] = ( + mock_rpc + ) request = {} client.update_reservations_unary(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_composite_health_checks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_composite_health_checks.py index d83730f5bdf5..f163e3d0e958 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_composite_health_checks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_composite_health_checks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_region_composite_health_checks_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_region_composite_health_checks_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_region_composite_health_checks_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3270,9 +3267,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_settings.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_settings.py index 78a1fdadc03c..1f4c0231dd08 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_settings.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_settings.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -928,10 +928,9 @@ def test_region_disk_settings_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -976,10 +975,9 @@ def test_region_disk_settings_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1013,9 @@ def test_region_disk_settings_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_types.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_types.py index 7a007d4d76cd..faf6d91fa594 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_types.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -909,10 +914,9 @@ def test_region_disk_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +961,9 @@ def test_region_disk_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -996,10 +999,9 @@ def test_region_disk_types_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disks.py index fe39fce6c717..b7d3a7d85eb8 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_region_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_region_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_region_disks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1151,9 +1148,9 @@ def test_add_resource_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies(request) @@ -1369,9 +1366,9 @@ def test_add_resource_policies_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies_unary(request) @@ -5859,9 +5856,9 @@ def test_stop_async_replication_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication(request) @@ -6069,9 +6066,9 @@ def test_stop_async_replication_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication_unary(request) @@ -6702,9 +6699,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_aggregation_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_aggregation_policies.py index 7bdc794921ef..54e8cfd69160 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_aggregation_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_aggregation_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -998,10 +998,9 @@ def test_region_health_aggregation_policies_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1045,9 @@ def test_region_health_aggregation_policies_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1083,9 @@ def test_region_health_aggregation_policies_client_get_mtls_endpoint_and_cert_so "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3315,9 +3312,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_check_services.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_check_services.py index fec6735237be..1400d0b6653f 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_check_services.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_check_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -950,10 +950,9 @@ def test_region_health_check_services_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +997,9 @@ def test_region_health_check_services_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1035,9 @@ def test_region_health_check_services_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2968,9 +2965,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_checks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_checks.py index fa812199b73b..58f481743852 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_checks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_checks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_region_health_checks_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_region_health_checks_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_region_health_checks_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2919,9 +2916,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_sources.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_sources.py index c86ee6ceaa61..b4a6805299ee 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_sources.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_sources.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_region_health_sources_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_region_health_sources_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_region_health_sources_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3225,9 +3222,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_manager_resize_requests.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_manager_resize_requests.py index 426e9f464b49..f75eefcec778 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_manager_resize_requests.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_manager_resize_requests.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -186,10 +186,13 @@ def test__read_environment_variables(): == "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`" ) else: - assert RegionInstanceGroupManagerResizeRequestsClient._read_environment_variables() == ( - False, - "auto", - None, + assert ( + RegionInstanceGroupManagerResizeRequestsClient._read_environment_variables() + == ( + False, + "auto", + None, + ) ) with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): @@ -995,10 +998,9 @@ def test_region_instance_group_manager_resize_requests_client_get_mtls_endpoint_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1045,9 @@ def test_region_instance_group_manager_resize_requests_client_get_mtls_endpoint_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1083,9 @@ def test_region_instance_group_manager_resize_requests_client_get_mtls_endpoint_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_managers.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_managers.py index 1e921d18ee59..23531050a412 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_managers.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_managers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_region_instance_group_managers_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_region_instance_group_managers_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_region_instance_group_managers_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1252,9 +1249,9 @@ def test_abandon_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances(request) @@ -1471,9 +1468,9 @@ def test_abandon_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances_unary(request) @@ -2564,9 +2561,9 @@ def test_create_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances(request) @@ -2783,9 +2780,9 @@ def test_create_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances_unary(request) @@ -3420,9 +3417,9 @@ def test_delete_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances(request) @@ -3639,9 +3636,9 @@ def test_delete_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances_unary(request) @@ -5500,9 +5497,9 @@ def test_list_managed_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_managed_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_managed_instances] = ( + mock_rpc + ) request = {} client.list_managed_instances(request) @@ -6999,9 +6996,9 @@ def test_recreate_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances(request) @@ -7220,9 +7217,9 @@ def test_recreate_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances_unary(request) @@ -8341,9 +8338,9 @@ def test_resume_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances(request) @@ -8560,9 +8557,9 @@ def test_resume_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances_unary(request) @@ -9242,9 +9239,9 @@ def test_set_instance_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template(request) @@ -9464,9 +9461,9 @@ def test_set_instance_template_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template_unary(request) @@ -9683,9 +9680,9 @@ def test_set_target_pools_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools(request) @@ -9902,9 +9899,9 @@ def test_set_target_pools_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools_unary(request) @@ -10989,9 +10986,9 @@ def test_suspend_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances(request) @@ -11208,9 +11205,9 @@ def test_suspend_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances_unary(request) @@ -11429,9 +11426,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_groups.py index a7af0d38ad5c..2d3e74adfae5 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_region_instance_groups_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_region_instance_groups_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_region_instance_groups_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1946,10 +1943,10 @@ def test_list_instances_rest_pager(transport: str = "rest"): "region": "sample2", "instance_group": "sample3", } - sample_request[ - "region_instance_groups_list_instances_request_resource" - ] = compute.RegionInstanceGroupsListInstancesRequest( - instance_state="instance_state_value" + sample_request["region_instance_groups_list_instances_request_resource"] = ( + compute.RegionInstanceGroupsListInstancesRequest( + instance_state="instance_state_value" + ) ) pager = client.list_instances(request=sample_request) @@ -2420,9 +2417,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_templates.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_templates.py index e749e60f9b29..c83be5c51f6c 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_templates.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_templates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,22 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.compute_v1beta.services.region_instance_templates import ( RegionInstanceTemplatesClient, @@ -942,10 +942,9 @@ def test_region_instance_templates_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -990,10 +989,9 @@ def test_region_instance_templates_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1029,10 +1027,9 @@ def test_region_instance_templates_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instances.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instances.py index cefd662149f8..9e3548aad687 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instances.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instances.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,22 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.compute_v1beta.services.region_instances import ( RegionInstancesClient, @@ -916,10 +916,9 @@ def test_region_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_region_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_region_instances_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instant_snapshots.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instant_snapshots.py index 07894d94499c..83cee81fe39b 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instant_snapshots.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instant_snapshots.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_instant_snapshots_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_instant_snapshots_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_instant_snapshots_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3371,9 +3368,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_mig_members.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_mig_members.py index 46ac736eb9a5..04269ef89f77 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_mig_members.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_mig_members.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -932,10 +937,9 @@ def test_region_multi_mig_members_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -980,10 +984,9 @@ def test_region_multi_mig_members_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1022,9 @@ def test_region_multi_mig_members_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_migs.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_migs.py index 7a5940838e04..a41e5de9cc4b 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_migs.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_migs.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_region_multi_migs_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_region_multi_migs_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_region_multi_migs_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_endpoint_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_endpoint_groups.py index 05f738f66c58..44f12c0124fb 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_endpoint_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_endpoint_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_region_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_region_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_region_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3463,9 +3460,9 @@ def test_list_network_endpoints_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_endpoints - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_endpoints] = ( + mock_rpc + ) request = {} client.list_network_endpoints(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_firewall_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_firewall_policies.py index 1189f8a24ee8..75ec9f1ca887 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_firewall_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_firewall_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -987,10 +987,9 @@ def test_region_network_firewall_policies_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1034,9 @@ def test_region_network_firewall_policies_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1074,10 +1072,9 @@ def test_region_network_firewall_policies_client_get_mtls_endpoint_and_cert_sour "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -5230,9 +5227,9 @@ def test_patch_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_association] = ( + mock_rpc + ) request = {} client.patch_association(request) @@ -5449,9 +5446,9 @@ def test_patch_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_association] = ( + mock_rpc + ) request = {} client.patch_association_unary(request) @@ -6124,9 +6121,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -6347,9 +6344,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) @@ -7219,9 +7216,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_policies.py index 4ca2b765d9a7..8f8ef668a391 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_region_network_policies_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_region_network_policies_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_region_network_policies_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -5052,9 +5049,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -5275,9 +5272,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_notification_endpoints.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_notification_endpoints.py index 2b3d5553046a..ac8f54fc4022 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_notification_endpoints.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_notification_endpoints.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_region_notification_endpoints_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_region_notification_endpoints_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_region_notification_endpoints_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2558,9 +2555,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_operations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_operations.py index 8c9a8012e5bb..d3f27b1a775f 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_operations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_region_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_region_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_region_operations_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_security_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_security_policies.py index 3b92c7a5ddba..9bc8f78e0377 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_security_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_security_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_security_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_security_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_security_policies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshot_settings.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshot_settings.py index 2692d8edbfa1..3ab5a89317c0 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshot_settings.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshot_settings.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -940,10 +940,9 @@ def test_region_snapshot_settings_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +987,9 @@ def test_region_snapshot_settings_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1025,9 @@ def test_region_snapshot_settings_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshots.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshots.py index 7ee950e64151..26a11472c901 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshots.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshots.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_region_snapshots_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_region_snapshots_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_region_snapshots_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3323,9 +3320,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_certificates.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_certificates.py index 3fd73f5926af..4eeba306a70e 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_certificates.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_certificates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_region_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_region_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_region_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2517,9 +2514,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_policies.py index 8c36f9065e24..f7d104be4b69 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_region_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_region_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_region_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3144,9 +3141,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_http_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_http_proxies.py index ad812d4c6adc..a98f1c7c6d1d 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_http_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_http_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_target_http_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_target_http_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_target_http_proxies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2947,9 +2944,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_https_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_https_proxies.py index e52b1396da3b..300e6cc9637a 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_https_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_https_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -945,10 +945,9 @@ def test_region_target_https_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +992,9 @@ def test_region_target_https_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1030,9 @@ def test_region_target_https_proxies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2961,9 +2958,9 @@ def test_set_ssl_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates(request) @@ -3182,9 +3179,9 @@ def test_set_ssl_certificates_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates_unary(request) @@ -3829,9 +3826,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_tcp_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_tcp_proxies.py index 3b659b5f8b73..541537a24495 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_tcp_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_tcp_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2521,9 +2518,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_url_maps.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_url_maps.py index fbeefa132cc3..2a00a27aa13d 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_url_maps.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_url_maps.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -898,10 +898,9 @@ def test_region_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +945,9 @@ def test_region_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +983,9 @@ def test_region_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2192,9 +2189,9 @@ def test_invalidate_cache_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.invalidate_cache - ] = mock_rpc + client._transport._wrapped_methods[client._transport.invalidate_cache] = ( + mock_rpc + ) request = {} client.invalidate_cache(request) @@ -2411,9 +2408,9 @@ def test_invalidate_cache_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.invalidate_cache - ] = mock_rpc + client._transport._wrapped_methods[client._transport.invalidate_cache] = ( + mock_rpc + ) request = {} client.invalidate_cache_unary(request) @@ -3333,9 +3330,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_zones.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_zones.py index 2b8526d1c005..ed8ad6033219 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_zones.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_zones.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -874,10 +879,9 @@ def test_region_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -922,10 +926,9 @@ def test_region_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -961,10 +964,9 @@ def test_region_zones_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_regions.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_regions.py index 81585b6204fb..dd12d316d83a 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_regions.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_regions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -854,10 +859,9 @@ def test_regions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -902,10 +906,9 @@ def test_regions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -941,10 +944,9 @@ def test_regions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_blocks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_blocks.py index 42677f4079dd..95ba9e7a5765 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_blocks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_blocks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_reservation_blocks_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_reservation_blocks_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_reservation_blocks_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1909,9 +1906,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -2138,9 +2135,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -2586,9 +2583,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_sub_blocks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_sub_blocks.py index e1b3a4767824..99c183c97ac5 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_sub_blocks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_sub_blocks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_reservation_sub_blocks_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_reservation_sub_blocks_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_reservation_sub_blocks_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1925,9 +1922,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -2146,9 +2143,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -3036,9 +3033,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservations.py index c69cf1b5e0ac..c67c5a742ece 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -885,10 +885,9 @@ def test_reservations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -933,10 +932,9 @@ def test_reservations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_reservations_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2939,9 +2936,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -3160,9 +3157,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -4024,9 +4021,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_resource_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_resource_policies.py index bb8ed456e03a..a8c4a2d2b926 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_resource_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_resource_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_resource_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_resource_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_resource_policies_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3633,9 +3630,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollout_plans.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollout_plans.py index 9581812e042c..58ca1ad5b6d7 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollout_plans.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollout_plans.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -885,10 +885,9 @@ def test_rollout_plans_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -933,10 +932,9 @@ def test_rollout_plans_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_rollout_plans_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollouts.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollouts.py index 3a4fd7972994..69ec370681fd 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollouts.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollouts.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -870,10 +870,9 @@ def test_rollouts_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -918,10 +917,9 @@ def test_rollouts_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +955,9 @@ def test_rollouts_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routers.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routers.py index 48bad35aff1d..978ef431e357 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routers.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -861,10 +861,9 @@ def test_routers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -909,10 +908,9 @@ def test_routers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -948,10 +946,9 @@ def test_routers_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1817,9 +1814,9 @@ def test_delete_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_route_policy] = ( + mock_rpc + ) request = {} client.delete_route_policy(request) @@ -2040,9 +2037,9 @@ def test_delete_route_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_route_policy] = ( + mock_rpc + ) request = {} client.delete_route_policy_unary(request) @@ -2669,9 +2666,9 @@ def test_get_nat_mapping_info_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_nat_mapping_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_nat_mapping_info] = ( + mock_rpc + ) request = {} client.get_nat_mapping_info(request) @@ -2959,9 +2956,9 @@ def test_get_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_route_policy] = ( + mock_rpc + ) request = {} client.get_route_policy(request) @@ -3166,9 +3163,9 @@ def test_get_router_status_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_router_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_router_status] = ( + mock_rpc + ) request = {} client.get_router_status(request) @@ -4346,9 +4343,9 @@ def test_list_route_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_route_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_route_policies] = ( + mock_rpc + ) request = {} client.list_route_policies(request) @@ -5066,9 +5063,9 @@ def test_patch_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_route_policy] = ( + mock_rpc + ) request = {} client.patch_route_policy(request) @@ -5283,9 +5280,9 @@ def test_patch_route_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_route_policy] = ( + mock_rpc + ) request = {} client.patch_route_policy_unary(request) @@ -5709,9 +5706,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -6354,9 +6351,9 @@ def test_update_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_route_policy] = ( + mock_rpc + ) request = {} client.update_route_policy(request) @@ -6571,9 +6568,9 @@ def test_update_route_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_route_policy] = ( + mock_rpc + ) request = {} client.update_route_policy_unary(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routes.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routes.py index 96324ba33de7..ba1489ce7787 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routes.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -856,10 +856,9 @@ def test_routes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -904,10 +903,9 @@ def test_routes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -943,10 +941,9 @@ def test_routes_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2356,9 +2353,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_security_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_security_policies.py index a1743da861df..d06fe4ba305f 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_security_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_security_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_security_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_security_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_security_policies_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -5251,9 +5248,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_service_attachments.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_service_attachments.py index 0ea004ddec4b..dd1cf3792d70 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_service_attachments.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_service_attachments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_service_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_service_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_service_attachments_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3663,9 +3660,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshot_settings_service.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshot_settings_service.py index a4343b5aaa92..e13c56f156ce 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshot_settings_service.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshot_settings_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -940,10 +940,9 @@ def test_snapshot_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +987,9 @@ def test_snapshot_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1025,9 @@ def test_snapshot_settings_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshots.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshots.py index e4617d909e31..2e4e606c4d33 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshots.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshots.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -873,10 +873,9 @@ def test_snapshots_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -921,10 +920,9 @@ def test_snapshots_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_snapshots_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3441,9 +3438,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_certificates.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_certificates.py index 58442aa792a7..9367b354b754 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_certificates.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_certificates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2701,9 +2698,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_policies.py index d47ada4a6d9f..9cdb7e630b98 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3274,9 +3271,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pool_types.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pool_types.py index dec7ae916fac..0920616bf4fe 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pool_types.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pool_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_storage_pool_types_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_storage_pool_types_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_storage_pool_types_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pools.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pools.py index 7979815c9a99..ee2db0572678 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pools.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -885,10 +885,9 @@ def test_storage_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -933,10 +932,9 @@ def test_storage_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_storage_pools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3428,9 +3425,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_subnetworks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_subnetworks.py index 7261239777d7..6fb8bcdedb5b 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_subnetworks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_subnetworks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_subnetworks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_subnetworks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_subnetworks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1844,9 +1841,9 @@ def test_expand_ip_cidr_range_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.expand_ip_cidr_range - ] = mock_rpc + client._transport._wrapped_methods[client._transport.expand_ip_cidr_range] = ( + mock_rpc + ) request = {} client.expand_ip_cidr_range(request) @@ -2065,9 +2062,9 @@ def test_expand_ip_cidr_range_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.expand_ip_cidr_range - ] = mock_rpc + client._transport._wrapped_methods[client._transport.expand_ip_cidr_range] = ( + mock_rpc + ) request = {} client.expand_ip_cidr_range_unary(request) @@ -4746,9 +4743,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_grpc_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_grpc_proxies.py index 459b45e4d93a..ffbab66820d2 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_grpc_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_grpc_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_target_grpc_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_target_grpc_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_target_grpc_proxies_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2847,9 +2844,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_http_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_http_proxies.py index 15cad0b7a260..a922a06ad3c4 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_http_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_http_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_target_http_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_target_http_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_target_http_proxies_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3529,9 +3526,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_https_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_https_proxies.py index 054ebe507d8b..dba49681c75f 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_https_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_https_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_target_https_proxies_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_target_https_proxies_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_target_https_proxies_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3133,9 +3130,9 @@ def test_set_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map(request) @@ -3343,9 +3340,9 @@ def test_set_certificate_map_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map_unary(request) @@ -3551,9 +3548,9 @@ def test_set_quic_override_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_quic_override - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_quic_override] = ( + mock_rpc + ) request = {} client.set_quic_override(request) @@ -3759,9 +3756,9 @@ def test_set_quic_override_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_quic_override - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_quic_override] = ( + mock_rpc + ) request = {} client.set_quic_override_unary(request) @@ -3969,9 +3966,9 @@ def test_set_ssl_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates(request) @@ -4179,9 +4176,9 @@ def test_set_ssl_certificates_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates_unary(request) @@ -5205,9 +5202,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_instances.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_instances.py index e7fd4ae19767..ed55ee7df528 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_instances.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_instances.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_target_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_target_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_target_instances_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2759,9 +2756,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -2980,9 +2977,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -3201,9 +3198,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_pools.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_pools.py index 2af9d01c711b..e0043387f549 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_pools.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_pools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_target_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_target_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_target_pools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1148,9 +1145,9 @@ def test_add_health_check_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_health_check] = ( + mock_rpc + ) request = {} client.add_health_check(request) @@ -1371,9 +1368,9 @@ def test_add_health_check_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_health_check] = ( + mock_rpc + ) request = {} client.add_health_check_unary(request) @@ -3805,9 +3802,9 @@ def test_remove_health_check_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_health_check] = ( + mock_rpc + ) request = {} client.remove_health_check(request) @@ -4030,9 +4027,9 @@ def test_remove_health_check_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_health_check] = ( + mock_rpc + ) request = {} client.remove_health_check_unary(request) @@ -5135,9 +5132,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -5356,9 +5353,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -5577,9 +5574,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_ssl_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_ssl_proxies.py index 5e4dd2a37bbf..d29e79a1a615 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_ssl_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_ssl_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_target_ssl_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_target_ssl_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_target_ssl_proxies_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2429,9 +2426,9 @@ def test_set_backend_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service(request) @@ -2639,9 +2636,9 @@ def test_set_backend_service_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service_unary(request) @@ -2849,9 +2846,9 @@ def test_set_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map(request) @@ -3059,9 +3056,9 @@ def test_set_certificate_map_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map_unary(request) @@ -3267,9 +3264,9 @@ def test_set_proxy_header_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header(request) @@ -3475,9 +3472,9 @@ def test_set_proxy_header_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header_unary(request) @@ -3685,9 +3682,9 @@ def test_set_ssl_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates(request) @@ -3895,9 +3892,9 @@ def test_set_ssl_certificates_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates_unary(request) @@ -4517,9 +4514,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_tcp_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_tcp_proxies.py index 686297f4bedd..70c8759b6133 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_tcp_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_tcp_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2707,9 +2704,9 @@ def test_set_backend_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service(request) @@ -2917,9 +2914,9 @@ def test_set_backend_service_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service_unary(request) @@ -3125,9 +3122,9 @@ def test_set_proxy_header_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header(request) @@ -3333,9 +3330,9 @@ def test_set_proxy_header_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header_unary(request) @@ -3543,9 +3540,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_vpn_gateways.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_vpn_gateways.py index 1655b55698f5..0c34c4292d12 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_vpn_gateways.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_vpn_gateways.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_target_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_target_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_target_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3211,9 +3208,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_url_maps.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_url_maps.py index 674223d40341..9fbcd440d3cc 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_url_maps.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_url_maps.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -863,10 +863,9 @@ def test_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -911,10 +910,9 @@ def test_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -950,10 +948,9 @@ def test_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2379,9 +2376,9 @@ def test_invalidate_cache_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.invalidate_cache - ] = mock_rpc + client._transport._wrapped_methods[client._transport.invalidate_cache] = ( + mock_rpc + ) request = {} client.invalidate_cache(request) @@ -2587,9 +2584,9 @@ def test_invalidate_cache_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.invalidate_cache - ] = mock_rpc + client._transport._wrapped_methods[client._transport.invalidate_cache] = ( + mock_rpc + ) request = {} client.invalidate_cache_unary(request) @@ -3463,9 +3460,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_gateways.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_gateways.py index eefe66a14186..497d714a35c5 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_gateways.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_gateways.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3359,9 +3356,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_tunnels.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_tunnels.py index 7dbd80410f76..50dca491bcab 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_tunnels.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_tunnels.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +877,9 @@ def test_vpn_tunnels_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +924,9 @@ def test_vpn_tunnels_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +962,9 @@ def test_vpn_tunnels_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3137,9 +3134,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_wire_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_wire_groups.py index c3c084ac4773..52746f0223ae 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_wire_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_wire_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +877,9 @@ def test_wire_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +924,9 @@ def test_wire_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +962,9 @@ def test_wire_groups_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_operations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_operations.py index 69f2befe803b..a5839928489d 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_operations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -895,10 +900,9 @@ def test_zone_operations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -943,10 +947,9 @@ def test_zone_operations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -982,10 +985,9 @@ def test_zone_operations_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_vm_extension_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_vm_extension_policies.py index c192c9c9b480..8fface38a827 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_vm_extension_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_vm_extension_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_zone_vm_extension_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_zone_vm_extension_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_zone_vm_extension_policies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zones.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zones.py index 67a74224e27d..d77e95b52019 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zones.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zones.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -845,10 +850,9 @@ def test_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -893,10 +897,9 @@ def test_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -932,10 +935,9 @@ def test_zones_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/__init__.py index f36bd1b3720e..053330a21760 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.accelerator_types import AcceleratorTypesClient from .services.addresses import AddressesClient from .services.advice import AdviceClient diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/client.py index 4efc79fa6b32..2693fa6aadd5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class AcceleratorTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AcceleratorTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AcceleratorTypesTransport]] _transport_registry["rest"] = AcceleratorTypesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AcceleratorTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AcceleratorTypesClient._read_environment_variables() + ) self._client_cert_source = AcceleratorTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AcceleratorTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/pagers.py index bdce91a4cd77..22ed1805e24c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/base.py index f6d0bff66ad5..5a237533c71f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/rest.py index 9fde99b99837..d4116ddd5c35 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -397,9 +397,7 @@ def __call__( """ - http_options = ( - _BaseAcceleratorTypesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseAcceleratorTypesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseAcceleratorTypesRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/client.py index 0e995b6477d0..2a3434ae32ba 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AddressesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AddressesClient._read_environment_variables() + ) self._client_cert_source = AddressesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AddressesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/pagers.py index 912b26e31dcd..dc05f47bb312 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/base.py index 198be0e9b075..656b6a975d70 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/rest.py index 2bd1d7a002f1..7fcc08029e68 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/client.py index 7a241de31a5b..0477f4fba81c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -594,11 +594,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AdviceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AdviceClient._read_environment_variables() + ) self._client_cert_source = AdviceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -633,8 +631,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AdviceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/base.py index 47a4ce059f41..305db5503fd5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/rest.py index a1735b379fb7..a4259b154351 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/client.py index 867e5e2d7ab0..dd8ddfef7bc1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutoscalersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutoscalersClient._read_environment_variables() + ) self._client_cert_source = AutoscalersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutoscalersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/pagers.py index 5b0dac4c351c..e1b36ad16334 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/base.py index 63f707f8a6a8..cebae1db8825 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/rest.py index 4d7685d4095b..9f9fd8d01124 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1652,9 +1652,7 @@ def __call__( """ - http_options = ( - _BaseAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/client.py index a1364b742b55..826f2d618f20 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class BackendBucketsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BackendBucketsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BackendBucketsTransport]] _transport_registry["rest"] = BackendBucketsRestTransport def get_transport_class( @@ -600,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BackendBucketsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BackendBucketsClient._read_environment_variables() + ) self._client_cert_source = BackendBucketsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -639,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BackendBucketsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/pagers.py index 18c3f8e9591e..8b5f62591182 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/base.py index b15ec48f04a8..e70ad86cd15d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/rest.py index 6fb5f867f740..a831f4a9445a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -919,9 +919,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseAddSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseAddSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_add_signed_url_key( request, metadata @@ -1276,9 +1274,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseDeleteSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseDeleteSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_delete_signed_url_key( request, metadata @@ -2336,9 +2332,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_edge_security_policy( request, metadata @@ -2716,9 +2710,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/client.py index 90a1bf2ba01d..02a162df0a42 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class BackendServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BackendServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BackendServicesTransport]] _transport_registry["rest"] = BackendServicesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BackendServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BackendServicesClient._read_environment_variables() + ) self._client_cert_source = BackendServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BackendServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/pagers.py index 2ac4f9c3798b..8251a1d17d34 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/base.py index 33a9a77d3f5e..f72b1ae45be9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/rest.py index f2983ded1503..60d2c63f2df6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1212,9 +1212,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseAddSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseAddSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_add_signed_url_key( request, metadata @@ -1367,9 +1365,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseBackendServicesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1722,9 +1718,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseDeleteSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseDeleteSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_delete_signed_url_key( request, metadata @@ -2040,9 +2034,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseGetEffectiveSecurityPolicies._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseGetEffectiveSecurityPolicies._get_http_options() request, metadata = self._interceptor.pre_get_effective_security_policies( request, metadata @@ -2108,11 +2100,10 @@ def __call__( resp = self._interceptor.post_get_effective_security_policies(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_effective_security_policies_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_effective_security_policies_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3267,9 +3258,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_edge_security_policy( request, metadata @@ -3678,9 +3667,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_security_policy( request, metadata @@ -3833,9 +3820,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -4166,7 +4151,9 @@ def get_effective_security_policies( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetEffectiveSecurityPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._GetEffectiveSecurityPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_health( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/client.py index ddcc5e328022..73d44749454b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class CrossSiteNetworksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CrossSiteNetworksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CrossSiteNetworksTransport]] _transport_registry["rest"] = CrossSiteNetworksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CrossSiteNetworksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CrossSiteNetworksClient._read_environment_variables() + ) self._client_cert_source = CrossSiteNetworksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CrossSiteNetworksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/pagers.py index 7cd02370a015..2a348324df6e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/base.py index f591e25213e5..301c6ba7c1a9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/rest.py index 5c9ba7df4cf6..90a050711d82 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/client.py index 2375d136a601..d3133253acda 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DiskTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DiskTypesClient._read_environment_variables() + ) self._client_cert_source = DiskTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DiskTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/pagers.py index d18374dccb1b..70ce6acc1cb7 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/base.py index 7936e2b4cf29..7929a00d5c6c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/rest.py index 06650c0f9611..84d5809031a1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/client.py index cd1505602447..eb91a41652c2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DisksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DisksClient._read_environment_variables() + ) self._client_cert_source = DisksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DisksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/pagers.py index 9e4fa70e1484..421cb6f79618 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/base.py index e19c01b26681..80ee7c27b3c7 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/rest.py index 9b9cec1d87ae..016b26cbee57 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -4152,9 +4152,7 @@ def __call__( """ - http_options = ( - _BaseDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() - ) + http_options = _BaseDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_stop_group_async_replication( request, metadata @@ -4664,7 +4662,9 @@ def remove_resource_policies( ) -> Callable[[compute.RemoveResourcePoliciesDiskRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RemoveResourcePolicies(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveResourcePolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def resize(self) -> Callable[[compute.ResizeDiskRequest], compute.Operation]: @@ -4708,7 +4708,9 @@ def stop_group_async_replication( ) -> Callable[[compute.StopGroupAsyncReplicationDiskRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._StopGroupAsyncReplication(self._session, self._host, self._interceptor) # type: ignore + return self._StopGroupAsyncReplication( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/client.py index ec30cc3cd43a..35bdbed63343 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class ExternalVpnGatewaysClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ExternalVpnGatewaysTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ExternalVpnGatewaysTransport]] _transport_registry["rest"] = ExternalVpnGatewaysRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ExternalVpnGatewaysClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ExternalVpnGatewaysClient._read_environment_variables() + ) self._client_cert_source = ExternalVpnGatewaysClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ExternalVpnGatewaysTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/pagers.py index 9741d377178c..b2ab547473bf 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/__init__.py index 9300bfbc4bb0..0fe624e4ec94 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ExternalVpnGatewaysRestInterceptor, ExternalVpnGatewaysRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ExternalVpnGatewaysTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ExternalVpnGatewaysTransport]] _transport_registry["rest"] = ExternalVpnGatewaysRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/base.py index 5694ff46ca73..c7e32fb5c0b6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/rest.py index ff9e29fdde16..ad4b36265c9d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1413,9 +1413,7 @@ def __call__( """ - http_options = ( - _BaseExternalVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseExternalVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/client.py index d2740a98a294..9092004305fa 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class FirewallPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[FirewallPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[FirewallPoliciesTransport]] _transport_registry["rest"] = FirewallPoliciesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FirewallPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FirewallPoliciesClient._read_environment_variables() + ) self._client_cert_source = FirewallPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FirewallPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/pagers.py index f9b1b546bc80..f56624d74261 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/base.py index c44ed8c8fc4f..22dd71a5f0c3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_organization_operations @@ -430,9 +430,9 @@ def _global_organization_operations_client( transport=self.kind, ) ) - self._extended_operations_services[ - "global_organization_operations" - ] = ex_op_service + self._extended_operations_services["global_organization_operations"] = ( + ex_op_service + ) return ex_op_service diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/rest.py index 3737dcf89019..e506049ed9b5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1251,9 +1251,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseFirewallPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -2088,9 +2086,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseFirewallPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2943,9 +2939,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseListAssociations._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseListAssociations._get_http_options() request, metadata = self._interceptor.pre_list_associations( request, metadata @@ -3662,9 +3656,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -4212,9 +4204,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/client.py index 7fd5dac22a26..13f8ccaa05b8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FirewallsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FirewallsClient._read_environment_variables() + ) self._client_cert_source = FirewallsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FirewallsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/pagers.py index eacfbc3492b2..6103d21c9d5f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/base.py index 24d9a9888b86..fa325f22000b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/rest.py index d2d5e01f1274..6a5b5842a9d3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/client.py index 1cb687f87dc1..ab63696b0966 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class ForwardingRulesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ForwardingRulesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ForwardingRulesTransport]] _transport_registry["rest"] = ForwardingRulesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ForwardingRulesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ForwardingRulesClient._read_environment_variables() + ) self._client_cert_source = ForwardingRulesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ForwardingRulesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/pagers.py index 36a1023f0329..0454878eb5b9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/base.py index ecec596ffd38..429cedec9c76 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/rest.py index a3921a320e82..b48d42da923f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -665,9 +665,7 @@ def __call__( """ - http_options = ( - _BaseForwardingRulesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseForwardingRulesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseForwardingRulesRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/client.py index 3131615020a7..5fb00c1df7d2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class FutureReservationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[FutureReservationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[FutureReservationsTransport]] _transport_registry["rest"] = FutureReservationsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FutureReservationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FutureReservationsClient._read_environment_variables() + ) self._client_cert_source = FutureReservationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FutureReservationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/pagers.py index 0d67f0dbd095..a5bca68fca43 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/__init__.py index 17942ee90dd8..619aabbfdb22 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import FutureReservationsRestInterceptor, FutureReservationsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[FutureReservationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[FutureReservationsTransport]] _transport_registry["rest"] = FutureReservationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/base.py index 4c3f78d1d5bc..a8ad7bf155d5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/rest.py index 54ee5157f77b..8e2368460985 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -619,9 +619,7 @@ def __call__( """ - http_options = ( - _BaseFutureReservationsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseFutureReservationsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseFutureReservationsRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/client.py index d87bdd29d92b..51926816216d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class GlobalAddressesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalAddressesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalAddressesTransport]] _transport_registry["rest"] = GlobalAddressesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalAddressesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalAddressesClient._read_environment_variables() + ) self._client_cert_source = GlobalAddressesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalAddressesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/pagers.py index 3d6598395d1f..79d95f806d7f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/base.py index e9d3e956ce5c..eaeb3f037ab4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/rest.py index 5882212eb4f3..7691473488e4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1640,9 +1640,7 @@ def __call__( """ - http_options = ( - _BaseGlobalAddressesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseGlobalAddressesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/client.py index 122b3e8ab289..91eeaa3c5b2a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class GlobalForwardingRulesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalForwardingRulesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalForwardingRulesTransport]] _transport_registry["rest"] = GlobalForwardingRulesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalForwardingRulesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalForwardingRulesClient._read_environment_variables() + ) self._client_cert_source = GlobalForwardingRulesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalForwardingRulesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/pagers.py index d92eaf416bfc..a3e194295fa6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/__init__.py index 3854f4dcea54..fc066edab114 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalForwardingRulesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalForwardingRulesTransport]] _transport_registry["rest"] = GlobalForwardingRulesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/base.py index cdb2ac26ba9a..5765e75e8dd4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/rest.py index eda07d88ac71..f735e60db1bc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1487,9 +1487,7 @@ def __call__( """ - http_options = ( - _BaseGlobalForwardingRulesRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseGlobalForwardingRulesRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseGlobalForwardingRulesRestTransport._BaseSetLabels._get_transcoded_request( @@ -1668,9 +1666,7 @@ def __call__( """ - http_options = ( - _BaseGlobalForwardingRulesRestTransport._BaseSetTarget._get_http_options() - ) + http_options = _BaseGlobalForwardingRulesRestTransport._BaseSetTarget._get_http_options() request, metadata = self._interceptor.pre_set_target(request, metadata) transcoded_request = _BaseGlobalForwardingRulesRestTransport._BaseSetTarget._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/client.py index 963c08e6e2f1..46f7c8b39b2b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class GlobalNetworkEndpointGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] _transport_registry["rest"] = GlobalNetworkEndpointGroupsRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalNetworkEndpointGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalNetworkEndpointGroupsClient._read_environment_variables() + ) self._client_cert_source = ( GlobalNetworkEndpointGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalNetworkEndpointGroupsTransport, transport) self._api_endpoint = self._transport.host @@ -839,9 +834,7 @@ def sample_attach_network_endpoints(): global_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_attach_endpoints_request_resource = ( - global_network_endpoint_groups_attach_endpoints_request_resource - ) + request.global_network_endpoint_groups_attach_endpoints_request_resource = global_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -990,9 +983,7 @@ def sample_attach_network_endpoints(): global_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_attach_endpoints_request_resource = ( - global_network_endpoint_groups_attach_endpoints_request_resource - ) + request.global_network_endpoint_groups_attach_endpoints_request_resource = global_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1445,9 +1436,7 @@ def sample_detach_network_endpoints(): global_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_detach_endpoints_request_resource = ( - global_network_endpoint_groups_detach_endpoints_request_resource - ) + request.global_network_endpoint_groups_detach_endpoints_request_resource = global_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1596,9 +1585,7 @@ def sample_detach_network_endpoints(): global_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_detach_endpoints_request_resource = ( - global_network_endpoint_groups_detach_endpoints_request_resource - ) + request.global_network_endpoint_groups_detach_endpoints_request_resource = global_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/pagers.py index 299fc99577f8..b92056d86bed 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/__init__.py index 99b13497ddba..cefb9a8a2787 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] _transport_registry["rest"] = GlobalNetworkEndpointGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/base.py index f22fba3f940b..06dc088fa11a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/rest.py index 887a85c4452f..2c54683d3c70 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -660,9 +660,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_attach_network_endpoints( request, metadata @@ -842,9 +840,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDelete._get_transcoded_request( @@ -1020,9 +1016,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_detach_network_endpoints( request, metadata @@ -1183,9 +1177,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseGet._get_transcoded_request( @@ -1357,9 +1349,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseInsert._get_transcoded_request( @@ -1509,9 +1499,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseList._get_transcoded_request( @@ -1656,9 +1644,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_list_network_endpoints( request, metadata @@ -1761,7 +1747,9 @@ def attach_network_endpoints( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AttachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._AttachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete( @@ -1780,7 +1768,9 @@ def detach_network_endpoints( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DetachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._DetachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/client.py index 739685a85f9c..7484a8c4c8a8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class GlobalOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalOperationsTransport]] _transport_registry["rest"] = GlobalOperationsRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalOperationsClient._read_environment_variables() + ) self._client_cert_source = GlobalOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/pagers.py index 957ce6fb43de..de5bd1bc0054 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/base.py index f8fee31318b0..c2b6ec289041 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/rest.py index 84b5806d1161..46c3317b179c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -505,9 +505,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOperationsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseGlobalOperationsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseGlobalOperationsRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/client.py index 7fd9e487f1c0..56a6462bd1e8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class GlobalOrganizationOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] _transport_registry["rest"] = GlobalOrganizationOperationsRestTransport def get_transport_class( @@ -609,11 +607,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalOrganizationOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalOrganizationOperationsClient._read_environment_variables() + ) self._client_cert_source = ( GlobalOrganizationOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -652,8 +648,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalOrganizationOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/pagers.py index 5e65399b5dc3..44fbd215a0d5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/__init__.py index 2a15d17dfe0e..b015c2aa78f3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] _transport_registry["rest"] = GlobalOrganizationOperationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/base.py index 847cf6b43006..f60e158bf125 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/rest.py index e345f0a1dd29..42bfcad1a76c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -402,9 +402,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOrganizationOperationsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseGlobalOrganizationOperationsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseGlobalOrganizationOperationsRestTransport._BaseDelete._get_transcoded_request( @@ -581,9 +579,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOrganizationOperationsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseGlobalOrganizationOperationsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseGlobalOrganizationOperationsRestTransport._BaseGet._get_transcoded_request( @@ -728,9 +724,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOrganizationOperationsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseGlobalOrganizationOperationsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseGlobalOrganizationOperationsRestTransport._BaseList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/client.py index 740ec0147edd..2211d3abf809 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class GlobalPublicDelegatedPrefixesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] _transport_registry["rest"] = GlobalPublicDelegatedPrefixesRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalPublicDelegatedPrefixesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalPublicDelegatedPrefixesClient._read_environment_variables() + ) self._client_cert_source = ( GlobalPublicDelegatedPrefixesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -657,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalPublicDelegatedPrefixesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/pagers.py index b944c1685e0f..5b8ad3e13fbb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/__init__.py index c9b6bd28dec3..f096c6964246 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] _transport_registry["rest"] = GlobalPublicDelegatedPrefixesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/base.py index ab5c867c3b7e..c1f827e77b9a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/rest.py index 7fca32032c00..789dbb33205a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -540,9 +540,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseDelete._get_transcoded_request( @@ -696,9 +694,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseGet._get_transcoded_request( @@ -870,9 +866,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseInsert._get_transcoded_request( @@ -1022,9 +1016,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseList._get_transcoded_request( @@ -1198,9 +1190,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BasePatch._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/client.py index 0740200e3cfe..f1eb9fc4a6c1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = HealthChecksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + HealthChecksClient._read_environment_variables() + ) self._client_cert_source = HealthChecksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(HealthChecksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/pagers.py index 5e5defd255c0..277fd1e1bbcd 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/base.py index 11024b353923..ebdcd1b339a2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/rest.py index 380802062805..82fdbcc8c562 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1670,9 +1670,7 @@ def __call__( """ - http_options = ( - _BaseHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/client.py index dc2e276cc692..235af04fdce8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -75,9 +75,7 @@ class ImageFamilyViewsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ImageFamilyViewsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ImageFamilyViewsTransport]] _transport_registry["rest"] = ImageFamilyViewsRestTransport def get_transport_class( @@ -598,11 +596,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ImageFamilyViewsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ImageFamilyViewsClient._read_environment_variables() + ) self._client_cert_source = ImageFamilyViewsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +633,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ImageFamilyViewsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/base.py index 1d26cbf9229b..c90c4774be5e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/rest.py index 445dac58645a..e73b0ab62eb4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/client.py index 546a52aa6f0f..82b297d79eed 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ImagesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ImagesClient._read_environment_variables() + ) self._client_cert_source = ImagesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ImagesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/pagers.py index d635cb3f28f2..e496be3eca79 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/base.py index b96b1d294e67..b286307402e3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/rest.py index b893107a4ad0..aaaa71892cd4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/client.py index 0f881d9bc24b..70f9edd3615e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -84,9 +84,7 @@ class InstanceGroupManagerResizeRequestsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] _transport_registry["rest"] = InstanceGroupManagerResizeRequestsRestTransport def get_transport_class( @@ -619,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceGroupManagerResizeRequestsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceGroupManagerResizeRequestsClient._read_environment_variables() + ) self._client_cert_source = ( InstanceGroupManagerResizeRequestsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -664,8 +660,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast( InstanceGroupManagerResizeRequestsTransport, transport diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/pagers.py index 1880e0352a7e..ebfc55756b42 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/__init__.py index 909be688fd9c..f8e449424b53 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] _transport_registry["rest"] = InstanceGroupManagerResizeRequestsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/base.py index 2f1eef1b3952..0abc67600b3a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/rest.py index a06e714b687f..55dbff6e2e9c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -544,9 +544,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_http_options() request, metadata = self._interceptor.pre_cancel(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_transcoded_request( @@ -721,9 +719,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_transcoded_request( @@ -878,9 +874,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_transcoded_request( @@ -1056,9 +1050,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_transcoded_request( @@ -1210,9 +1202,7 @@ def __call__( [Output Only] A list of resize requests. """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/client.py index 3229016cdb1d..9d7c540c59e2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class InstanceGroupManagersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceGroupManagersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagersTransport]] _transport_registry["rest"] = InstanceGroupManagersRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceGroupManagersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceGroupManagersClient._read_environment_variables() + ) self._client_cert_source = InstanceGroupManagersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceGroupManagersTransport, transport) self._api_endpoint = self._transport.host @@ -2716,9 +2711,7 @@ def sample_delete_per_instance_configs(): instance_group_managers_delete_per_instance_configs_req_resource is not None ): - request.instance_group_managers_delete_per_instance_configs_req_resource = ( - instance_group_managers_delete_per_instance_configs_req_resource - ) + request.instance_group_managers_delete_per_instance_configs_req_resource = instance_group_managers_delete_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2882,9 +2875,7 @@ def sample_delete_per_instance_configs(): instance_group_managers_delete_per_instance_configs_req_resource is not None ): - request.instance_group_managers_delete_per_instance_configs_req_resource = ( - instance_group_managers_delete_per_instance_configs_req_resource - ) + request.instance_group_managers_delete_per_instance_configs_req_resource = instance_group_managers_delete_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4512,9 +4503,7 @@ def sample_patch_per_instance_configs(): instance_group_managers_patch_per_instance_configs_req_resource is not None ): - request.instance_group_managers_patch_per_instance_configs_req_resource = ( - instance_group_managers_patch_per_instance_configs_req_resource - ) + request.instance_group_managers_patch_per_instance_configs_req_resource = instance_group_managers_patch_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4679,9 +4668,7 @@ def sample_patch_per_instance_configs(): instance_group_managers_patch_per_instance_configs_req_resource is not None ): - request.instance_group_managers_patch_per_instance_configs_req_resource = ( - instance_group_managers_patch_per_instance_configs_req_resource - ) + request.instance_group_managers_patch_per_instance_configs_req_resource = instance_group_managers_patch_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -5998,9 +5985,7 @@ def sample_set_instance_template(): instance_group_managers_set_instance_template_request_resource is not None ): - request.instance_group_managers_set_instance_template_request_resource = ( - instance_group_managers_set_instance_template_request_resource - ) + request.instance_group_managers_set_instance_template_request_resource = instance_group_managers_set_instance_template_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6161,9 +6146,7 @@ def sample_set_instance_template(): instance_group_managers_set_instance_template_request_resource is not None ): - request.instance_group_managers_set_instance_template_request_resource = ( - instance_group_managers_set_instance_template_request_resource - ) + request.instance_group_managers_set_instance_template_request_resource = instance_group_managers_set_instance_template_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7865,9 +7848,7 @@ def sample_update_per_instance_configs(): instance_group_managers_update_per_instance_configs_req_resource is not None ): - request.instance_group_managers_update_per_instance_configs_req_resource = ( - instance_group_managers_update_per_instance_configs_req_resource - ) + request.instance_group_managers_update_per_instance_configs_req_resource = instance_group_managers_update_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -8032,9 +8013,7 @@ def sample_update_per_instance_configs(): instance_group_managers_update_per_instance_configs_req_resource is not None ): - request.instance_group_managers_update_per_instance_configs_req_resource = ( - instance_group_managers_update_per_instance_configs_req_resource - ) + request.instance_group_managers_update_per_instance_configs_req_resource = instance_group_managers_update_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/pagers.py index 8ca1f7c60215..19de5b87e191 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -300,7 +300,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -380,7 +380,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/__init__.py index f219aff6d960..11971291fcaf 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InstanceGroupManagersTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagersTransport]] _transport_registry["rest"] = InstanceGroupManagersRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/base.py index 11461af5c28b..3d92b17de019 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/rest.py index bede0b9e54ed..a46bd57ed3e0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1611,9 +1611,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() request, metadata = self._interceptor.pre_abandon_instances( request, metadata @@ -1767,9 +1765,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1946,9 +1942,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() request, metadata = self._interceptor.pre_apply_updates_to_instances( request, metadata @@ -2129,9 +2123,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() request, metadata = self._interceptor.pre_create_instances( request, metadata @@ -2489,9 +2481,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() request, metadata = self._interceptor.pre_delete_instances( request, metadata @@ -2675,9 +2665,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_delete_per_instance_configs( request, metadata @@ -3314,9 +3302,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() request, metadata = self._interceptor.pre_list_errors(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseListErrors._get_transcoded_request( @@ -3465,9 +3451,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() request, metadata = self._interceptor.pre_list_managed_instances( request, metadata @@ -3618,9 +3602,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_list_per_instance_configs( request, metadata @@ -3982,9 +3964,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_patch_per_instance_configs( request, metadata @@ -4165,9 +4145,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() request, metadata = self._interceptor.pre_recreate_instances( request, metadata @@ -4525,9 +4503,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() request, metadata = self._interceptor.pre_resume_instances( request, metadata @@ -4710,9 +4686,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() request, metadata = self._interceptor.pre_set_instance_template( request, metadata @@ -4895,9 +4869,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() request, metadata = self._interceptor.pre_set_target_pools( request, metadata @@ -5078,9 +5050,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() request, metadata = self._interceptor.pre_start_instances(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseStartInstances._get_transcoded_request( @@ -5259,9 +5229,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() request, metadata = self._interceptor.pre_stop_instances(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseStopInstances._get_transcoded_request( @@ -5440,9 +5408,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() request, metadata = self._interceptor.pre_suspend_instances( request, metadata @@ -5626,9 +5592,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_update_per_instance_configs( request, metadata @@ -5752,7 +5716,9 @@ def apply_updates_to_instances( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ApplyUpdatesToInstances(self._session, self._host, self._interceptor) # type: ignore + return self._ApplyUpdatesToInstances( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_instances( @@ -5790,7 +5756,9 @@ def delete_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeletePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( @@ -5851,7 +5819,9 @@ def list_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch( @@ -5869,7 +5839,9 @@ def patch_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PatchPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._PatchPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def recreate_instances( @@ -5957,7 +5929,9 @@ def update_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdatePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/client.py index 9a9a409eb146..03ac668cc162 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class InstanceGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupsTransport]] _transport_registry["rest"] = InstanceGroupsRestTransport def get_transport_class( @@ -600,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceGroupsClient._read_environment_variables() + ) self._client_cert_source = InstanceGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -639,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/pagers.py index 6b85ae56fd30..5fcbb5513c52 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/base.py index 2250ee515c9b..077e0a360a26 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/rest.py index 4012f6eef8e5..4db32694dd9c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1968,9 +1968,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupsRestTransport._BaseRemoveInstances._get_http_options() - ) + http_options = _BaseInstanceGroupsRestTransport._BaseRemoveInstances._get_http_options() request, metadata = self._interceptor.pre_remove_instances( request, metadata @@ -2302,9 +2300,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/client.py index 7ef6ac983cfb..0fd487ffb9f8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class InstanceSettingsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceSettingsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceSettingsServiceTransport]] _transport_registry["rest"] = InstanceSettingsServiceRestTransport def get_transport_class( @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceSettingsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceSettingsServiceClient._read_environment_variables() + ) self._client_cert_source = ( InstanceSettingsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -646,8 +642,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceSettingsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/__init__.py index 5e289b9ebf70..a7869d6637f2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InstanceSettingsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InstanceSettingsServiceTransport]] _transport_registry["rest"] = InstanceSettingsServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/base.py index efcb1c35f195..b5b46f083136 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/rest.py index b2e028d307cf..ca0ac26ff451 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/client.py index 8f3cde3ce46d..355592a27173 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class InstanceTemplatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceTemplatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceTemplatesTransport]] _transport_registry["rest"] = InstanceTemplatesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceTemplatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceTemplatesClient._read_environment_variables() + ) self._client_cert_source = InstanceTemplatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceTemplatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/pagers.py index ec06519e2f9f..6d659e1e84dc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/base.py index f1a48dd342b8..596a6cf492bf 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/rest.py index d38e2f2409e7..00824c7cecf2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -675,9 +675,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInstanceTemplatesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1240,9 +1238,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseInstanceTemplatesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1795,9 +1791,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseInstanceTemplatesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1948,9 +1942,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/client.py index a4a837107bac..311d7584205a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstancesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstancesClient._read_environment_variables() + ) self._client_cert_source = InstancesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstancesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/pagers.py index a3686de7ebef..883239083afa 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/base.py index be4bff9e6dd4..9ca55c3563f0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/rest.py index 43a9c474af51..3a514d5700b2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -4490,9 +4490,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseDeleteNetworkInterface._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseDeleteNetworkInterface._get_http_options() request, metadata = self._interceptor.pre_delete_network_interface( request, metadata @@ -4961,9 +4959,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseGetEffectiveFirewalls._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseGetEffectiveFirewalls._get_http_options() request, metadata = self._interceptor.pre_get_effective_firewalls( request, metadata @@ -5782,9 +5778,7 @@ def __call__( A Shielded Instance Identity. """ - http_options = ( - _BaseInstancesRestTransport._BaseGetShieldedInstanceIdentity._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseGetShieldedInstanceIdentity._get_http_options() request, metadata = self._interceptor.pre_get_shielded_instance_identity( request, metadata @@ -5850,11 +5844,10 @@ def __call__( resp = self._interceptor.post_get_shielded_instance_identity(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_shielded_instance_identity_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_shielded_instance_identity_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6615,9 +6608,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseRemoveResourcePolicies._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseRemoveResourcePolicies._get_http_options() request, metadata = self._interceptor.pre_remove_resource_policies( request, metadata @@ -7301,9 +7292,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSendDiagnosticInterrupt._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSendDiagnosticInterrupt._get_http_options() request, metadata = self._interceptor.pre_send_diagnostic_interrupt( request, metadata @@ -7481,9 +7470,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSetDeletionProtection._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSetDeletionProtection._get_http_options() request, metadata = self._interceptor.pre_set_deletion_protection( request, metadata @@ -9712,15 +9699,12 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSetShieldedInstanceIntegrityPolicy._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSetShieldedInstanceIntegrityPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_set_shielded_instance_integrity_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_set_shielded_instance_integrity_policy( + request, metadata + ) ) transcoded_request = _BaseInstancesRestTransport._BaseSetShieldedInstanceIntegrityPolicy._get_transcoded_request( http_options, request @@ -9786,11 +9770,10 @@ def __call__( resp = self._interceptor.post_set_shielded_instance_integrity_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_shielded_instance_integrity_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_shielded_instance_integrity_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -10080,9 +10063,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSimulateMaintenanceEvent._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSimulateMaintenanceEvent._get_http_options() request, metadata = self._interceptor.pre_simulate_maintenance_event( request, metadata @@ -10431,9 +10412,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseStartWithEncryptionKey._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseStartWithEncryptionKey._get_http_options() request, metadata = self._interceptor.pre_start_with_encryption_key( request, metadata @@ -11654,9 +11633,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseUpdateNetworkInterface._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseUpdateNetworkInterface._get_http_options() request, metadata = self._interceptor.pre_update_network_interface( request, metadata @@ -11837,9 +11814,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseUpdateShieldedInstanceConfig._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseUpdateShieldedInstanceConfig._get_http_options() request, metadata = self._interceptor.pre_update_shielded_instance_config( request, metadata @@ -11910,11 +11885,10 @@ def __call__( resp = self._interceptor.post_update_shielded_instance_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_shielded_instance_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_shielded_instance_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -12009,7 +11983,9 @@ def delete_network_interface( ) -> Callable[[compute.DeleteNetworkInterfaceInstanceRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteNetworkInterface(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteNetworkInterface( + self._session, self._host, self._interceptor + ) # type: ignore @property def detach_disk( @@ -12079,7 +12055,9 @@ def get_shielded_instance_identity( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetShieldedInstanceIdentity(self._session, self._host, self._interceptor) # type: ignore + return self._GetShieldedInstanceIdentity( + self._session, self._host, self._interceptor + ) # type: ignore @property def insert(self) -> Callable[[compute.InsertInstanceRequest], compute.Operation]: @@ -12117,7 +12095,9 @@ def remove_resource_policies( ) -> Callable[[compute.RemoveResourcePoliciesInstanceRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RemoveResourcePolicies(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveResourcePolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def report_host_as_faulty( @@ -12148,7 +12128,9 @@ def send_diagnostic_interrupt( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SendDiagnosticInterrupt(self._session, self._host, self._interceptor) # type: ignore + return self._SendDiagnosticInterrupt( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_deletion_protection( @@ -12252,7 +12234,9 @@ def set_shielded_instance_integrity_policy( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetShieldedInstanceIntegrityPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._SetShieldedInstanceIntegrityPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_tags(self) -> Callable[[compute.SetTagsInstanceRequest], compute.Operation]: @@ -12266,7 +12250,9 @@ def simulate_maintenance_event( ) -> Callable[[compute.SimulateMaintenanceEventInstanceRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SimulateMaintenanceEvent(self._session, self._host, self._interceptor) # type: ignore + return self._SimulateMaintenanceEvent( + self._session, self._host, self._interceptor + ) # type: ignore @property def start(self) -> Callable[[compute.StartInstanceRequest], compute.Operation]: @@ -12280,7 +12266,9 @@ def start_with_encryption_key( ) -> Callable[[compute.StartWithEncryptionKeyInstanceRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._StartWithEncryptionKey(self._session, self._host, self._interceptor) # type: ignore + return self._StartWithEncryptionKey( + self._session, self._host, self._interceptor + ) # type: ignore @property def stop(self) -> Callable[[compute.StopInstanceRequest], compute.Operation]: @@ -12332,7 +12320,9 @@ def update_network_interface( ) -> Callable[[compute.UpdateNetworkInterfaceInstanceRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateNetworkInterface(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateNetworkInterface( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_shielded_instance_config( @@ -12342,7 +12332,9 @@ def update_shielded_instance_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateShieldedInstanceConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateShieldedInstanceConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/client.py index 66fc66935efa..7c143c6ec6e9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class InstantSnapshotsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstantSnapshotsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstantSnapshotsTransport]] _transport_registry["rest"] = InstantSnapshotsRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstantSnapshotsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstantSnapshotsClient._read_environment_variables() + ) self._client_cert_source = InstantSnapshotsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstantSnapshotsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/pagers.py index c21f279cda23..a0eed70119c6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/base.py index e3394bbb3e0c..b337d03a3235 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/rest.py index ae4dafa78ca6..32f4edb619e5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -726,9 +726,7 @@ def __call__( """ - http_options = ( - _BaseInstantSnapshotsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInstantSnapshotsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInstantSnapshotsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2164,9 +2162,7 @@ def __call__( """ - http_options = ( - _BaseInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/client.py index 9c91bf277405..f07b30d1f1ec 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class InterconnectAttachmentGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] _transport_registry["rest"] = InterconnectAttachmentGroupsRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectAttachmentGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectAttachmentGroupsClient._read_environment_variables() + ) self._client_cert_source = ( InterconnectAttachmentGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -655,8 +651,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectAttachmentGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/pagers.py index f66621cf7cb9..e9cb4d413b8a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/__init__.py index 3961ad9d29df..71f91b690f4b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] _transport_registry["rest"] = InterconnectAttachmentGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/base.py index dee533f73b92..eaa016d4eb2a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/rest.py index 3c9ee15df0f4..68af67808106 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -770,9 +770,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseDelete._get_transcoded_request( @@ -921,9 +919,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseGet._get_transcoded_request( @@ -1142,9 +1138,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1295,9 +1289,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseGetOperationalStatus._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseGetOperationalStatus._get_http_options() request, metadata = self._interceptor.pre_get_operational_status( request, metadata @@ -1479,9 +1471,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseInsert._get_transcoded_request( @@ -1631,9 +1621,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseList._get_transcoded_request( @@ -1809,9 +1797,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BasePatch._get_transcoded_request( @@ -2036,9 +2022,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2191,9 +2175,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/client.py index 57f888775c58..890482d2a570 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class InterconnectAttachmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectAttachmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentsTransport]] _transport_registry["rest"] = InterconnectAttachmentsRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectAttachmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectAttachmentsClient._read_environment_variables() + ) self._client_cert_source = ( InterconnectAttachmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectAttachmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/pagers.py index 5b493c4bd1cd..323bd0ad61ad 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/__init__.py index 04ffd6c58a57..d59fde76191f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectAttachmentsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentsTransport]] _transport_registry["rest"] = InterconnectAttachmentsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/base.py index 126db3c2a073..2d25a88a2815 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/rest.py index 0f963806e893..5cab81081c98 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -623,9 +623,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -802,9 +800,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseDelete._get_transcoded_request( @@ -1131,9 +1127,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseInsert._get_transcoded_request( @@ -1643,9 +1637,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseSetLabels._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/client.py index 401c9e58cd0a..cddfd2ff5a28 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class InterconnectGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectGroupsTransport]] _transport_registry["rest"] = InterconnectGroupsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectGroupsClient._read_environment_variables() + ) self._client_cert_source = InterconnectGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/pagers.py index f5a2659d8487..cd94516bdcef 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/__init__.py index c12b274fcacb..efbcb9c02950 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import InterconnectGroupsRestInterceptor, InterconnectGroupsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectGroupsTransport]] _transport_registry["rest"] = InterconnectGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/base.py index 3f506b351169..29bbd37a0ca8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/rest.py index 4ca365e9fb81..89a584f9f8d8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -816,9 +816,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseCreateMembers._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseCreateMembers._get_http_options() request, metadata = self._interceptor.pre_create_members(request, metadata) transcoded_request = _BaseInterconnectGroupsRestTransport._BaseCreateMembers._get_transcoded_request( @@ -1369,9 +1367,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseInterconnectGroupsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1518,9 +1514,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseGetOperationalStatus._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseGetOperationalStatus._get_http_options() request, metadata = self._interceptor.pre_get_operational_status( request, metadata @@ -2268,9 +2262,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseInterconnectGroupsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2421,9 +2413,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/client.py index da64a0e7891f..92fbda162c5e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class InterconnectLocationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectLocationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectLocationsTransport]] _transport_registry["rest"] = InterconnectLocationsRestTransport def get_transport_class( @@ -603,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectLocationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectLocationsClient._read_environment_variables() + ) self._client_cert_source = InterconnectLocationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -642,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectLocationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/pagers.py index a10af595d853..c525f93a8e5e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/__init__.py index 990c40f05d00..fe298fae537f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectLocationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectLocationsTransport]] _transport_registry["rest"] = InterconnectLocationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/base.py index 339942668ec4..b10a10168f92 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/rest.py index e6f73a9f2ae1..cd986e6e7006 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/client.py index dba3ede04dae..ccf7e754aa04 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class InterconnectRemoteLocationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] _transport_registry["rest"] = InterconnectRemoteLocationsRestTransport def get_transport_class( @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectRemoteLocationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectRemoteLocationsClient._read_environment_variables() + ) self._client_cert_source = ( InterconnectRemoteLocationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -646,8 +642,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectRemoteLocationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/pagers.py index 05da88967834..57a6274c40e8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/__init__.py index 7ed7479ad72f..5f3a153d40d6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] _transport_registry["rest"] = InterconnectRemoteLocationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/base.py index f2863717358c..4afc5fb59291 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/rest.py index d2e0a3141990..8514cbcb034b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -352,9 +352,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectRemoteLocationsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseInterconnectRemoteLocationsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseInterconnectRemoteLocationsRestTransport._BaseGet._get_transcoded_request( @@ -502,9 +500,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectRemoteLocationsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseInterconnectRemoteLocationsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseInterconnectRemoteLocationsRestTransport._BaseList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/client.py index a22d3b98bd6c..956320500f3c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectsClient._read_environment_variables() + ) self._client_cert_source = InterconnectsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/pagers.py index 9fc0cf0f4444..9c446b446771 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/base.py index c54fbc631852..36e7b8b34c69 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/rest.py index f4505be23e02..8bdaf62caa90 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/client.py index 53ec7f59f680..f1b8a7a505a4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -594,11 +594,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LicenseCodesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LicenseCodesClient._read_environment_variables() + ) self._client_cert_source = LicenseCodesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -633,8 +631,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LicenseCodesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/base.py index 2917b78629ed..17346157633e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/rest.py index e6ade2e4ad8d..d896ec38fe2c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -488,9 +488,7 @@ def __call__( """ - http_options = ( - _BaseLicenseCodesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseLicenseCodesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/client.py index f8d97060d72c..cdb773478ed5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LicensesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LicensesClient._read_environment_variables() + ) self._client_cert_source = LicensesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LicensesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/pagers.py index 0a7df04ab8fe..57f453e9932e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/base.py index 57d927e932e1..b3850c608562 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/rest.py index d07233e247a2..fb204fd26d60 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/client.py index a6cd87d81df5..72aae241e848 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MachineImagesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MachineImagesClient._read_environment_variables() + ) self._client_cert_source = MachineImagesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MachineImagesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/pagers.py index 337079d82a54..35637ff5a1ce 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/base.py index fad1442a7876..e2fc8f86debc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/rest.py index 1b796f517b3c..48bc2a4fc809 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1949,9 +1949,7 @@ def __call__( """ - http_options = ( - _BaseMachineImagesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseMachineImagesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/client.py index 275ad02ac120..2a286821c81d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MachineTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MachineTypesClient._read_environment_variables() + ) self._client_cert_source = MachineTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MachineTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/pagers.py index 19c33fbbf82e..3045c9dac232 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/base.py index dc3bf502b8f4..5cde134cac2e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/rest.py index 88055953b940..e783a2252245 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/client.py index 41e5177d6b7a..ee40177ef7d1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class NetworkAttachmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkAttachmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkAttachmentsTransport]] _transport_registry["rest"] = NetworkAttachmentsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkAttachmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkAttachmentsClient._read_environment_variables() + ) self._client_cert_source = NetworkAttachmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkAttachmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/pagers.py index f1d59b0b11b1..6c4d21ae2b05 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/__init__.py index f0a1ddd862ed..2920a592dd40 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import NetworkAttachmentsRestInterceptor, NetworkAttachmentsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkAttachmentsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkAttachmentsTransport]] _transport_registry["rest"] = NetworkAttachmentsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/base.py index 6cdea0083b33..e35dd89d0393 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/rest.py index fb9d2267dc1f..b45c7b17db5f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -731,9 +731,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkAttachmentsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1280,9 +1278,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseNetworkAttachmentsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2020,9 +2016,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseNetworkAttachmentsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2173,9 +2167,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/client.py index fbabd195853e..ac01eb90cd17 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class NetworkEdgeSecurityServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] _transport_registry["rest"] = NetworkEdgeSecurityServicesRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkEdgeSecurityServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkEdgeSecurityServicesClient._read_environment_variables() + ) self._client_cert_source = ( NetworkEdgeSecurityServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkEdgeSecurityServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/pagers.py index 45fcae09cac5..7fa416f267ba 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/__init__.py index 7eaed7b9e349..80d8b0a32470 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] _transport_registry["rest"] = NetworkEdgeSecurityServicesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/base.py index 8d016dbf67ee..d8abcbde9730 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/rest.py index 5675ba26ad32..663f5848ad26 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -513,9 +513,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -694,9 +692,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseDelete._get_transcoded_request( @@ -843,9 +839,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseGet._get_transcoded_request( @@ -1019,9 +1013,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseInsert._get_transcoded_request( @@ -1200,9 +1192,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BasePatch._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/client.py index f35cfb6de639..f7ecbc40167e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class NetworkEndpointGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkEndpointGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEndpointGroupsTransport]] _transport_registry["rest"] = NetworkEndpointGroupsRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkEndpointGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkEndpointGroupsClient._read_environment_variables() + ) self._client_cert_source = NetworkEndpointGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkEndpointGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/pagers.py index de1af13f829c..106af03c1c4f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/__init__.py index cd78182e83fb..1b70862e7803 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkEndpointGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEndpointGroupsTransport]] _transport_registry["rest"] = NetworkEndpointGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/base.py index f32328d43c54..919c86420275 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/rest.py index 8fc56944e810..b138a84da062 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -745,9 +745,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkEndpointGroupsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -923,9 +921,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_attach_network_endpoints( request, metadata @@ -1281,9 +1277,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_detach_network_endpoints( request, metadata @@ -1918,9 +1912,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_list_network_endpoints( request, metadata @@ -2079,9 +2071,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2197,7 +2187,9 @@ def attach_network_endpoints( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AttachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._AttachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete( @@ -2215,7 +2207,9 @@ def detach_network_endpoints( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DetachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._DetachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/client.py index 3bd0785af85b..90e6054eb935 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class NetworkFirewallPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] _transport_registry["rest"] = NetworkFirewallPoliciesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkFirewallPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkFirewallPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( NetworkFirewallPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkFirewallPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/pagers.py index 3d54f361f9b8..9e8d1620bd1c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/__init__.py index 40078d68ba97..71ed19bf349c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] _transport_registry["rest"] = NetworkFirewallPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/base.py index 6f0d2ed074dd..53e29bd9bdea 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/rest.py index 02bbda943eeb..dde0e8916d23 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1435,9 +1435,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1618,9 +1616,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAddPacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAddPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_add_packet_mirroring_rule( request, metadata @@ -1801,9 +1797,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1953,9 +1947,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2132,9 +2124,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() request, metadata = self._interceptor.pre_clone_rules(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_transcoded_request( @@ -2307,9 +2297,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -2601,9 +2589,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2826,9 +2812,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2977,9 +2961,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetPacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_get_packet_mirroring_rule( request, metadata @@ -3130,9 +3112,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -3306,9 +3286,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -3814,9 +3792,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BasePatchPacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BasePatchPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_patch_packet_mirroring_rule( request, metadata @@ -3997,9 +3973,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -4177,9 +4151,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -4359,9 +4331,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseRemovePacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseRemovePacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_remove_packet_mirroring_rule( request, metadata @@ -4536,9 +4506,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -4758,9 +4726,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -4911,9 +4877,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5028,7 +4992,9 @@ def add_packet_mirroring_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AddPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._AddPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def add_rule( @@ -5101,7 +5067,9 @@ def get_packet_mirroring_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._GetPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_rule( @@ -5148,7 +5116,9 @@ def patch_packet_mirroring_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PatchPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._PatchPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch_rule( @@ -5177,7 +5147,9 @@ def remove_packet_mirroring_rule( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RemovePacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._RemovePacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def remove_rule( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/client.py index 63b21e3dc319..fa2b0ee68cfc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class NetworkProfilesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkProfilesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkProfilesTransport]] _transport_registry["rest"] = NetworkProfilesRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkProfilesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkProfilesClient._read_environment_variables() + ) self._client_cert_source = NetworkProfilesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkProfilesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/pagers.py index 5443d52797ec..d1cfd141caf9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/base.py index 281788a559bd..e92b02924fac 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/rest.py index b30f1d802d38..bb7414e394fe 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/client.py index 2846d0f9e1ce..d9eb8be45fb9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworksClient._read_environment_variables() + ) self._client_cert_source = NetworksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/pagers.py index 117addf15e49..f9c41ecc7abb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/base.py index 58279e74fb65..7f1181589b3e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/rest.py index af1cd5f29ead..53962e8e4dde 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1384,9 +1384,7 @@ def __call__( """ - http_options = ( - _BaseNetworksRestTransport._BaseGetEffectiveFirewalls._get_http_options() - ) + http_options = _BaseNetworksRestTransport._BaseGetEffectiveFirewalls._get_http_options() request, metadata = self._interceptor.pre_get_effective_firewalls( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/client.py index 35c493ad458e..85f6c2061e7a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NodeGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NodeGroupsClient._read_environment_variables() + ) self._client_cert_source = NodeGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NodeGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/pagers.py index 533cdb9c1192..71f2928bcf50 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/base.py index f47e8995fccf..f4bfe977afa9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/rest.py index c680f42daf61..32d2418c73e3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -3385,9 +3385,7 @@ def __call__( """ - http_options = ( - _BaseNodeGroupsRestTransport._BaseSimulateMaintenanceEvent._get_http_options() - ) + http_options = _BaseNodeGroupsRestTransport._BaseSimulateMaintenanceEvent._get_http_options() request, metadata = self._interceptor.pre_simulate_maintenance_event( request, metadata @@ -3740,7 +3738,9 @@ def simulate_maintenance_event( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SimulateMaintenanceEvent(self._session, self._host, self._interceptor) # type: ignore + return self._SimulateMaintenanceEvent( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/client.py index d24a2c381857..0602b32a630d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NodeTemplatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NodeTemplatesClient._read_environment_variables() + ) self._client_cert_source = NodeTemplatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NodeTemplatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/pagers.py index a7f7df36f44a..3c212ea781fe 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/base.py index 761c16aeb714..3b32f1f20732 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/rest.py index 6913e42acc21..f2dd42deafc4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1913,9 +1913,7 @@ def __call__( """ - http_options = ( - _BaseNodeTemplatesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNodeTemplatesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/client.py index 86903c9e28e6..4cd8345b4f89 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NodeTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NodeTypesClient._read_environment_variables() + ) self._client_cert_source = NodeTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NodeTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/pagers.py index dd52a721bbcf..f29f332ba27d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/base.py index 17ab62439119..183f7ec7c506 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/rest.py index 19d659aff24f..7a69a6139e97 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/client.py index 6a1da3d7cc6b..43199bde4a8d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class OrganizationSecurityPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] _transport_registry["rest"] = OrganizationSecurityPoliciesRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OrganizationSecurityPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OrganizationSecurityPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( OrganizationSecurityPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -655,8 +651,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OrganizationSecurityPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/pagers.py index f888dbb5e196..5d15fb4725bb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/__init__.py index 4ea5804aaf22..9e6f8d312955 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] _transport_registry["rest"] = OrganizationSecurityPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/base.py index 0d919b7d0c20..e6a3ee116f03 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_organization_operations @@ -403,9 +403,9 @@ def _global_organization_operations_client( transport=self.kind, ) ) - self._extended_operations_services[ - "global_organization_operations" - ] = ex_op_service + self._extended_operations_services["global_organization_operations"] = ( + ex_op_service + ) return ex_op_service diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/rest.py index 308d207f4083..30d3e41f6a6c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1156,9 +1156,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1339,9 +1337,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1519,9 +1515,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseCopyRules._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseCopyRules._get_http_options() request, metadata = self._interceptor.pre_copy_rules(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseCopyRules._get_transcoded_request( @@ -1696,9 +1690,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -1849,9 +1841,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseGet._get_transcoded_request( @@ -1994,9 +1984,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2149,9 +2137,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -2325,9 +2311,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -2477,9 +2461,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseList._get_transcoded_request( @@ -2622,9 +2604,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseListAssociations._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseListAssociations._get_http_options() request, metadata = self._interceptor.pre_list_associations( request, metadata @@ -2778,15 +2758,12 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_preconfigured_expression_sets( - request, metadata + request, metadata = ( + self._interceptor.pre_list_preconfigured_expression_sets( + request, metadata + ) ) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_transcoded_request( http_options, request @@ -2849,11 +2826,10 @@ def __call__( resp = self._interceptor.post_list_preconfigured_expression_sets(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_preconfigured_expression_sets_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_preconfigured_expression_sets_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2965,9 +2941,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseMove._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseMove._get_http_options() request, metadata = self._interceptor.pre_move(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseMove._get_transcoded_request( @@ -3139,9 +3113,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BasePatch._get_transcoded_request( @@ -3320,9 +3292,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -3502,9 +3472,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -3679,9 +3647,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -3878,7 +3844,9 @@ def list_preconfigured_expression_sets( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListPreconfiguredExpressionSets(self._session, self._host, self._interceptor) # type: ignore + return self._ListPreconfiguredExpressionSets( + self._session, self._host, self._interceptor + ) # type: ignore @property def move( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/client.py index dab169a698ee..a94e3a2d8a40 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class PacketMirroringsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PacketMirroringsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PacketMirroringsTransport]] _transport_registry["rest"] = PacketMirroringsRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PacketMirroringsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PacketMirroringsClient._read_environment_variables() + ) self._client_cert_source = PacketMirroringsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PacketMirroringsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/pagers.py index 183e52aa7b2e..27cbf7d79490 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/base.py index 8cc1eba72d72..9c2bb6f06e26 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/rest.py index c268b01bd91b..b0f85704b2fb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -616,9 +616,7 @@ def __call__( Contains a list of packetMirrorings. """ - http_options = ( - _BasePacketMirroringsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BasePacketMirroringsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BasePacketMirroringsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1620,9 +1618,7 @@ def __call__( """ - http_options = ( - _BasePacketMirroringsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BasePacketMirroringsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/client.py index 6c764c13a69d..f0334d564339 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class PreviewFeaturesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PreviewFeaturesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PreviewFeaturesTransport]] _transport_registry["rest"] = PreviewFeaturesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PreviewFeaturesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PreviewFeaturesClient._read_environment_variables() + ) self._client_cert_source = PreviewFeaturesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PreviewFeaturesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/pagers.py index 223a9062a12d..6280ff967843 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/base.py index 99b269d83c90..18ad38607029 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/rest.py index 8d0359f5550c..daf3a212d253 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/client.py index 91440612e774..e42ad8b2f50b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProjectsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProjectsClient._read_environment_variables() + ) self._client_cert_source = ProjectsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProjectsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/pagers.py index fd09fc37cf7a..9694bf416803 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/base.py index 38887bf1720a..592f7b9e6637 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/rest.py index 60809737b138..49fc5cbed18a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -2901,9 +2901,7 @@ def __call__( """ - http_options = ( - _BaseProjectsRestTransport._BaseSetCommonInstanceMetadata._get_http_options() - ) + http_options = _BaseProjectsRestTransport._BaseSetCommonInstanceMetadata._get_http_options() request, metadata = self._interceptor.pre_set_common_instance_metadata( request, metadata @@ -3083,9 +3081,7 @@ def __call__( """ - http_options = ( - _BaseProjectsRestTransport._BaseSetDefaultNetworkTier._get_http_options() - ) + http_options = _BaseProjectsRestTransport._BaseSetDefaultNetworkTier._get_http_options() request, metadata = self._interceptor.pre_set_default_network_tier( request, metadata @@ -3456,7 +3452,9 @@ def set_common_instance_metadata( ) -> Callable[[compute.SetCommonInstanceMetadataProjectRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetCommonInstanceMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._SetCommonInstanceMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_default_network_tier( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/client.py index 535483437799..0546252fe4d4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class PublicAdvertisedPrefixesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] _transport_registry["rest"] = PublicAdvertisedPrefixesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PublicAdvertisedPrefixesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PublicAdvertisedPrefixesClient._read_environment_variables() + ) self._client_cert_source = ( PublicAdvertisedPrefixesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PublicAdvertisedPrefixesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/pagers.py index 5b2d51565d8a..e9a6d5e97770 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/__init__.py index 650a8a373eb5..02e1ed39d336 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] _transport_registry["rest"] = PublicAdvertisedPrefixesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/base.py index 47d6e4f69df5..4acab28a02d1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/rest.py index c1a9f6c7002a..4df2c46f39ba 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -646,9 +646,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseAnnounce._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseAnnounce._get_http_options() request, metadata = self._interceptor.pre_announce(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseAnnounce._get_transcoded_request( @@ -821,9 +819,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseDelete._get_transcoded_request( @@ -1148,9 +1144,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseInsert._get_transcoded_request( @@ -1476,9 +1470,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BasePatch._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BasePatch._get_transcoded_request( @@ -1656,9 +1648,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseWithdraw._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseWithdraw._get_http_options() request, metadata = self._interceptor.pre_withdraw(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseWithdraw._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/client.py index 37e00d11941d..7d90ecc28fc8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class PublicDelegatedPrefixesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] _transport_registry["rest"] = PublicDelegatedPrefixesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PublicDelegatedPrefixesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PublicDelegatedPrefixesClient._read_environment_variables() + ) self._client_cert_source = ( PublicDelegatedPrefixesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PublicDelegatedPrefixesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/pagers.py index 76cdadb02295..2ec990e7b47f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/__init__.py index d648523dc57a..0f7bd60f78b7 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] _transport_registry["rest"] = PublicDelegatedPrefixesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/base.py index ff5490938f63..dec613504237 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/rest.py index ee12638a5112..317d09eeef4d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -678,9 +678,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -857,9 +855,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseAnnounce._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseAnnounce._get_http_options() request, metadata = self._interceptor.pre_announce(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseAnnounce._get_transcoded_request( @@ -1032,9 +1028,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseDelete._get_transcoded_request( @@ -1362,9 +1356,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseInsert._get_transcoded_request( @@ -1870,9 +1862,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseWithdraw._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseWithdraw._get_http_options() request, metadata = self._interceptor.pre_withdraw(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseWithdraw._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/client.py index 0ca3b678ae7c..512de0cb4be8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionAutoscalersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionAutoscalersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionAutoscalersTransport]] _transport_registry["rest"] = RegionAutoscalersRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionAutoscalersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionAutoscalersClient._read_environment_variables() + ) self._client_cert_source = RegionAutoscalersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionAutoscalersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/pagers.py index b9e9f6ce05d2..193a7acb6589 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/base.py index 418a5e6fe0e6..dce51c5fb751 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/rest.py index d48437680210..ef2a2d6bd28e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1474,9 +1474,7 @@ def __call__( """ - http_options = ( - _BaseRegionAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/client.py index f9b441ee8c8d..5eb8a9a01ef4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionBackendServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionBackendServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionBackendServicesTransport]] _transport_registry["rest"] = RegionBackendServicesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionBackendServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionBackendServicesClient._read_environment_variables() + ) self._client_cert_source = RegionBackendServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionBackendServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/pagers.py index 63c70c1330e1..32bf6d9e37a9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/__init__.py index 9168387b112f..9b9ab96e44da 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionBackendServicesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionBackendServicesTransport]] _transport_registry["rest"] = RegionBackendServicesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/base.py index ee5b9d3e9ae7..7f92f8875625 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/rest.py index 054ea2ca25b9..a991b28c0bfd 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1243,9 +1243,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseGetHealth._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseGetHealth._get_http_options() request, metadata = self._interceptor.pre_get_health(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseGetHealth._get_transcoded_request( @@ -1471,9 +1469,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1947,9 +1943,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseListUsable._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseListUsable._get_http_options() request, metadata = self._interceptor.pre_list_usable(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseListUsable._get_transcoded_request( @@ -2352,9 +2346,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2533,9 +2525,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_security_policy( request, metadata @@ -2690,9 +2680,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/client.py index 4d355e4793f0..0e50a5393976 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionCommitmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionCommitmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionCommitmentsTransport]] _transport_registry["rest"] = RegionCommitmentsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionCommitmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionCommitmentsClient._read_environment_variables() + ) self._client_cert_source = RegionCommitmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionCommitmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/pagers.py index c143103d2d7f..fd7d4676b5d1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/base.py index 1568b0e4d1d8..8a486ee4207c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/rest.py index e445668e0479..a3aee94bacd1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -502,9 +502,7 @@ def __call__( """ - http_options = ( - _BaseRegionCommitmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseRegionCommitmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseRegionCommitmentsRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/client.py index 55e9e52c57fa..c6f9d498dfe5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class RegionDiskTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionDiskTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionDiskTypesTransport]] _transport_registry["rest"] = RegionDiskTypesRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionDiskTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionDiskTypesClient._read_environment_variables() + ) self._client_cert_source = RegionDiskTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionDiskTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/pagers.py index 37b78ffc2f25..7ac04e0b2460 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/base.py index 5a7c65d2566f..53886a050599 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/rest.py index c3daf654d79e..15c5996b528d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/client.py index f593206cdab9..91f474141730 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionDisksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionDisksClient._read_environment_variables() + ) self._client_cert_source = RegionDisksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionDisksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/pagers.py index af90823a9e20..efc1e6597e0d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/base.py index d6ec81579f95..748305dd2c7e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/rest.py index 768d80c1916f..b8e70ab8ca00 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1187,9 +1187,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseAddResourcePolicies._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseAddResourcePolicies._get_http_options() request, metadata = self._interceptor.pre_add_resource_policies( request, metadata @@ -2617,9 +2615,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseRemoveResourcePolicies._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseRemoveResourcePolicies._get_http_options() request, metadata = self._interceptor.pre_remove_resource_policies( request, metadata @@ -3393,9 +3389,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseStartAsyncReplication._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseStartAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_start_async_replication( request, metadata @@ -3574,9 +3568,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseStopAsyncReplication._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseStopAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_stop_async_replication( request, metadata @@ -3753,9 +3745,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_stop_group_async_replication( request, metadata @@ -3909,9 +3899,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -4248,7 +4236,9 @@ def remove_resource_policies( ) -> Callable[[compute.RemoveResourcePoliciesRegionDiskRequest], compute.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RemoveResourcePolicies(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveResourcePolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def resize(self) -> Callable[[compute.ResizeRegionDiskRequest], compute.Operation]: @@ -4296,7 +4286,9 @@ def stop_group_async_replication( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._StopGroupAsyncReplication(self._session, self._host, self._interceptor) # type: ignore + return self._StopGroupAsyncReplication( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/client.py index f7f7f03d0f38..4608c9d763dd 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionHealthCheckServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionHealthCheckServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthCheckServicesTransport]] _transport_registry["rest"] = RegionHealthCheckServicesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionHealthCheckServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionHealthCheckServicesClient._read_environment_variables() + ) self._client_cert_source = ( RegionHealthCheckServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionHealthCheckServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/pagers.py index 16ec50d9eaed..ad1e1ebacbeb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/__init__.py index 251cbe2cc4da..d75676f50849 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionHealthCheckServicesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthCheckServicesTransport]] _transport_registry["rest"] = RegionHealthCheckServicesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/base.py index 206635101588..69162fd8fdbb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/rest.py index adeb2a30c0f5..0bca550f6ba3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -538,9 +538,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BaseDelete._get_transcoded_request( @@ -861,9 +859,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BaseInsert._get_transcoded_request( @@ -1013,9 +1009,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BaseList._get_transcoded_request( @@ -1187,9 +1181,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BasePatch._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/client.py index b5f2052310dd..e9cd50cb1846 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionHealthChecksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionHealthChecksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthChecksTransport]] _transport_registry["rest"] = RegionHealthChecksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionHealthChecksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionHealthChecksClient._read_environment_variables() + ) self._client_cert_source = RegionHealthChecksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionHealthChecksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/pagers.py index 6a6339875e1c..db89e274e38d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/__init__.py index 4cf5cc2f2dee..b5068a49f468 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import RegionHealthChecksRestInterceptor, RegionHealthChecksRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionHealthChecksTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthChecksTransport]] _transport_registry["rest"] = RegionHealthChecksRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/base.py index 56b4f0f48d8d..73be4bfdc0e1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/rest.py index c7e4e0ffc14f..fc0add36eabc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1482,9 +1482,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/client.py index 379d76fa9de9..f0d839e994c4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionInstanceGroupManagersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] _transport_registry["rest"] = RegionInstanceGroupManagersRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstanceGroupManagersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstanceGroupManagersClient._read_environment_variables() + ) self._client_cert_source = ( RegionInstanceGroupManagersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstanceGroupManagersTransport, transport) self._api_endpoint = self._transport.host @@ -863,9 +858,7 @@ def sample_abandon_instances(): region_instance_group_managers_abandon_instances_request_resource is not None ): - request.region_instance_group_managers_abandon_instances_request_resource = ( - region_instance_group_managers_abandon_instances_request_resource - ) + request.region_instance_group_managers_abandon_instances_request_resource = region_instance_group_managers_abandon_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1039,9 +1032,7 @@ def sample_abandon_instances(): region_instance_group_managers_abandon_instances_request_resource is not None ): - request.region_instance_group_managers_abandon_instances_request_resource = ( - region_instance_group_managers_abandon_instances_request_resource - ) + request.region_instance_group_managers_abandon_instances_request_resource = region_instance_group_managers_abandon_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1228,9 +1219,7 @@ def sample_apply_updates_to_instances(): region_instance_group_managers_apply_updates_request_resource is not None ): - request.region_instance_group_managers_apply_updates_request_resource = ( - region_instance_group_managers_apply_updates_request_resource - ) + request.region_instance_group_managers_apply_updates_request_resource = region_instance_group_managers_apply_updates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1394,9 +1383,7 @@ def sample_apply_updates_to_instances(): region_instance_group_managers_apply_updates_request_resource is not None ): - request.region_instance_group_managers_apply_updates_request_resource = ( - region_instance_group_managers_apply_updates_request_resource - ) + request.region_instance_group_managers_apply_updates_request_resource = region_instance_group_managers_apply_updates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1588,9 +1575,7 @@ def sample_create_instances(): region_instance_group_managers_create_instances_request_resource is not None ): - request.region_instance_group_managers_create_instances_request_resource = ( - region_instance_group_managers_create_instances_request_resource - ) + request.region_instance_group_managers_create_instances_request_resource = region_instance_group_managers_create_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1755,9 +1740,7 @@ def sample_create_instances(): region_instance_group_managers_create_instances_request_resource is not None ): - request.region_instance_group_managers_create_instances_request_resource = ( - region_instance_group_managers_create_instances_request_resource - ) + request.region_instance_group_managers_create_instances_request_resource = region_instance_group_managers_create_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2257,9 +2240,7 @@ def sample_delete_instances(): region_instance_group_managers_delete_instances_request_resource is not None ): - request.region_instance_group_managers_delete_instances_request_resource = ( - region_instance_group_managers_delete_instances_request_resource - ) + request.region_instance_group_managers_delete_instances_request_resource = region_instance_group_managers_delete_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2433,9 +2414,7 @@ def sample_delete_instances(): region_instance_group_managers_delete_instances_request_resource is not None ): - request.region_instance_group_managers_delete_instances_request_resource = ( - region_instance_group_managers_delete_instances_request_resource - ) + request.region_instance_group_managers_delete_instances_request_resource = region_instance_group_managers_delete_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2622,9 +2601,7 @@ def sample_delete_per_instance_configs(): region_instance_group_manager_delete_instance_config_req_resource is not None ): - request.region_instance_group_manager_delete_instance_config_req_resource = ( - region_instance_group_manager_delete_instance_config_req_resource - ) + request.region_instance_group_manager_delete_instance_config_req_resource = region_instance_group_manager_delete_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2788,9 +2765,7 @@ def sample_delete_per_instance_configs(): region_instance_group_manager_delete_instance_config_req_resource is not None ): - request.region_instance_group_manager_delete_instance_config_req_resource = ( - region_instance_group_manager_delete_instance_config_req_resource - ) + request.region_instance_group_manager_delete_instance_config_req_resource = region_instance_group_manager_delete_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4423,9 +4398,7 @@ def sample_patch_per_instance_configs(): region_instance_group_manager_patch_instance_config_req_resource is not None ): - request.region_instance_group_manager_patch_instance_config_req_resource = ( - region_instance_group_manager_patch_instance_config_req_resource - ) + request.region_instance_group_manager_patch_instance_config_req_resource = region_instance_group_manager_patch_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4591,9 +4564,7 @@ def sample_patch_per_instance_configs(): region_instance_group_manager_patch_instance_config_req_resource is not None ): - request.region_instance_group_manager_patch_instance_config_req_resource = ( - region_instance_group_manager_patch_instance_config_req_resource - ) + request.region_instance_group_manager_patch_instance_config_req_resource = region_instance_group_manager_patch_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -5515,9 +5486,7 @@ def sample_resume_instances(): region_instance_group_managers_resume_instances_request_resource is not None ): - request.region_instance_group_managers_resume_instances_request_resource = ( - region_instance_group_managers_resume_instances_request_resource - ) + request.region_instance_group_managers_resume_instances_request_resource = region_instance_group_managers_resume_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -5692,9 +5661,7 @@ def sample_resume_instances(): region_instance_group_managers_resume_instances_request_resource is not None ): - request.region_instance_group_managers_resume_instances_request_resource = ( - region_instance_group_managers_resume_instances_request_resource - ) + request.region_instance_group_managers_resume_instances_request_resource = region_instance_group_managers_resume_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6221,9 +6188,7 @@ def sample_set_target_pools(): region_instance_group_managers_set_target_pools_request_resource is not None ): - request.region_instance_group_managers_set_target_pools_request_resource = ( - region_instance_group_managers_set_target_pools_request_resource - ) + request.region_instance_group_managers_set_target_pools_request_resource = region_instance_group_managers_set_target_pools_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6380,9 +6345,7 @@ def sample_set_target_pools(): region_instance_group_managers_set_target_pools_request_resource is not None ): - request.region_instance_group_managers_set_target_pools_request_resource = ( - region_instance_group_managers_set_target_pools_request_resource - ) + request.region_instance_group_managers_set_target_pools_request_resource = region_instance_group_managers_set_target_pools_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6582,9 +6545,7 @@ def sample_start_instances(): region_instance_group_managers_start_instances_request_resource is not None ): - request.region_instance_group_managers_start_instances_request_resource = ( - region_instance_group_managers_start_instances_request_resource - ) + request.region_instance_group_managers_start_instances_request_resource = region_instance_group_managers_start_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6759,9 +6720,7 @@ def sample_start_instances(): region_instance_group_managers_start_instances_request_resource is not None ): - request.region_instance_group_managers_start_instances_request_resource = ( - region_instance_group_managers_start_instances_request_resource - ) + request.region_instance_group_managers_start_instances_request_resource = region_instance_group_managers_start_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6975,9 +6934,7 @@ def sample_stop_instances(): region_instance_group_managers_stop_instances_request_resource is not None ): - request.region_instance_group_managers_stop_instances_request_resource = ( - region_instance_group_managers_stop_instances_request_resource - ) + request.region_instance_group_managers_stop_instances_request_resource = region_instance_group_managers_stop_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7166,9 +7123,7 @@ def sample_stop_instances(): region_instance_group_managers_stop_instances_request_resource is not None ): - request.region_instance_group_managers_stop_instances_request_resource = ( - region_instance_group_managers_stop_instances_request_resource - ) + request.region_instance_group_managers_stop_instances_request_resource = region_instance_group_managers_stop_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7380,9 +7335,7 @@ def sample_suspend_instances(): region_instance_group_managers_suspend_instances_request_resource is not None ): - request.region_instance_group_managers_suspend_instances_request_resource = ( - region_instance_group_managers_suspend_instances_request_resource - ) + request.region_instance_group_managers_suspend_instances_request_resource = region_instance_group_managers_suspend_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7569,9 +7522,7 @@ def sample_suspend_instances(): region_instance_group_managers_suspend_instances_request_resource is not None ): - request.region_instance_group_managers_suspend_instances_request_resource = ( - region_instance_group_managers_suspend_instances_request_resource - ) + request.region_instance_group_managers_suspend_instances_request_resource = region_instance_group_managers_suspend_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7760,9 +7711,7 @@ def sample_update_per_instance_configs(): region_instance_group_manager_update_instance_config_req_resource is not None ): - request.region_instance_group_manager_update_instance_config_req_resource = ( - region_instance_group_manager_update_instance_config_req_resource - ) + request.region_instance_group_manager_update_instance_config_req_resource = region_instance_group_manager_update_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7928,9 +7877,7 @@ def sample_update_per_instance_configs(): region_instance_group_manager_update_instance_config_req_resource is not None ): - request.region_instance_group_manager_update_instance_config_req_resource = ( - region_instance_group_manager_update_instance_config_req_resource - ) + request.region_instance_group_manager_update_instance_config_req_resource = region_instance_group_manager_update_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/pagers.py index d4ff61e1cf64..9a1ee09aba30 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -219,7 +219,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/__init__.py index 893f6c69a453..9beb4c2b5cab 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] _transport_registry["rest"] = RegionInstanceGroupManagersRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/base.py index 4a870b9abd00..e2e1e0fb8a11 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/rest.py index 9962ca11e50e..114b3c219bd2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1554,9 +1554,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() request, metadata = self._interceptor.pre_abandon_instances( request, metadata @@ -1740,9 +1738,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() request, metadata = self._interceptor.pre_apply_updates_to_instances( request, metadata @@ -1923,9 +1919,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() request, metadata = self._interceptor.pre_create_instances( request, metadata @@ -2107,9 +2101,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseDelete._get_transcoded_request( @@ -2283,9 +2275,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() request, metadata = self._interceptor.pre_delete_instances( request, metadata @@ -2471,9 +2461,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_delete_per_instance_configs( request, metadata @@ -2637,9 +2625,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseGet._get_transcoded_request( @@ -2811,9 +2797,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseInsert._get_transcoded_request( @@ -2965,9 +2949,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseList._get_transcoded_request( @@ -3112,9 +3094,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() request, metadata = self._interceptor.pre_list_errors(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseListErrors._get_transcoded_request( @@ -3265,9 +3245,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() request, metadata = self._interceptor.pre_list_managed_instances( request, metadata @@ -3418,9 +3396,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_list_per_instance_configs( request, metadata @@ -3600,9 +3576,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BasePatch._get_transcoded_request( @@ -3784,9 +3758,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_patch_per_instance_configs( request, metadata @@ -3967,9 +3939,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() request, metadata = self._interceptor.pre_recreate_instances( request, metadata @@ -4149,9 +4119,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseResize._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseResize._get_http_options() request, metadata = self._interceptor.pre_resize(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseResize._get_transcoded_request( @@ -4325,9 +4293,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() request, metadata = self._interceptor.pre_resume_instances( request, metadata @@ -4510,9 +4476,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() request, metadata = self._interceptor.pre_set_instance_template( request, metadata @@ -4693,9 +4657,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() request, metadata = self._interceptor.pre_set_target_pools( request, metadata @@ -4878,9 +4840,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() request, metadata = self._interceptor.pre_start_instances(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseStartInstances._get_transcoded_request( @@ -5061,9 +5021,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() request, metadata = self._interceptor.pre_stop_instances(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseStopInstances._get_transcoded_request( @@ -5244,9 +5202,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() request, metadata = self._interceptor.pre_suspend_instances( request, metadata @@ -5430,9 +5386,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_update_per_instance_configs( request, metadata @@ -5546,7 +5500,9 @@ def apply_updates_to_instances( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ApplyUpdatesToInstances(self._session, self._host, self._interceptor) # type: ignore + return self._ApplyUpdatesToInstances( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_instances( @@ -5585,7 +5541,9 @@ def delete_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeletePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( @@ -5647,7 +5605,9 @@ def list_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch( @@ -5666,7 +5626,9 @@ def patch_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PatchPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._PatchPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def recreate_instances( @@ -5756,7 +5718,9 @@ def update_per_instance_configs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdatePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/client.py index 2781a7aa0491..be1628d70822 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionInstanceGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstanceGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupsTransport]] _transport_registry["rest"] = RegionInstanceGroupsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstanceGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstanceGroupsClient._read_environment_variables() + ) self._client_cert_source = RegionInstanceGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstanceGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/pagers.py index 151fcec5dba2..dc502a646693 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/__init__.py index 64ee5dcb38b2..4e1ced171a44 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import RegionInstanceGroupsRestInterceptor, RegionInstanceGroupsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstanceGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupsTransport]] _transport_registry["rest"] = RegionInstanceGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/base.py index 58dff5f1b175..d73fa4905b24 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/rest.py index 056228578d63..33a63e626c50 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -833,9 +833,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupsRestTransport._BaseListInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupsRestTransport._BaseListInstances._get_http_options() request, metadata = self._interceptor.pre_list_instances(request, metadata) transcoded_request = _BaseRegionInstanceGroupsRestTransport._BaseListInstances._get_transcoded_request( @@ -1016,9 +1014,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupsRestTransport._BaseSetNamedPorts._get_http_options() - ) + http_options = _BaseRegionInstanceGroupsRestTransport._BaseSetNamedPorts._get_http_options() request, metadata = self._interceptor.pre_set_named_ports(request, metadata) transcoded_request = _BaseRegionInstanceGroupsRestTransport._BaseSetNamedPorts._get_transcoded_request( @@ -1169,9 +1165,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/client.py index 26bd61e67fa9..1e9189b176e4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionInstanceTemplatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstanceTemplatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceTemplatesTransport]] _transport_registry["rest"] = RegionInstanceTemplatesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstanceTemplatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstanceTemplatesClient._read_environment_variables() + ) self._client_cert_source = ( RegionInstanceTemplatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstanceTemplatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/pagers.py index ecb70cba9969..7354b04f320d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/__init__.py index 37ac6b1ce0d9..91c96fdb74c4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstanceTemplatesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceTemplatesTransport]] _transport_registry["rest"] = RegionInstanceTemplatesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/base.py index 2b10210d1855..413b8178744d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/rest.py index 11332026425d..99504433dc74 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -477,9 +477,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceTemplatesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionInstanceTemplatesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionInstanceTemplatesRestTransport._BaseDelete._get_transcoded_request( @@ -817,9 +815,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceTemplatesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionInstanceTemplatesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionInstanceTemplatesRestTransport._BaseInsert._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/client.py index c3449f3afa7e..224befc8e091 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class RegionInstancesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstancesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstancesTransport]] _transport_registry["rest"] = RegionInstancesRestTransport def get_transport_class( @@ -601,11 +599,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstancesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstancesClient._read_environment_variables() + ) self._client_cert_source = RegionInstancesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +636,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstancesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/base.py index 792163eee6fd..fff7432e5e2b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/rest.py index 60e22f78b88e..13afa1f720b6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/client.py index 4c943aaa988a..db528fda871f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionInstantSnapshotsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstantSnapshotsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstantSnapshotsTransport]] _transport_registry["rest"] = RegionInstantSnapshotsRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstantSnapshotsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstantSnapshotsClient._read_environment_variables() + ) self._client_cert_source = RegionInstantSnapshotsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstantSnapshotsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/pagers.py index 7a7a8741065a..62bc67c2fbf3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/__init__.py index c79504fba846..d67a8b7e1a0e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstantSnapshotsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstantSnapshotsTransport]] _transport_registry["rest"] = RegionInstantSnapshotsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/base.py index 57b10c6aea68..56c00cb5d5c3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/rest.py index 98615420c4f9..b349302f4464 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1070,9 +1070,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRegionInstantSnapshotsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1620,9 +1618,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRegionInstantSnapshotsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1801,9 +1797,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseRegionInstantSnapshotsRestTransport._BaseSetLabels._get_transcoded_request( @@ -1954,9 +1948,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/client.py index a30d9d9eda9e..1fb20869c6bd 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionNetworkEndpointGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] _transport_registry["rest"] = RegionNetworkEndpointGroupsRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionNetworkEndpointGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionNetworkEndpointGroupsClient._read_environment_variables() + ) self._client_cert_source = ( RegionNetworkEndpointGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionNetworkEndpointGroupsTransport, transport) self._api_endpoint = self._transport.host @@ -852,9 +847,7 @@ def sample_attach_network_endpoints(): region_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_attach_endpoints_request_resource = ( - region_network_endpoint_groups_attach_endpoints_request_resource - ) + request.region_network_endpoint_groups_attach_endpoints_request_resource = region_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1017,9 +1010,7 @@ def sample_attach_network_endpoints(): region_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_attach_endpoints_request_resource = ( - region_network_endpoint_groups_attach_endpoints_request_resource - ) + request.region_network_endpoint_groups_attach_endpoints_request_resource = region_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1514,9 +1505,7 @@ def sample_detach_network_endpoints(): region_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_detach_endpoints_request_resource = ( - region_network_endpoint_groups_detach_endpoints_request_resource - ) + request.region_network_endpoint_groups_detach_endpoints_request_resource = region_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1679,9 +1668,7 @@ def sample_detach_network_endpoints(): region_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_detach_endpoints_request_resource = ( - region_network_endpoint_groups_detach_endpoints_request_resource - ) + request.region_network_endpoint_groups_detach_endpoints_request_resource = region_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/pagers.py index 8479c24fe1be..0b559fcae08f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/__init__.py index 3dd7945713af..da8323cc3026 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] _transport_registry["rest"] = RegionNetworkEndpointGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/base.py index 871b66233ef1..a06e4919e183 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/rest.py index 5212cc1fa7fa..b0592b69b53a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -660,9 +660,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_attach_network_endpoints( request, metadata @@ -842,9 +840,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseDelete._get_transcoded_request( @@ -1020,9 +1016,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_detach_network_endpoints( request, metadata @@ -1183,9 +1177,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseGet._get_transcoded_request( @@ -1357,9 +1349,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseInsert._get_transcoded_request( @@ -1509,9 +1499,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseList._get_transcoded_request( @@ -1656,9 +1644,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_list_network_endpoints( request, metadata @@ -1761,7 +1747,9 @@ def attach_network_endpoints( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AttachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._AttachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete( @@ -1780,7 +1768,9 @@ def detach_network_endpoints( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DetachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._DetachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/client.py index 144d953362fb..373ed6d7bc55 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionNetworkFirewallPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] _transport_registry["rest"] = RegionNetworkFirewallPoliciesRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionNetworkFirewallPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionNetworkFirewallPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( RegionNetworkFirewallPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -657,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionNetworkFirewallPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/pagers.py index 7ac10d47350c..d4be9d992c5b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/__init__.py index 433f662fc5c8..f3263c79b48b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] _transport_registry["rest"] = RegionNetworkFirewallPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/base.py index 76b51738e4f6..d69fc0227aa7 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/rest.py index 6ffbaadb69e6..0413a0e8396d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1213,9 +1213,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1394,9 +1392,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1576,9 +1572,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() request, metadata = self._interceptor.pre_clone_rules(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_transcoded_request( @@ -1753,9 +1747,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -1902,9 +1894,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGet._get_transcoded_request( @@ -2047,9 +2037,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2198,9 +2186,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetEffectiveFirewalls._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetEffectiveFirewalls._get_http_options() request, metadata = self._interceptor.pre_get_effective_firewalls( request, metadata @@ -2427,9 +2413,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2580,9 +2564,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -2758,9 +2740,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -2910,9 +2890,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseList._get_transcoded_request( @@ -3084,9 +3062,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatch._get_transcoded_request( @@ -3265,9 +3241,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -3447,9 +3421,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -3624,9 +3596,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -3848,9 +3818,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -4003,9 +3971,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/client.py index c4341bf32bc4..0750afbf744e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionNotificationEndpointsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionNotificationEndpointsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionNotificationEndpointsTransport]] _transport_registry["rest"] = RegionNotificationEndpointsRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionNotificationEndpointsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionNotificationEndpointsClient._read_environment_variables() + ) self._client_cert_source = ( RegionNotificationEndpointsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionNotificationEndpointsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/pagers.py index 044dd68270f6..5c8d06e6679a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/__init__.py index 5439dcd7a1f4..520eb9a6de76 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionNotificationEndpointsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionNotificationEndpointsTransport]] _transport_registry["rest"] = RegionNotificationEndpointsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/base.py index 520fd29d9d95..680613860e23 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/rest.py index 6239cd43d44f..0802285e9899 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -542,9 +542,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseDelete._get_transcoded_request( @@ -698,9 +696,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseGet._get_transcoded_request( @@ -872,9 +868,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseInsert._get_transcoded_request( @@ -1024,9 +1018,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseList._get_transcoded_request( @@ -1172,9 +1164,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/client.py index d94ebeb4ac50..9dd89cfeefe9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class RegionOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionOperationsTransport]] _transport_registry["rest"] = RegionOperationsRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionOperationsClient._read_environment_variables() + ) self._client_cert_source = RegionOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/pagers.py index 5ca57a3eea60..2477b8a08991 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/base.py index 6d891168c017..86a408835699 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/rest.py index 2016d5f77b32..920e47a5524b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/client.py index c22be53f6f01..91002b072567 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionSecurityPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSecurityPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSecurityPoliciesTransport]] _transport_registry["rest"] = RegionSecurityPoliciesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSecurityPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSecurityPoliciesClient._read_environment_variables() + ) self._client_cert_source = RegionSecurityPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSecurityPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/pagers.py index a8e4c58fead0..202f103fab36 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/__init__.py index 974b3530fac6..05c2647ccc95 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionSecurityPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionSecurityPoliciesTransport]] _transport_registry["rest"] = RegionSecurityPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/base.py index 4e27b07dd338..67d0123b9b7e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/rest.py index b514c44042e7..3dc9ee912da5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -809,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1291,9 +1289,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -1974,9 +1970,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -2154,9 +2148,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -2330,9 +2322,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseSetLabels._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/client.py index 7c20ec767c00..080afa420889 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionSslCertificatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSslCertificatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSslCertificatesTransport]] _transport_registry["rest"] = RegionSslCertificatesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSslCertificatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSslCertificatesClient._read_environment_variables() + ) self._client_cert_source = RegionSslCertificatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSslCertificatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/pagers.py index e4f35d605b0a..0f2df4aabba7 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/__init__.py index 060c7906a8ce..34a9a093486c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionSslCertificatesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionSslCertificatesTransport]] _transport_registry["rest"] = RegionSslCertificatesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/base.py index 3e476f905044..0d255e2cef7d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/rest.py index 9209691cceaa..dc64159686b9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/client.py index 380463b1327e..574a4a5c7bdb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionSslPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSslPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSslPoliciesTransport]] _transport_registry["rest"] = RegionSslPoliciesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSslPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSslPoliciesClient._read_environment_variables() + ) self._client_cert_source = RegionSslPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSslPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/pagers.py index 5faf73e28c19..3dcd37c5480f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/base.py index 7008cf5cb2fa..1427e4f38a24 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/rest.py index 8619877489dd..d1a513149467 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1223,9 +1223,7 @@ def __call__( """ - http_options = ( - _BaseRegionSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() - ) + http_options = _BaseRegionSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() request, metadata = self._interceptor.pre_list_available_features( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/client.py index 507e4e0bd78a..046235518bf6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionTargetHttpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpProxiesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionTargetHttpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionTargetHttpProxiesClient._read_environment_variables() + ) self._client_cert_source = ( RegionTargetHttpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionTargetHttpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/pagers.py index 4bc98abc93e1..493218a84350 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/__init__.py index d1f663d11aae..b1007083364a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/base.py index 85f184ef6366..2c4227e60b1a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/rest.py index 61d66bdf46fe..2ec8aae55e17 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -531,9 +531,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpProxiesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionTargetHttpProxiesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionTargetHttpProxiesRestTransport._BaseDelete._get_transcoded_request( @@ -875,9 +873,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpProxiesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionTargetHttpProxiesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionTargetHttpProxiesRestTransport._BaseInsert._get_transcoded_request( @@ -1201,9 +1197,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpProxiesRestTransport._BaseSetUrlMap._get_http_options() - ) + http_options = _BaseRegionTargetHttpProxiesRestTransport._BaseSetUrlMap._get_http_options() request, metadata = self._interceptor.pre_set_url_map(request, metadata) transcoded_request = _BaseRegionTargetHttpProxiesRestTransport._BaseSetUrlMap._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/client.py index 8a0eeb726cd0..c6e049e80c5b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionTargetHttpsProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpsProxiesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionTargetHttpsProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionTargetHttpsProxiesClient._read_environment_variables() + ) self._client_cert_source = ( RegionTargetHttpsProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionTargetHttpsProxiesTransport, transport) self._api_endpoint = self._transport.host @@ -2062,9 +2057,7 @@ def sample_set_ssl_certificates(): region_target_https_proxies_set_ssl_certificates_request_resource is not None ): - request.region_target_https_proxies_set_ssl_certificates_request_resource = ( - region_target_https_proxies_set_ssl_certificates_request_resource - ) + request.region_target_https_proxies_set_ssl_certificates_request_resource = region_target_https_proxies_set_ssl_certificates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2221,9 +2214,7 @@ def sample_set_ssl_certificates(): region_target_https_proxies_set_ssl_certificates_request_resource is not None ): - request.region_target_https_proxies_set_ssl_certificates_request_resource = ( - region_target_https_proxies_set_ssl_certificates_request_resource - ) + request.region_target_https_proxies_set_ssl_certificates_request_resource = region_target_https_proxies_set_ssl_certificates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/pagers.py index 22c6a8bdb537..c871eeb52b55 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/__init__.py index 56fd11aaf8f8..10e93cde04da 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpsProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/base.py index 35bef62cae94..75485c624006 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/rest.py index 7605c9f1e804..c98b51f90c78 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -644,9 +644,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BaseDelete._get_transcoded_request( @@ -988,9 +986,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BaseInsert._get_transcoded_request( @@ -1316,9 +1312,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BasePatch._get_transcoded_request( @@ -1497,9 +1491,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() request, metadata = self._interceptor.pre_set_ssl_certificates( request, metadata @@ -1682,9 +1674,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseSetUrlMap._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseSetUrlMap._get_http_options() request, metadata = self._interceptor.pre_set_url_map(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BaseSetUrlMap._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/client.py index fc08a7fc8f30..0d681742e7c5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class RegionTargetTcpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] _transport_registry["rest"] = RegionTargetTcpProxiesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionTargetTcpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionTargetTcpProxiesClient._read_environment_variables() + ) self._client_cert_source = RegionTargetTcpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionTargetTcpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/pagers.py index 14e8861bd2a3..cb7ef0257f37 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/__init__.py index 72e8e2cb3dfa..d3ec0d868b0d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] _transport_registry["rest"] = RegionTargetTcpProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/base.py index 716af4da3da4..497f9573bc02 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/rest.py index a18c1089f502..e03428f5c7c3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/client.py index 076f40374b55..46e14bce6530 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionUrlMapsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionUrlMapsClient._read_environment_variables() + ) self._client_cert_source = RegionUrlMapsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionUrlMapsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/pagers.py index cb2a2a320bc6..fa5a2a4bb266 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/base.py index 2b93162c60ec..45d10229680c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/rest.py index b58510f0b1c9..c4a6e93f2a72 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/client.py index 1f55d1e08ac8..66d6594cf5c7 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionZonesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionZonesClient._read_environment_variables() + ) self._client_cert_source = RegionZonesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionZonesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/pagers.py index ec134fa48f1b..a89148cf342b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/base.py index 61a3e59f5f49..c9c993fe9c20 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/rest.py index ecb2f216e790..bfb37becadcf 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/client.py index 9556a35522b1..f4c601793bb9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionsClient._read_environment_variables() + ) self._client_cert_source = RegionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/pagers.py index 3f35969c1aa3..eb76b4bb6f1e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/base.py index 6f8615e80896..eaf4bd6add04 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/rest.py index 8e486e75f569..6552dfee79e6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/client.py index 6b437244e27e..9335da665867 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class ReservationBlocksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ReservationBlocksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ReservationBlocksTransport]] _transport_registry["rest"] = ReservationBlocksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReservationBlocksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReservationBlocksClient._read_environment_variables() + ) self._client_cert_source = ReservationBlocksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReservationBlocksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/pagers.py index 6b51006f1730..8392a22dae1c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/base.py index 08306d238503..a490b66ea7ef 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/rest.py index 9926f6f94017..ce6d27e01c56 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -790,9 +790,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseReservationBlocksRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1118,9 +1116,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BasePerformMaintenance._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BasePerformMaintenance._get_http_options() request, metadata = self._interceptor.pre_perform_maintenance( request, metadata @@ -1346,9 +1342,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseReservationBlocksRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1499,9 +1493,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/client.py index dbf9d8da7889..b2fa005f9a2d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class ReservationSubBlocksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ReservationSubBlocksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ReservationSubBlocksTransport]] _transport_registry["rest"] = ReservationSubBlocksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReservationSubBlocksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReservationSubBlocksClient._read_environment_variables() + ) self._client_cert_source = ReservationSubBlocksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReservationSubBlocksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/pagers.py index 26b2474f58f0..ab8933cbb969 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/__init__.py index b1aa0cc62777..3cc2955ac69c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ReservationSubBlocksRestInterceptor, ReservationSubBlocksRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ReservationSubBlocksTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ReservationSubBlocksTransport]] _transport_registry["rest"] = ReservationSubBlocksRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/base.py index 68f6072be77c..79b722e5de1a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/rest.py index 93fa3ce61150..0c17a4d3f767 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -849,9 +849,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseReservationSubBlocksRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1174,9 +1172,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BasePerformMaintenance._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BasePerformMaintenance._get_http_options() request, metadata = self._interceptor.pre_perform_maintenance( request, metadata @@ -1354,9 +1350,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseReportFaulty._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseReportFaulty._get_http_options() request, metadata = self._interceptor.pre_report_faulty(request, metadata) transcoded_request = _BaseReservationSubBlocksRestTransport._BaseReportFaulty._get_transcoded_request( @@ -1581,9 +1575,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseReservationSubBlocksRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1734,9 +1726,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/client.py index ff70d189f94a..bd5b010f7d64 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReservationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReservationsClient._read_environment_variables() + ) self._client_cert_source = ReservationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReservationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/pagers.py index 49f8531c87b8..56ff83d0134c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/base.py index 07848dcc211e..9333f91ee33a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/rest.py index 9893c2b128a2..d833f6f669c6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1882,9 +1882,7 @@ def __call__( """ - http_options = ( - _BaseReservationsRestTransport._BasePerformMaintenance._get_http_options() - ) + http_options = _BaseReservationsRestTransport._BasePerformMaintenance._get_http_options() request, metadata = self._interceptor.pre_perform_maintenance( request, metadata @@ -2448,9 +2446,7 @@ def __call__( """ - http_options = ( - _BaseReservationsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseReservationsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/client.py index abc23635cdbf..ce704151e64a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class ResourcePoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ResourcePoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ResourcePoliciesTransport]] _transport_registry["rest"] = ResourcePoliciesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ResourcePoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ResourcePoliciesClient._read_environment_variables() + ) self._client_cert_source = ResourcePoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ResourcePoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/pagers.py index c3edc8773997..e4182f457a01 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/base.py index 320d67ca1e22..c4ee6f39cbd0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/rest.py index bf616cd66dda..b02bb91e3d2f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -726,9 +726,7 @@ def __call__( Contains a list of resourcePolicies. """ - http_options = ( - _BaseResourcePoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseResourcePoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseResourcePoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2168,9 +2166,7 @@ def __call__( """ - http_options = ( - _BaseResourcePoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseResourcePoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/client.py index c3c3e3ed0f6f..fd133111be9d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RoutersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RoutersClient._read_environment_variables() + ) self._client_cert_source = RoutersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RoutersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/pagers.py index 3a1f4b19235e..3ff53a413d0b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -298,7 +298,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -374,7 +374,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/base.py index 49de36f89e42..6ac0a02949fc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/rest.py index 04225e37df70..595d501f7ead 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/client.py index 4b3c9047aee3..c76f307bf572 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RoutesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RoutesClient._read_environment_variables() + ) self._client_cert_source = RoutesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RoutesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/pagers.py index 2241ea1668f5..50a01ffc7658 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/base.py index 7773a31bcfea..74b44c34336c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/rest.py index 01472920e695..e06ca72f3695 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/client.py index c2bb5af62c3d..66ac255af6a5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class SecurityPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SecurityPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SecurityPoliciesTransport]] _transport_registry["rest"] = SecurityPoliciesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SecurityPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SecurityPoliciesClient._read_environment_variables() + ) self._client_cert_source = SecurityPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SecurityPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/pagers.py index 1cd5f58ab432..68548577ac05 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/base.py index 634f2406a6f9..d50fed195dc1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/rest.py index b8453c719529..1d6ef34505b3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1075,9 +1075,7 @@ def __call__( """ - http_options = ( - _BaseSecurityPoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseSecurityPoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseSecurityPoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2041,15 +2039,12 @@ def __call__( """ - http_options = ( - _BaseSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ) + http_options = _BaseSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_preconfigured_expression_sets( - request, metadata + request, metadata = ( + self._interceptor.pre_list_preconfigured_expression_sets( + request, metadata + ) ) transcoded_request = _BaseSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_transcoded_request( http_options, request @@ -2112,11 +2107,10 @@ def __call__( resp = self._interceptor.post_list_preconfigured_expression_sets(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_preconfigured_expression_sets_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_preconfigured_expression_sets_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2929,7 +2923,9 @@ def list_preconfigured_expression_sets( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListPreconfiguredExpressionSets(self._session, self._host, self._interceptor) # type: ignore + return self._ListPreconfiguredExpressionSets( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/client.py index fa5a7523c86a..ba23f823098e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class ServiceAttachmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ServiceAttachmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ServiceAttachmentsTransport]] _transport_registry["rest"] = ServiceAttachmentsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServiceAttachmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServiceAttachmentsClient._read_environment_variables() + ) self._client_cert_source = ServiceAttachmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServiceAttachmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/pagers.py index d6609012f48d..c00f14096bff 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/__init__.py index 636b3cbe6749..e75723ac4a42 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ServiceAttachmentsRestInterceptor, ServiceAttachmentsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ServiceAttachmentsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ServiceAttachmentsTransport]] _transport_registry["rest"] = ServiceAttachmentsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/base.py index 9fe265bcad06..df2a5ec597f9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/rest.py index 6896ad801898..e3f8fbc6a49d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -731,9 +731,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseServiceAttachmentsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1287,9 +1285,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseServiceAttachmentsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2027,9 +2023,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseServiceAttachmentsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2180,9 +2174,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/client.py index 2fcfcfbcb039..63a89a46643b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class SnapshotSettingsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SnapshotSettingsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SnapshotSettingsServiceTransport]] _transport_registry["rest"] = SnapshotSettingsServiceRestTransport def get_transport_class( @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SnapshotSettingsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SnapshotSettingsServiceClient._read_environment_variables() + ) self._client_cert_source = ( SnapshotSettingsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -646,8 +642,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SnapshotSettingsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/__init__.py index 83b20168d6c6..a3107dbdce8d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SnapshotSettingsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SnapshotSettingsServiceTransport]] _transport_registry["rest"] = SnapshotSettingsServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/base.py index 523ebb1fb4d9..49be42ce4452 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/rest.py index 2124043b9a85..9d4b27c86fd8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/client.py index e2f6dec0356d..5ad2a4bafe43 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SnapshotsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SnapshotsClient._read_environment_variables() + ) self._client_cert_source = SnapshotsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SnapshotsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/pagers.py index 045e3b89a4ca..d6820ab3c3b9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/base.py index 727323587797..acf7da137284 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/rest.py index 728b02c445ec..ec1792a67989 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/client.py index 271c0835adea..30b03bdb311c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class SslCertificatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SslCertificatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SslCertificatesTransport]] _transport_registry["rest"] = SslCertificatesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SslCertificatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SslCertificatesClient._read_environment_variables() + ) self._client_cert_source = SslCertificatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SslCertificatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/pagers.py index 382fe3f452cc..ad54f9da985e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/base.py index 7428f0d7a40b..d84b5339478b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/rest.py index fde3fa92eabe..4e3f3fb32cd4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -503,9 +503,7 @@ def __call__( """ - http_options = ( - _BaseSslCertificatesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseSslCertificatesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseSslCertificatesRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/client.py index a2cb79f39d7c..53a73f2fe598 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SslPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SslPoliciesClient._read_environment_variables() + ) self._client_cert_source = SslPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SslPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/pagers.py index 696f6ba9bf5c..718a3d568a90 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/base.py index 2e8e2bc96aa3..9d9e52c29f10 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/rest.py index c03e022bef21..158c35462ee0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1403,9 +1403,7 @@ def __call__( """ - http_options = ( - _BaseSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() - ) + http_options = _BaseSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() request, metadata = self._interceptor.pre_list_available_features( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/client.py index 7eb714abe5ec..5251193ccfe1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class StoragePoolTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[StoragePoolTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[StoragePoolTypesTransport]] _transport_registry["rest"] = StoragePoolTypesRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = StoragePoolTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + StoragePoolTypesClient._read_environment_variables() + ) self._client_cert_source = StoragePoolTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(StoragePoolTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/pagers.py index 65757b446192..95cd3a9ce073 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/base.py index a7cf3ce6dcee..99345ae052fb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/rest.py index 6f16c09fd587..46eb1d60bdef 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -395,9 +395,7 @@ def __call__( """ - http_options = ( - _BaseStoragePoolTypesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseStoragePoolTypesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseStoragePoolTypesRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/client.py index e97c0768892b..9e9eea8e6aa9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = StoragePoolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + StoragePoolsClient._read_environment_variables() + ) self._client_cert_source = StoragePoolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(StoragePoolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/pagers.py index c64bde03e79f..bfde7f6bece8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/base.py index 5ffcd009a974..6a959892da1f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/rest.py index c7c1cbb6f2a5..6a04daa55581 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -2175,9 +2175,7 @@ def __call__( """ - http_options = ( - _BaseStoragePoolsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseStoragePoolsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/client.py index b40a3c7c71f3..27eb1ab43044 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SubnetworksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SubnetworksClient._read_environment_variables() + ) self._client_cert_source = SubnetworksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SubnetworksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/pagers.py index 86d784c5d0e9..fb1edf7cc95b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/base.py index 326c909b4149..306ecc828969 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/rest.py index e646703c6987..9aa810d40132 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -2688,9 +2688,7 @@ def __call__( """ - http_options = ( - _BaseSubnetworksRestTransport._BaseSetPrivateIpGoogleAccess._get_http_options() - ) + http_options = _BaseSubnetworksRestTransport._BaseSetPrivateIpGoogleAccess._get_http_options() request, metadata = self._interceptor.pre_set_private_ip_google_access( request, metadata @@ -2842,9 +2840,7 @@ def __call__( """ - http_options = ( - _BaseSubnetworksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSubnetworksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -3023,7 +3019,9 @@ def set_private_ip_google_access( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetPrivateIpGoogleAccess(self._session, self._host, self._interceptor) # type: ignore + return self._SetPrivateIpGoogleAccess( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/client.py index 9be09d96caaf..6741fe9af107 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class TargetGrpcProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetGrpcProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetGrpcProxiesTransport]] _transport_registry["rest"] = TargetGrpcProxiesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetGrpcProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetGrpcProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetGrpcProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetGrpcProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/pagers.py index 59a40175c87e..5ade28fa849b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/base.py index 6805b9cd46dc..3ac0cac1b64b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/rest.py index 5b3568838ea1..72b5392fac40 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/client.py index 72d78b572b5f..969aa46d8963 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class TargetHttpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetHttpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetHttpProxiesTransport]] _transport_registry["rest"] = TargetHttpProxiesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetHttpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetHttpProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetHttpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetHttpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/pagers.py index da9f1f53bfb5..482edc7a1be6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/base.py index 2a139e3913be..09e0e587ef46 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/rest.py index eeec1766acb4..b9d50d3930e8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -612,9 +612,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpProxiesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetHttpProxiesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetHttpProxiesRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/client.py index 634641239282..0eb9acf8bedc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class TargetHttpsProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetHttpsProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetHttpsProxiesTransport]] _transport_registry["rest"] = TargetHttpsProxiesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetHttpsProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetHttpsProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetHttpsProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetHttpsProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/pagers.py index 550a0c9e0688..e78ec51d0d36 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/__init__.py index b590b838910b..5aaf31dbadf8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import TargetHttpsProxiesRestInterceptor, TargetHttpsProxiesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[TargetHttpsProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[TargetHttpsProxiesTransport]] _transport_registry["rest"] = TargetHttpsProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/base.py index e356ced53bee..f280f5fa602c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/rest.py index 0044bf9203be..d3ca9f2b0845 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -837,9 +837,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetHttpsProxiesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1882,9 +1880,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetCertificateMap._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetCertificateMap._get_http_options() request, metadata = self._interceptor.pre_set_certificate_map( request, metadata @@ -2065,9 +2061,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetQuicOverride._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetQuicOverride._get_http_options() request, metadata = self._interceptor.pre_set_quic_override( request, metadata @@ -2248,9 +2242,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() request, metadata = self._interceptor.pre_set_ssl_certificates( request, metadata @@ -2433,9 +2425,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetSslPolicy._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetSslPolicy._get_http_options() request, metadata = self._interceptor.pre_set_ssl_policy(request, metadata) transcoded_request = _BaseTargetHttpsProxiesRestTransport._BaseSetSslPolicy._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/client.py index 002c86b16232..f03f5f97885c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class TargetInstancesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetInstancesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetInstancesTransport]] _transport_registry["rest"] = TargetInstancesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetInstancesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetInstancesClient._read_environment_variables() + ) self._client_cert_source = TargetInstancesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetInstancesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/pagers.py index ab03cb70ce5a..ba1123500b8b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/base.py index 69ff17fe2d3d..97c21f24cdf1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/rest.py index 1ab1884569ce..956c74cfa222 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -619,9 +619,7 @@ def __call__( """ - http_options = ( - _BaseTargetInstancesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetInstancesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetInstancesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1463,9 +1461,7 @@ def __call__( """ - http_options = ( - _BaseTargetInstancesRestTransport._BaseSetSecurityPolicy._get_http_options() - ) + http_options = _BaseTargetInstancesRestTransport._BaseSetSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_security_policy( request, metadata @@ -1618,9 +1614,7 @@ def __call__( """ - http_options = ( - _BaseTargetInstancesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetInstancesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/client.py index ee5cdd52c3b8..d7cc7b392810 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetPoolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetPoolsClient._read_environment_variables() + ) self._client_cert_source = TargetPoolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetPoolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/pagers.py index 758ecbcead71..9ed7ccba3bf6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/base.py index d47dba4a25c2..97cac8586530 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/rest.py index e330e6705aba..d09add05306a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -2996,9 +2996,7 @@ def __call__( """ - http_options = ( - _BaseTargetPoolsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetPoolsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/client.py index 71e726e0790b..be8561d63bd0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class TargetSslProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetSslProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetSslProxiesTransport]] _transport_registry["rest"] = TargetSslProxiesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetSslProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetSslProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetSslProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetSslProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/pagers.py index 8dcac2c33648..36630e5ae0f0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/base.py index e811c0833a42..922dd832957e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/rest.py index 649fcad5c4f4..a60f611ccc45 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1481,9 +1481,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetBackendService._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetBackendService._get_http_options() request, metadata = self._interceptor.pre_set_backend_service( request, metadata @@ -1664,9 +1662,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetCertificateMap._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetCertificateMap._get_http_options() request, metadata = self._interceptor.pre_set_certificate_map( request, metadata @@ -1846,9 +1842,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetProxyHeader._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetProxyHeader._get_http_options() request, metadata = self._interceptor.pre_set_proxy_header( request, metadata @@ -2029,9 +2023,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetSslCertificates._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetSslCertificates._get_http_options() request, metadata = self._interceptor.pre_set_ssl_certificates( request, metadata @@ -2364,9 +2356,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/client.py index ba366bea0b58..71c1d8009e71 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class TargetTcpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetTcpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetTcpProxiesTransport]] _transport_registry["rest"] = TargetTcpProxiesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetTcpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetTcpProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetTcpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetTcpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/pagers.py index 410a80d1a90f..ae122b822dd1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/base.py index 075fad91cd29..bac20c3ec033 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/rest.py index 49162fed56bc..688476078e26 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -674,9 +674,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetTcpProxiesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1519,9 +1517,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseSetBackendService._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseSetBackendService._get_http_options() request, metadata = self._interceptor.pre_set_backend_service( request, metadata @@ -1701,9 +1697,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseSetProxyHeader._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseSetProxyHeader._get_http_options() request, metadata = self._interceptor.pre_set_proxy_header( request, metadata @@ -1856,9 +1850,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/client.py index e41ea419f33f..1f10bd1e58c4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -79,9 +79,7 @@ class TargetVpnGatewaysClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetVpnGatewaysTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetVpnGatewaysTransport]] _transport_registry["rest"] = TargetVpnGatewaysRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetVpnGatewaysClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetVpnGatewaysClient._read_environment_variables() + ) self._client_cert_source = TargetVpnGatewaysClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetVpnGatewaysTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/pagers.py index 3b4adee698ab..6dfc5d6939f4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/base.py index 9c37e25f23ec..a7e85e6c4f03 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/rest.py index 08d2f3974305..f7c630802340 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -559,9 +559,7 @@ def __call__( """ - http_options = ( - _BaseTargetVpnGatewaysRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetVpnGatewaysRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetVpnGatewaysRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/client.py index 42aa032c16a8..36406d9b32dc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UrlMapsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UrlMapsClient._read_environment_variables() + ) self._client_cert_source = UrlMapsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UrlMapsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/pagers.py index fbcb8fc69c76..fa7c7b8b2ac6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/base.py index e0ae6ca2adb1..4ea8af1d6b2a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/rest.py index 8687843d40fd..68e1e5889801 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/client.py index 4ea268ec455b..7615250629f0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VpnGatewaysClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VpnGatewaysClient._read_environment_variables() + ) self._client_cert_source = VpnGatewaysClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VpnGatewaysTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/pagers.py index db7f0f883f45..539288f839d2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/base.py index a223acb75ab4..20002bbe7670 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/rest.py index fac4feec5c22..d13bc734e1d4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -1803,9 +1803,7 @@ def __call__( """ - http_options = ( - _BaseVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/client.py index c9f1eeb35211..329c90ca9a88 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VpnTunnelsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VpnTunnelsClient._read_environment_variables() + ) self._client_cert_source = VpnTunnelsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VpnTunnelsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/pagers.py index a06aac7fd515..63c09bdda159 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/base.py index d2f3aa9a5806..8db4da007ddc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/rest.py index 23208dc74866..85a3afda5454 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/client.py index 43d24b3bc43f..f1c58fdbae24 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = WireGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + WireGroupsClient._read_environment_variables() + ) self._client_cert_source = WireGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(WireGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/pagers.py index c16f3df4f6b6..d35bdff316f3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/base.py index 91340e95c813..590939a74b32 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/rest.py index fd0aef83e038..4856566087e9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/client.py index 990a64d94a18..9fa6761b1149 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class ZoneOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ZoneOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ZoneOperationsTransport]] _transport_registry["rest"] = ZoneOperationsRestTransport def get_transport_class( @@ -597,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ZoneOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ZoneOperationsClient._read_environment_variables() + ) self._client_cert_source = ZoneOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -636,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ZoneOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/pagers.py index e8b1d84754d3..dd227b7d6bc8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/base.py index 80965b5546ee..90891e2672c0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/rest.py index a98b11036cbf..baf01a2c1442 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/client.py index 7284ce0f3003..cddbeb60bdce 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ZonesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ZonesClient._read_environment_variables() + ) self._client_cert_source = ZonesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ZonesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/pagers.py index c1391841b51e..f5cb243fe1df 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/base.py index 064c98dc2d99..4fa33e5f4737 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/rest.py index 200bbef99bfc..bc3a0725be75 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/types/compute.py b/packages/google-cloud-compute/google/cloud/compute_v1/types/compute.py index 9e4171d5a623..16980e7e9f8e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/types/compute.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/types/compute.py @@ -2146,6 +2146,7 @@ class State(proto.Enum): This value has been deprecated and is no longer used. """ + UNDEFINED_STATE = 0 AVAILABLE = 442079913 DEGRADED = 396890926 @@ -2622,6 +2623,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -2642,6 +2644,7 @@ class Type(proto.Enum): ONE_TO_ONE_NAT (84090205): No description available. """ + UNDEFINED_TYPE = 0 DIRECT_IPV6 = 4397213 ONE_TO_ONE_NAT = 84090205 @@ -4418,6 +4421,7 @@ class AddressType(proto.Enum): UNSPECIFIED_TYPE (53933922): No description available. """ + UNDEFINED_ADDRESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -4438,6 +4442,7 @@ class IpVersion(proto.Enum): UNSPECIFIED_VERSION (21850000): No description available. """ + UNDEFINED_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -4458,6 +4463,7 @@ class Ipv6EndpointType(proto.Enum): VM (2743): Reserved IPv6 address can be used on VM. """ + UNDEFINED_IPV6_ENDPOINT_TYPE = 0 NETLB = 74173363 VM = 2743 @@ -4487,6 +4493,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -4560,6 +4567,7 @@ class Purpose(proto.Enum): VPC_PEERING (400800170): IP range for peer networks. """ + UNDEFINED_PURPOSE = 0 DNS_RESOLVER = 476114556 GCE_ENDPOINT = 230515243 @@ -4589,6 +4597,7 @@ class Status(proto.Enum): RESERVING (514587225): Address is being reserved. """ + UNDEFINED_STATUS = 0 IN_USE = 17393485 RESERVED = 432241448 @@ -4960,6 +4969,7 @@ class PerformanceMonitoringUnit(proto.Enum): STANDARD (484642493): Most documented core/L2 events. """ + UNDEFINED_PERFORMANCE_MONITORING_UNIT = 0 ARCHITECTURAL = 155113693 ENHANCED = 476873590 @@ -11870,6 +11880,7 @@ class Views(proto.Enum): WITH_UTILIZATION (504090633): Utilization data is included in the response. """ + UNDEFINED_VIEWS = 0 DEFAULT = 115302945 WITH_UTILIZATION = 504090633 @@ -13690,6 +13701,7 @@ class VmFamily(proto.Enum): VM_FAMILY_CLOUD_TPU_POD_SLICE_TPU7X (485271888): No description available. """ + UNDEFINED_VM_FAMILY = 0 VM_FAMILY_CLOUD_TPU_DEVICE_CT3 = 42845948 VM_FAMILY_CLOUD_TPU_LITE_DEVICE_CT5L = 108020067 @@ -13717,6 +13729,7 @@ class WorkloadType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_WORKLOAD_TYPE = 0 BATCH = 62971674 SERVING = 17781740 @@ -13829,6 +13842,7 @@ class ServiceShareType(proto.Enum): SERVICE_SHARE_TYPE_UNSPECIFIED (279057148): No description available. """ + UNDEFINED_SERVICE_SHARE_TYPE = 0 ALLOW_ALL = 475536235 DISALLOW_ALL = 277786301 @@ -13932,6 +13946,7 @@ class HealthStatus(proto.Enum): The health status of the reservation is unspecified. """ + UNDEFINED_HEALTH_STATUS = 0 DEGRADED = 396890926 HEALTHY = 439801213 @@ -14020,6 +14035,7 @@ class Interface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -14865,6 +14881,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -14887,6 +14904,7 @@ class Interface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -14909,6 +14927,7 @@ class Mode(proto.Enum): virtual machine at a time can be attached to a disk in read-write mode. """ + UNDEFINED_MODE = 0 READ_ONLY = 91950261 READ_WRITE = 173607894 @@ -14928,6 +14947,7 @@ class SavedState(proto.Enum): PRESERVED (254159736): Disk state has been preserved. """ + UNDEFINED_SAVED_STATE = 0 DISK_SAVED_STATE_UNSPECIFIED = 391290831 PRESERVED = 254159736 @@ -14945,6 +14965,7 @@ class Type(proto.Enum): SCRATCH (496778970): No description available. """ + UNDEFINED_TYPE = 0 PERSISTENT = 460683927 SCRATCH = 496778970 @@ -15279,6 +15300,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -15302,6 +15324,7 @@ class OnUpdateAction(proto.Enum): Use the existing disk, this is the default behaviour. """ + UNDEFINED_ON_UPDATE_ACTION = 0 RECREATE_DISK = 494767853 RECREATE_DISK_IF_SOURCE_CHANGED = 398099712 @@ -15551,6 +15574,7 @@ class LogType(proto.Enum): LOG_TYPE_UNSPECIFIED (154527053): Default case. Should never be this. """ + UNDEFINED_LOG_TYPE = 0 ADMIN_READ = 128951462 DATA_READ = 305224971 @@ -15735,6 +15759,7 @@ class Status(proto.Enum): Autoscaler backend hasn't read new/updated configuration """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 DELETING = 528602024 @@ -15782,13 +15807,13 @@ class Status(proto.Enum): number=138946292, optional=True, ) - scaling_schedule_status: MutableMapping[ - str, "ScalingScheduleStatus" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=465950178, - message="ScalingScheduleStatus", + scaling_schedule_status: MutableMapping[str, "ScalingScheduleStatus"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=465950178, + message="ScalingScheduleStatus", + ) ) self_link: str = proto.Field( proto.STRING, @@ -16181,6 +16206,7 @@ class Type(proto.Enum): autoscalers: in at least one of the zones you're using there is a resource stockout. """ + UNDEFINED_TYPE = 0 ALL_INSTANCES_UNHEALTHY = 404965477 BACKEND_SERVICE_DOES_NOT_EXIST = 191417626 @@ -16360,6 +16386,7 @@ class Mode(proto.Enum): Automatically create VMs according to the policy, but do not scale the MIG in. """ + UNDEFINED_MODE = 0 OFF = 78159 ON = 2527 @@ -16413,13 +16440,13 @@ class Mode(proto.Enum): optional=True, message="AutoscalingPolicyScaleInControl", ) - scaling_schedules: MutableMapping[ - str, "AutoscalingPolicyScalingSchedule" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=355416580, - message="AutoscalingPolicyScalingSchedule", + scaling_schedules: MutableMapping[str, "AutoscalingPolicyScalingSchedule"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=355416580, + message="AutoscalingPolicyScalingSchedule", + ) ) @@ -16485,6 +16512,7 @@ class PredictiveMethod(proto.Enum): by monitoring daily and weekly load patterns and scaling out ahead of anticipated demand. """ + UNDEFINED_PREDICTIVE_METHOD = 0 NONE = 2402104 OPTIMIZE_AVAILABILITY = 11629437 @@ -16624,6 +16652,7 @@ class UtilizationTargetType(proto.Enum): the utilization target value to perform autoscaling. """ + UNDEFINED_UTILIZATION_TARGET_TYPE = 0 DELTA_PER_MINUTE = 87432861 DELTA_PER_SECOND = 255180029 @@ -16996,6 +17025,7 @@ class BalancingMode(proto.Enum): UTILIZATION (157008386): Balance based on the backend utilization. """ + UNDEFINED_BALANCING_MODE = 0 CONNECTION = 246311646 CUSTOM_METRICS = 331575765 @@ -17026,6 +17056,7 @@ class Preference(proto.Enum): PREFERRED (418847841): Traffic will be sent to this backend first. """ + UNDEFINED_PREFERENCE = 0 DEFAULT = 115302945 PREFERENCE_UNSPECIFIED = 496219571 @@ -17215,6 +17246,7 @@ class CompressionMode(proto.Enum): responses cached by Cloud CDN will not be served to clients. """ + UNDEFINED_COMPRESSION_MODE = 0 AUTOMATIC = 165298699 DISABLED = 516696700 @@ -17235,6 +17267,7 @@ class LoadBalancingScheme(proto.Enum): Signifies that this will be used for internal Application Load Balancers. """ + UNDEFINED_LOAD_BALANCING_SCHEME = 0 INTERNAL_MANAGED = 37350397 @@ -17519,6 +17552,7 @@ class CacheMode(proto.Enum): performance and increasing load on the origin server. """ + UNDEFINED_CACHE_MODE = 0 CACHE_ALL_STATIC = 355027945 FORCE_CACHE_ALL = 486026928 @@ -18485,6 +18519,7 @@ class CompressionMode(proto.Enum): responses cached by Cloud CDN will not be served to clients. """ + UNDEFINED_COMPRESSION_MODE = 0 AUTOMATIC = 165298699 DISABLED = 516696700 @@ -18518,6 +18553,7 @@ class ExternalManagedMigrationState(proto.Enum): TEST_BY_PERCENTAGE (513738389): No description available. """ + UNDEFINED_EXTERNAL_MANAGED_MIGRATION_STATE = 0 PREPARE = 399612135 TEST_ALL_TRAFFIC = 79728882 @@ -18585,6 +18621,7 @@ class IpAddressSelectionPolicy(proto.Enum): IPv6 address over its IPv4 address (provided there is a healthy IPv6 address). """ + UNDEFINED_IP_ADDRESS_SELECTION_POLICY = 0 IPV4_ONLY = 22373798 IPV6_ONLY = 79632100 @@ -18623,6 +18660,7 @@ class LoadBalancingScheme(proto.Enum): INVALID_LOAD_BALANCING_SCHEME (275352060): No description available. """ + UNDEFINED_LOAD_BALANCING_SCHEME = 0 EXTERNAL = 35607499 EXTERNAL_MANAGED = 512006923 @@ -18754,6 +18792,7 @@ class LocalityLbPolicy(proto.Enum): to use for computing the weights are specified via the customMetrics fields. """ + UNDEFINED_LOCALITY_LB_POLICY = 0 INVALID_LB_POLICY = 323318707 LEAST_REQUEST = 46604921 @@ -18803,6 +18842,7 @@ class Protocol(proto.Enum): protocol, it can be used with any L3/L4 Forwarding Rules. """ + UNDEFINED_PROTOCOL = 0 GRPC = 2196510 H2C = 70809 @@ -18880,6 +18920,7 @@ class SessionAffinity(proto.Enum): same backend VM while that VM remains healthy, as long as the cookie has not expired. """ + UNDEFINED_SESSION_AFFINITY = 0 CLIENT_IP = 345665051 CLIENT_IP_NO_DESTINATION = 106122516 @@ -19448,6 +19489,7 @@ class CacheMode(proto.Enum): performance and increasing load on the origin server. """ + UNDEFINED_CACHE_MODE = 0 CACHE_ALL_STATIC = 355027945 FORCE_CACHE_ALL = 486026928 @@ -19697,6 +19739,7 @@ class ConnectionPersistenceOnUnhealthyBackends(proto.Enum): NEVER_PERSIST (138646241): No description available. """ + UNDEFINED_CONNECTION_PERSISTENCE_ON_UNHEALTHY_BACKENDS = 0 ALWAYS_PERSIST = 38400900 DEFAULT_FOR_PROTOCOL = 145265356 @@ -19731,6 +19774,7 @@ class TrackingMode(proto.Enum): PER_SESSION (182099252): No description available. """ + UNDEFINED_TRACKING_MODE = 0 INVALID_TRACKING_MODE = 49234371 PER_CONNECTION = 85162848 @@ -20100,6 +20144,7 @@ class FastIPMove(proto.Enum): GARP_RA (527352630): No description available. """ + UNDEFINED_FAST_I_P_MOVE = 0 DISABLED = 516696700 GARP_RA = 527352630 @@ -20608,6 +20653,7 @@ class Name(proto.Enum): to use for computing the weights are specified via the customMetrics fields. """ + UNDEFINED_NAME = 0 INVALID_LB_POLICY = 323318707 LEAST_REQUEST = 46604921 @@ -20688,6 +20734,7 @@ class OptionalMode(proto.Enum): INCLUDE_ALL_OPTIONAL (535606965): All optional fields. """ + UNDEFINED_OPTIONAL_MODE = 0 CUSTOM = 388595569 EXCLUDE_ALL_OPTIONAL = 168636099 @@ -20814,6 +20861,7 @@ class Spillover(proto.Enum): ZONAL_AFFINITY_STAY_WITHIN_ZONE (12177782): No description available. """ + UNDEFINED_SPILLOVER = 0 ZONAL_AFFINITY_DISABLED = 230207960 ZONAL_AFFINITY_SPILL_CROSS_ZONE = 251048410 @@ -20928,12 +20976,12 @@ class BackendServiceTlsSettings(proto.Message): number=114030, optional=True, ) - subject_alt_names: MutableSequence[ - "BackendServiceTlsSettingsSubjectAltName" - ] = proto.RepeatedField( - proto.MESSAGE, - number=330029535, - message="BackendServiceTlsSettingsSubjectAltName", + subject_alt_names: MutableSequence["BackendServiceTlsSettingsSubjectAltName"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=330029535, + message="BackendServiceTlsSettingsSubjectAltName", + ) ) @@ -21155,6 +21203,7 @@ class Diagnostic(proto.Enum): REVERSE_CONCATENATED_PATH_DOWN (479337129): No description available. """ + UNDEFINED_DIAGNOSTIC = 0 ADMINISTRATIVELY_DOWN = 121685798 CONCATENATED_PATH_DOWN = 26186892 @@ -21186,6 +21235,7 @@ class State(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATE = 0 ADMIN_DOWN = 128544690 DOWN = 2104482 @@ -21364,6 +21414,7 @@ class BfdSessionInitializationMode(proto.Enum): PASSIVE (462813959): No description available. """ + UNDEFINED_BFD_SESSION_INITIALIZATION_MODE = 0 ACTIVE = 314733318 DISABLED = 516696700 @@ -21401,6 +21452,7 @@ class LocalDiagnostic(proto.Enum): REVERSE_CONCATENATED_PATH_DOWN (479337129): No description available. """ + UNDEFINED_LOCAL_DIAGNOSTIC = 0 ADMINISTRATIVELY_DOWN = 121685798 CONCATENATED_PATH_DOWN = 26186892 @@ -21432,6 +21484,7 @@ class LocalState(proto.Enum): UP (2715): No description available. """ + UNDEFINED_LOCAL_STATE = 0 ADMIN_DOWN = 128544690 DOWN = 2104482 @@ -21588,6 +21641,7 @@ class Origin(proto.Enum): BGP_ORIGIN_INCOMPLETE (452839811): No description available. """ + UNDEFINED_ORIGIN = 0 BGP_ORIGIN_EGP = 378906473 BGP_ORIGIN_IGP = 378910317 @@ -21653,6 +21707,7 @@ class Type(proto.Enum): AS_PATH_TYPE_SET (302584650): No description available. """ + UNDEFINED_TYPE = 0 AS_PATH_TYPE_SEQUENCE = 362887609 AS_PATH_TYPE_SET = 302584650 @@ -22201,6 +22256,7 @@ class Status(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DONE = 2104194 @@ -22627,12 +22683,12 @@ class CalendarModeAdviceResponse(proto.Message): their obtainability and minimize cost. """ - recommendations: MutableSequence[ - "CalendarModeRecommendation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=324515802, - message="CalendarModeRecommendation", + recommendations: MutableSequence["CalendarModeRecommendation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=324515802, + message="CalendarModeRecommendation", + ) ) @@ -22677,13 +22733,13 @@ class CalendarModeRecommendation(proto.Message): correspond to keys specified in the request. """ - recommendations_per_spec: MutableMapping[ - str, "FutureResourcesRecommendation" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=61331554, - message="FutureResourcesRecommendation", + recommendations_per_spec: MutableMapping[str, "FutureResourcesRecommendation"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=61331554, + message="FutureResourcesRecommendation", + ) ) @@ -23302,6 +23358,7 @@ class Category(proto.Enum): MACHINE (469553191): No description available. """ + UNDEFINED_CATEGORY = 0 CATEGORY_UNSPECIFIED = 509189462 LICENSE = 347869217 @@ -23327,6 +23384,7 @@ class Plan(proto.Enum): TWELVE_MONTH (173083962): No description available. """ + UNDEFINED_PLAN = 0 INVALID = 530283991 THIRTY_SIX_MONTH = 266295942 @@ -23355,6 +23413,7 @@ class Status(proto.Enum): NOT_YET_ACTIVE (20607337): No description available. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 CANCELLED = 41957681 @@ -23472,6 +23531,7 @@ class Type(proto.Enum): ``optional Type type`` definition. This ensures that the public documentation displays the new enum Type. """ + UNDEFINED_TYPE = 0 ACCELERATOR_OPTIMIZED = 280848403 ACCELERATOR_OPTIMIZED_A3 = 158574526 @@ -23876,6 +23936,7 @@ class ConfidentialInstanceType(proto.Enum): TDX (82920): Intel Trust Domain eXtension. """ + UNDEFINED_CONFIDENTIAL_INSTANCE_TYPE = 0 CONFIDENTIAL_INSTANCE_TYPE_UNSPECIFIED = 115021829 SEV = 81988 @@ -30335,6 +30396,7 @@ class State(proto.Enum): OBSOLETE (66532761): No description available. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DELETED = 120962041 @@ -31213,6 +31275,7 @@ class AccessMode(proto.Enum): The default AccessMode, means the disk can be attached to single instance in RW mode. """ + UNDEFINED_ACCESS_MODE = 0 READ_ONLY_MANY = 63460265 READ_WRITE_MANY = 488743208 @@ -31233,6 +31296,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -31268,6 +31332,7 @@ class Status(proto.Enum): Disk is currently unavailable and cannot be accessed, attached or detached. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -31292,13 +31357,13 @@ class Status(proto.Enum): optional=True, message="DiskAsyncReplication", ) - async_secondary_disks: MutableMapping[ - str, "DiskAsyncReplicationList" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=322925608, - message="DiskAsyncReplicationList", + async_secondary_disks: MutableMapping[str, "DiskAsyncReplicationList"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=322925608, + message="DiskAsyncReplicationList", + ) ) creation_timestamp: str = proto.Field( proto.STRING, @@ -31818,6 +31883,7 @@ class InstantiateFrom(proto.Enum): boot disk, additional read-write disks. """ + UNDEFINED_INSTANTIATE_FROM = 0 ATTACH_READ_ONLY = 513775419 BLANK = 63281460 @@ -32053,6 +32119,7 @@ class State(proto.Enum): STOPPING (350791796): Replication is stopping. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 CREATED = 135924424 @@ -32623,6 +32690,7 @@ class TargetShape(proto.Enum): between any two zones. Recommended for highly available serving workloads. """ + UNDEFINED_TARGET_SHAPE = 0 ANY = 64972 ANY_SINGLE_ZONE = 61100880 @@ -33048,6 +33116,7 @@ class Type(proto.Enum): The peering route corresponding to subnetwork range. """ + UNDEFINED_TYPE = 0 DYNAMIC_PEERING_ROUTE = 469794858 STATIC_PEERING_ROUTE = 473407545 @@ -33451,6 +33520,7 @@ class RedundancyType(proto.Enum): addresses that are redundant with eatch other. """ + UNDEFINED_REDUNDANCY_TYPE = 0 FOUR_IPS_REDUNDANCY = 520087913 SINGLE_IP_INTERNALLY_REDUNDANT = 133914873 @@ -33684,6 +33754,7 @@ class FileType(proto.Enum): X509 (2674086): No description available. """ + UNDEFINED_FILE_TYPE = 0 BIN = 65767 UNDEFINED = 137851184 @@ -33905,6 +33976,7 @@ class Direction(proto.Enum): Indicates that firewall should apply to incoming traffic. """ + UNDEFINED_DIRECTION = 0 EGRESS = 432880501 INGRESS = 516931221 @@ -34118,6 +34190,7 @@ class Metadata(proto.Enum): INCLUDE_ALL_METADATA (164619908): No description available. """ + UNDEFINED_METADATA = 0 EXCLUDE_ALL_METADATA = 334519954 INCLUDE_ALL_METADATA = 164619908 @@ -34362,6 +34435,7 @@ class PolicyType(proto.Enum): VPC_POLICY (74319208): No description available. """ + UNDEFINED_POLICY_TYPE = 0 RDMA_ROCE_POLICY = 148757145 VPC_POLICY = 74319208 @@ -34703,6 +34777,7 @@ class Direction(proto.Enum): INGRESS (516931221): No description available. """ + UNDEFINED_DIRECTION = 0 EGRESS = 432880501 INGRESS = 516931221 @@ -34767,12 +34842,12 @@ class Direction(proto.Enum): proto.STRING, number=528230647, ) - target_secure_tags: MutableSequence[ - "FirewallPolicyRuleSecureTag" - ] = proto.RepeatedField( - proto.MESSAGE, - number=468132403, - message="FirewallPolicyRuleSecureTag", + target_secure_tags: MutableSequence["FirewallPolicyRuleSecureTag"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=468132403, + message="FirewallPolicyRuleSecureTag", + ) ) target_service_accounts: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -34930,6 +35005,7 @@ class DestNetworkContext(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_DEST_NETWORK_CONTEXT = 0 class DestNetworkType(proto.Enum): @@ -34950,6 +35026,7 @@ class DestNetworkType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_DEST_NETWORK_TYPE = 0 class SrcNetworkContext(proto.Enum): @@ -34972,6 +35049,7 @@ class SrcNetworkContext(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_SRC_NETWORK_CONTEXT = 0 class SrcNetworkType(proto.Enum): @@ -34994,6 +35072,7 @@ class SrcNetworkType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_SRC_NETWORK_TYPE = 0 dest_address_groups: MutableSequence[str] = proto.RepeatedField( @@ -35026,12 +35105,12 @@ class SrcNetworkType(proto.Enum): proto.STRING, number=119896492, ) - layer4_configs: MutableSequence[ - "FirewallPolicyRuleMatcherLayer4Config" - ] = proto.RepeatedField( - proto.MESSAGE, - number=373534261, - message="FirewallPolicyRuleMatcherLayer4Config", + layer4_configs: MutableSequence["FirewallPolicyRuleMatcherLayer4Config"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=373534261, + message="FirewallPolicyRuleMatcherLayer4Config", + ) ) src_address_groups: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -35063,12 +35142,12 @@ class SrcNetworkType(proto.Enum): proto.STRING, number=99086742, ) - src_secure_tags: MutableSequence[ - "FirewallPolicyRuleSecureTag" - ] = proto.RepeatedField( - proto.MESSAGE, - number=508791302, - message="FirewallPolicyRuleSecureTag", + src_secure_tags: MutableSequence["FirewallPolicyRuleSecureTag"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=508791302, + message="FirewallPolicyRuleSecureTag", + ) ) src_threat_intelligences: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -35147,6 +35226,7 @@ class State(proto.Enum): INEFFECTIVE (304458242): No description available. """ + UNDEFINED_STATE = 0 EFFECTIVE = 244201863 INEFFECTIVE = 304458242 @@ -35804,6 +35884,7 @@ class ExternalManagedBackendBucketMigrationState(proto.Enum): TEST_BY_PERCENTAGE (513738389): No description available. """ + UNDEFINED_EXTERNAL_MANAGED_BACKEND_BUCKET_MIGRATION_STATE = 0 PREPARE = 399612135 TEST_ALL_TRAFFIC = 79728882 @@ -35838,6 +35919,7 @@ class IPProtocolEnum(proto.Enum): UDP (83873): No description available. """ + UNDEFINED_I_P_PROTOCOL_ENUM = 0 AH = 2087 ESP = 68962 @@ -35862,6 +35944,7 @@ class IpVersion(proto.Enum): UNSPECIFIED_VERSION (21850000): No description available. """ + UNDEFINED_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -35890,6 +35973,7 @@ class LoadBalancingScheme(proto.Enum): INVALID (530283991): No description available. """ + UNDEFINED_LOAD_BALANCING_SCHEME = 0 EXTERNAL = 35607499 EXTERNAL_MANAGED = 512006923 @@ -35927,6 +36011,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -35961,6 +36046,7 @@ class PscConnectionStatus(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_PSC_CONNECTION_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -36592,6 +36678,7 @@ class DeploymentType(proto.Enum): DEPLOYMENT_TYPE_UNSPECIFIED (234847180): No description available. """ + UNDEFINED_DEPLOYMENT_TYPE = 0 DENSE = 64932607 DEPLOYMENT_TYPE_UNSPECIFIED = 234847180 @@ -36611,6 +36698,7 @@ class PlanningStatus(proto.Enum): Future Reservation has been submitted for evaluation by GCP. """ + UNDEFINED_PLANNING_STATUS = 0 DRAFT = 65307009 PLANNING_STATUS_UNSPECIFIED = 252728940 @@ -36636,6 +36724,7 @@ class ReservationMode(proto.Enum): RESERVATION_MODE_UNSPECIFIED (233810606): No description available. """ + UNDEFINED_RESERVATION_MODE = 0 CALENDAR = 67431230 DEFAULT = 115302945 @@ -36658,6 +36747,7 @@ class SchedulingType(proto.Enum): reservation. Instead, each instance has its own maintenance window. """ + UNDEFINED_SCHEDULING_TYPE = 0 GROUPED = 474540862 GROUP_MAINTENANCE_TYPE_UNSPECIFIED = 447183678 @@ -36843,6 +36933,7 @@ class CommitmentPlan(proto.Enum): TWELVE_MONTH (173083962): No description available. """ + UNDEFINED_COMMITMENT_PLAN = 0 INVALID = 530283991 THIRTY_SIX_MONTH = 266295942 @@ -36866,6 +36957,7 @@ class PreviousCommitmentTerms(proto.Enum): No changes to associated parents Committed Used Discount(s) terms. """ + UNDEFINED_PREVIOUS_COMMITMENT_TERMS = 0 EXTEND = 448639770 PREVIOUSCOMMITMENTTERM_UNSPECIFIED = 98482448 @@ -37009,6 +37101,7 @@ class AmendmentStatus(proto.Enum): AMENDMENT_STATUS_UNSPECIFIED (412250332): No description available. """ + UNDEFINED_AMENDMENT_STATUS = 0 AMENDMENT_APPROVED = 150573001 AMENDMENT_DECLINED = 70395200 @@ -37064,6 +37157,7 @@ class ProcurementStatus(proto.Enum): being created to provide total_count reserved instance slots. This state will not persist past start_time + 24h. """ + UNDEFINED_PROCUREMENT_STATUS = 0 APPROVED = 357258935 CANCELLED = 41957681 @@ -37248,6 +37342,7 @@ class ProcurementStatus(proto.Enum): being created to provide total_count reserved instance slots. This state will not persist past start_time + 24h. """ + UNDEFINED_PROCUREMENT_STATUS = 0 APPROVED = 357258935 CANCELLED = 41957681 @@ -37663,6 +37758,7 @@ class RecommendationType(proto.Enum): RECOMMENDATION_TYPE_UNSPECIFIED (140641624): Default value, unused. """ + UNDEFINED_RECOMMENDATION_TYPE = 0 FUTURE_RESERVATION = 41036592 RECOMMENDATION_TYPE_UNSPECIFIED = 140641624 @@ -37753,6 +37849,7 @@ class Status(proto.Enum): However, another location was better and was recommended. """ + UNDEFINED_STATUS = 0 CONDITIONS_NOT_MET = 363628457 NOT_SUPPORTED = 317950466 @@ -37822,6 +37919,7 @@ class DeploymentType(proto.Enum): DEPLOYMENT_TYPE_UNSPECIFIED (234847180): No description available. """ + UNDEFINED_DEPLOYMENT_TYPE = 0 DENSE = 64932607 DEPLOYMENT_TYPE_UNSPECIFIED = 234847180 @@ -37902,6 +38000,7 @@ class VmFamily(proto.Enum): VM_FAMILY_CLOUD_TPU_POD_SLICE_TPU7X (485271888): No description available. """ + UNDEFINED_VM_FAMILY = 0 VM_FAMILY_CLOUD_TPU_DEVICE_CT3 = 42845948 VM_FAMILY_CLOUD_TPU_LITE_DEVICE_CT5L = 108020067 @@ -37928,6 +38027,7 @@ class WorkloadType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_WORKLOAD_TYPE = 0 BATCH = 62971674 SERVING = 17781740 @@ -37980,6 +38080,7 @@ class DiskInterface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_DISK_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -38009,13 +38110,13 @@ class FutureResourcesSpecLocationPolicy(proto.Message): ALLOWed. """ - locations: MutableMapping[ - str, "FutureResourcesSpecLocationPolicyLocation" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=413423454, - message="FutureResourcesSpecLocationPolicyLocation", + locations: MutableMapping[str, "FutureResourcesSpecLocationPolicyLocation"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=413423454, + message="FutureResourcesSpecLocationPolicyLocation", + ) ) @@ -38047,6 +38148,7 @@ class Preference(proto.Enum): PREFERENCE_UNSPECIFIED (496219571): Default value, unused. """ + UNDEFINED_PREFERENCE = 0 ALLOW = 62368553 DENY = 2094604 @@ -38090,12 +38192,12 @@ class FutureResourcesSpecSpecificSKUResources(proto.Message): number=77317349, optional=True, ) - local_ssd_partitions: MutableSequence[ - "FutureResourcesSpecLocalSsdPartition" - ] = proto.RepeatedField( - proto.MESSAGE, - number=470688568, - message="FutureResourcesSpecLocalSsdPartition", + local_ssd_partitions: MutableSequence["FutureResourcesSpecLocalSsdPartition"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=470688568, + message="FutureResourcesSpecLocalSsdPartition", + ) ) machine_type: str = proto.Field( proto.STRING, @@ -38236,6 +38338,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -38363,6 +38466,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -42168,6 +42272,7 @@ class View(proto.Enum): FULL (2169487): Includes detailed topology view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 BLOCK_VIEW_UNSPECIFIED = 275070479 @@ -42268,6 +42373,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 SUB_BLOCK_VIEW_BASIC = 236009797 SUB_BLOCK_VIEW_FULL = 440711800 @@ -43043,6 +43149,7 @@ class Views(proto.Enum): WITH_UTILIZATION (504090633): Utilization data is included in the response. """ + UNDEFINED_VIEWS = 0 DEFAULT = 115302945 WITH_UTILIZATION = 504090633 @@ -43855,6 +43962,7 @@ class SchedulingType(proto.Enum): reservation. Instead, each instance has its own maintenance window. """ + UNDEFINED_SCHEDULING_TYPE = 0 GROUPED = 474540862 GROUP_MAINTENANCE_TYPE_UNSPECIFIED = 447183678 @@ -44115,6 +44223,7 @@ class Type(proto.Enum): WINDOWS (456863331): No description available. """ + UNDEFINED_TYPE = 0 BARE_METAL_LINUX_COMPATIBLE = 354232740 FEATURE_TYPE_UNSPECIFIED = 531767259 @@ -44265,6 +44374,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -44283,6 +44393,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -44450,6 +44561,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -44468,6 +44580,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -44635,6 +44748,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -44653,6 +44767,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -44872,6 +44987,7 @@ class Type(proto.Enum): TCP (82881): No description available. """ + UNDEFINED_TYPE = 0 GRPC = 2196510 GRPC_WITH_TLS = 268089571 @@ -45261,6 +45377,7 @@ class HealthStatusAggregationPolicy(proto.Enum): An EndpointHealth message is returned for each backend in the health check service. """ + UNDEFINED_HEALTH_STATUS_AGGREGATION_POLICY = 0 AND = 64951 NO_AGGREGATION = 426445124 @@ -45615,6 +45732,7 @@ class HealthState(proto.Enum): UNHEALTHY (462118084): No description available. """ + UNDEFINED_HEALTH_STATE = 0 HEALTHY = 439801213 UNHEALTHY = 462118084 @@ -45632,6 +45750,7 @@ class Ipv6HealthState(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_IPV6_HEALTH_STATE = 0 class WeightError(proto.Enum): @@ -45668,6 +45787,7 @@ class WeightError(proto.Enum): updated to ENABLE or DRY_RUN and there has not been sufficient time to parse and report the backend weight. """ + UNDEFINED_WEIGHT_ERROR = 0 INVALID_WEIGHT = 383698400 MISSING_WEIGHT = 384027537 @@ -45797,6 +45917,7 @@ class HealthState(proto.Enum): UNKNOWN (433141802): No description available. """ + UNDEFINED_HEALTH_STATE = 0 DRAINING = 480455402 HEALTHY = 439801213 @@ -45819,6 +45940,7 @@ class Ipv6HealthState(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_IPV6_HEALTH_STATE = 0 backend_service: "BackendServiceReference" = proto.Field( @@ -46510,6 +46632,7 @@ class RedirectResponseCode(proto.Enum): Http Status Code 307 - Temporary Redirect maintaining HTTP method. """ + UNDEFINED_REDIRECT_RESPONSE_CODE = 0 FOUND = 67084130 MOVED_PERMANENTLY_DEFAULT = 386698449 @@ -46797,12 +46920,12 @@ class HttpRouteAction(proto.Message): optional=True, message="UrlRewrite", ) - weighted_backend_services: MutableSequence[ - "WeightedBackendService" - ] = proto.RepeatedField( - proto.MESSAGE, - number=337028049, - message="WeightedBackendService", + weighted_backend_services: MutableSequence["WeightedBackendService"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=337028049, + message="WeightedBackendService", + ) ) @@ -47156,12 +47279,12 @@ class HttpRouteRuleMatch(proto.Message): number=257898968, optional=True, ) - query_parameter_matches: MutableSequence[ - "HttpQueryParameterMatch" - ] = proto.RepeatedField( - proto.MESSAGE, - number=286231270, - message="HttpQueryParameterMatch", + query_parameter_matches: MutableSequence["HttpQueryParameterMatch"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=286231270, + message="HttpQueryParameterMatch", + ) ) regex_match: str = proto.Field( proto.STRING, @@ -47467,6 +47590,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -47483,6 +47607,7 @@ class SourceType(proto.Enum): RAW (80904): No description available. """ + UNDEFINED_SOURCE_TYPE = 0 RAW = 80904 @@ -47505,6 +47630,7 @@ class Status(proto.Enum): READY (77848963): Image has been successfully created. """ + UNDEFINED_STATUS = 0 DELETING = 528602024 FAILED = 455706685 @@ -52888,6 +53014,7 @@ class KeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_KEY_REVOCATION_ACTION_TYPE = 0 KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 467110106 NONE = 2402104 @@ -52917,6 +53044,7 @@ class PrivateIpv6GoogleAccess(proto.Enum): Each network interface inherits PrivateIpv6GoogleAccess from its subnetwork. """ + UNDEFINED_PRIVATE_IPV6_GOOGLE_ACCESS = 0 ENABLE_BIDIRECTIONAL_ACCESS_TO_GOOGLE = 427975994 ENABLE_OUTBOUND_VM_ACCESS_TO_GOOGLE = 288210263 @@ -52963,6 +53091,7 @@ class Status(proto.Enum): The instance has stopped (either by explicit action or underlying failure). """ + UNDEFINED_STATUS = 0 DEPROVISIONING = 428935662 PENDING = 35394935 @@ -53966,6 +54095,7 @@ class ListManagedInstancesResults(proto.Enum): listManagedInstances API method. maxResults and pageToken query parameters are respected. """ + UNDEFINED_LIST_MANAGED_INSTANCES_RESULTS = 0 PAGELESS = 32183464 PAGINATED = 40190637 @@ -53976,12 +54106,12 @@ class ListManagedInstancesResults(proto.Enum): optional=True, message="InstanceGroupManagerAllInstancesConfig", ) - auto_healing_policies: MutableSequence[ - "InstanceGroupManagerAutoHealingPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=456799109, - message="InstanceGroupManagerAutoHealingPolicy", + auto_healing_policies: MutableSequence["InstanceGroupManagerAutoHealingPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=456799109, + message="InstanceGroupManagerAutoHealingPolicy", + ) ) base_instance_name: str = proto.Field( proto.STRING, @@ -54591,6 +54721,7 @@ class DefaultActionOnFailure(proto.Enum): or an unhealthy VM by recreating it. For more information, see About repairing VMs in a MIG. """ + UNDEFINED_DEFAULT_ACTION_ON_FAILURE = 0 DO_NOTHING = 451307513 REPAIR = 266277773 @@ -54618,6 +54749,7 @@ class ForceUpdateOnRepair(proto.Enum): YES (87751): No description available. """ + UNDEFINED_FORCE_UPDATE_ON_REPAIR = 0 NO = 2497 YES = 87751 @@ -54815,6 +54947,7 @@ class State(proto.Enum): SUCCEEDED (511103553): The request succeeded. """ + UNDEFINED_STATE = 0 ACCEPTED = 246714279 CANCELLED = 41957681 @@ -55100,6 +55233,7 @@ class Mode(proto.Enum): the standby pool when the group scales out, and replenishes the standby pool afterwards. """ + UNDEFINED_MODE = 0 MANUAL = 119397318 SCALE_OUT_POOL = 635394 @@ -55447,6 +55581,7 @@ class InstanceRedistributionType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_INSTANCE_REDISTRIBUTION_TYPE = 0 class MinimalAction(proto.Enum): @@ -55478,6 +55613,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -55503,6 +55639,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 class ReplacementMethod(proto.Enum): @@ -55520,6 +55657,7 @@ class ReplacementMethod(proto.Enum): Default option: instances will be deleted and created (with a new name) """ + UNDEFINED_REPLACEMENT_METHOD = 0 RECREATE = 522644719 SUBSTITUTE = 280924314 @@ -55544,6 +55682,7 @@ class Type(proto.Enum): to existing VMs only when you selectively target specific or all VMs to be updated. """ + UNDEFINED_TYPE = 0 OPPORTUNISTIC = 429530089 @@ -55759,6 +55898,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -55789,6 +55929,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 all_instances: bool = proto.Field( @@ -56061,12 +56202,12 @@ class InstanceGroupManagersScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - instance_group_managers: MutableSequence[ - "InstanceGroupManager" - ] = proto.RepeatedField( - proto.MESSAGE, - number=214072592, - message="InstanceGroupManager", + instance_group_managers: MutableSequence["InstanceGroupManager"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=214072592, + message="InstanceGroupManager", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -56356,6 +56497,7 @@ class InstanceState(proto.Enum): Includes instances in the generated list only if they have a RUNNING state. """ + UNDEFINED_INSTANCE_STATE = 0 ALL = 64897 RUNNING = 121282975 @@ -56741,6 +56883,7 @@ class Action(proto.Enum): performed as post-instance creation (subject to future extensions). """ + UNDEFINED_ACTION = 0 ABANDONING = 388244813 CREATING = 455564985 @@ -57042,6 +57185,7 @@ class KeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_KEY_REVOCATION_ACTION_TYPE = 0 KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 467110106 NONE = 2402104 @@ -57072,6 +57216,7 @@ class PrivateIpv6GoogleAccess(proto.Enum): Each network interface inherits PrivateIpv6GoogleAccess from its subnetwork. """ + UNDEFINED_PRIVATE_IPV6_GOOGLE_ACCESS = 0 ENABLE_BIDIRECTIONAL_ACCESS_TO_GOOGLE = 427975994 ENABLE_OUTBOUND_VM_ACCESS_TO_GOOGLE = 288210263 @@ -57719,6 +57864,7 @@ class Status(proto.Enum): The instance has stopped (either by explicit action or underlying failure). """ + UNDEFINED_STATUS = 0 DEPROVISIONING = 428935662 PENDING = 35394935 @@ -57773,13 +57919,13 @@ class InstancesBulkInsertOperationMetadata(proto.Message): name is key). Example key: zones/us-central1-a """ - per_location_status: MutableMapping[ - str, "BulkInsertOperationStatus" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=167851162, - message="BulkInsertOperationStatus", + per_location_status: MutableMapping[str, "BulkInsertOperationStatus"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=167851162, + message="BulkInsertOperationStatus", + ) ) @@ -57871,6 +58017,7 @@ class Type(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TYPE = 0 HIERARCHY = 69902869 NETWORK = 413984270 @@ -57964,6 +58111,7 @@ class DisruptionSchedule(proto.Enum): IMMEDIATE (152881041): Default value. Disrupt the VM immediately. """ + UNDEFINED_DISRUPTION_SCHEDULE = 0 DISRUPTION_SCHEDULE_UNSPECIFIED = 332543835 FUTURE = 474513859 @@ -57974,12 +58122,12 @@ class DisruptionSchedule(proto.Enum): number=95871619, optional=True, ) - fault_reasons: MutableSequence[ - "InstancesReportHostAsFaultyRequestFaultReason" - ] = proto.RepeatedField( - proto.MESSAGE, - number=168056210, - message="InstancesReportHostAsFaultyRequestFaultReason", + fault_reasons: MutableSequence["InstancesReportHostAsFaultyRequestFaultReason"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=168056210, + message="InstancesReportHostAsFaultyRequestFaultReason", + ) ) @@ -58015,6 +58163,7 @@ class Behavior(proto.Enum): UNRECOVERABLE_GPU_ERROR (363710747): No description available. """ + UNDEFINED_BEHAVIOR = 0 BEHAVIOR_UNSPECIFIED = 85734570 PERFORMANCE = 135701520 @@ -58430,6 +58579,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -58456,6 +58606,7 @@ class Status(proto.Enum): InstantSnapshot is currently unavailable and cannot be used for Disk restoration """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -59108,6 +59259,7 @@ class AvailableFeatures(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_AVAILABLE_FEATURES = 0 class InterconnectType(proto.Enum): @@ -59137,6 +59289,7 @@ class InterconnectType(proto.Enum): A partner-managed interconnection shared between customers via partner. """ + UNDEFINED_INTERCONNECT_TYPE = 0 DEDICATED = 258411983 IT_PRIVATE = 335677007 @@ -59165,6 +59318,7 @@ class LinkType(proto.Enum): LINK_TYPE_ETHERNET_400G_LR4 (127023690): 400G Ethernet, LR4 Optics. """ + UNDEFINED_LINK_TYPE = 0 LINK_TYPE_ETHERNET_100G_LR = 337672551 LINK_TYPE_ETHERNET_10G_LR = 236739749 @@ -59198,6 +59352,7 @@ class OperationalStatus(proto.Enum): attachments may be provisioned on this interconnect. """ + UNDEFINED_OPERATIONAL_STATUS = 0 OS_ACTIVE = 55721409 OS_UNPROVISIONED = 239771840 @@ -59212,6 +59367,7 @@ class RequestedFeatures(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_REQUESTED_FEATURES = 0 class State(proto.Enum): @@ -59241,6 +59397,7 @@ class State(proto.Enum): attachments may be provisioned on this interconnect. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 UNPROVISIONED = 517333979 @@ -59258,6 +59415,7 @@ class Subzone(proto.Enum): SUBZONE_B (291575439): Subzone B. """ + UNDEFINED_SUBZONE = 0 SUBZONE_A = 291575438 SUBZONE_B = 291575439 @@ -59304,12 +59462,12 @@ class Subzone(proto.Enum): number=422937596, optional=True, ) - expected_outages: MutableSequence[ - "InterconnectOutageNotification" - ] = proto.RepeatedField( - proto.MESSAGE, - number=264484123, - message="InterconnectOutageNotification", + expected_outages: MutableSequence["InterconnectOutageNotification"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=264484123, + message="InterconnectOutageNotification", + ) ) google_ip_address: str = proto.Field( proto.STRING, @@ -59546,6 +59704,7 @@ class TrafficClass(proto.Enum): Traffic Class 6, corresponding to DSCP ranges (48-63) 11xxxx. """ + UNDEFINED_TRAFFIC_CLASS = 0 TC1 = 82850 TC2 = 82851 @@ -60111,6 +60270,7 @@ class Bandwidth(proto.Enum): BPS_5G (355358572): 5 Gbit/s """ + UNDEFINED_BANDWIDTH = 0 BPS_100G = 49547952 BPS_100M = 49547958 @@ -60154,6 +60314,7 @@ class EdgeAvailabilityDomain(proto.Enum): AVAILABILITY_DOMAIN_ANY (375256373): No description available. """ + UNDEFINED_EDGE_AVAILABILITY_DOMAIN = 0 AVAILABILITY_DOMAIN_1 = 349552090 AVAILABILITY_DOMAIN_2 = 349552091 @@ -60196,6 +60357,7 @@ class Encryption(proto.Enum): receive traffic from such interconnect attachment. """ + UNDEFINED_ENCRYPTION = 0 IPSEC = 69882282 NONE = 2402104 @@ -60223,6 +60385,7 @@ class OperationalStatus(proto.Enum): Indicates that attachment is not ready to use yet, because turnup is not complete. """ + UNDEFINED_OPERATIONAL_STATUS = 0 OS_ACTIVE = 55721409 OS_UNPROVISIONED = 239771840 @@ -60246,6 +60409,7 @@ class StackType(proto.Enum): The interconnect attachment will only be assigned IPv4 addresses. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -60305,6 +60469,7 @@ class State(proto.Enum): Indicates that attachment is not ready to use yet, because turnup is not complete. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DEFUNCT = 115891759 @@ -60344,6 +60509,7 @@ class Type(proto.Enum): Attachment to a partner interconnect, created by the partner. """ + UNDEFINED_TYPE = 0 DEDICATED = 258411983 L2_DEDICATED = 336595510 @@ -60736,6 +60902,7 @@ class BgpMd5(proto.Enum): MD5_UNSUPPORTED: BGP MD5 authentication must not be configured """ + UNDEFINED_BGP_MD5 = 0 MD5_OPTIONAL = 532156673 MD5_REQUIRED = 218034496 @@ -60863,13 +61030,13 @@ class InterconnectAttachmentGroup(proto.Message): This field is a member of `oneof`_ ``_self_link``. """ - attachments: MutableMapping[ - str, "InterconnectAttachmentGroupAttachment" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=334744496, - message="InterconnectAttachmentGroupAttachment", + attachments: MutableMapping[str, "InterconnectAttachmentGroupAttachment"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=334744496, + message="InterconnectAttachmentGroupAttachment", + ) ) configured: "InterconnectAttachmentGroupConfigured" = proto.Field( proto.MESSAGE, @@ -61006,6 +61173,7 @@ class EffectiveSla(proto.Enum): PRODUCTION_NON_CRITICAL (117399223): No description available. """ + UNDEFINED_EFFECTIVE_SLA = 0 EFFECTIVE_SLA_UNSPECIFIED = 491000744 NO_SLA = 161460618 @@ -61097,6 +61265,7 @@ class BlockerType(proto.Enum): OTHER (75532016): No description available. """ + UNDEFINED_BLOCKER_TYPE = 0 BLOCKER_TYPE_UNSPECIFIED = 429793623 INCOMPATIBLE_METROS = 290410432 @@ -61171,6 +61340,7 @@ class AvailabilitySla(proto.Enum): PRODUCTION_NON_CRITICAL (117399223): No description available. """ + UNDEFINED_AVAILABILITY_SLA = 0 AVAILABILITY_SLA_UNSPECIFIED = 11186044 NO_SLA = 161460618 @@ -61194,12 +61364,12 @@ class InterconnectAttachmentGroupLogicalStructure(proto.Message): """ - regions: MutableSequence[ - "InterconnectAttachmentGroupLogicalStructureRegion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=12367871, - message="InterconnectAttachmentGroupLogicalStructureRegion", + regions: MutableSequence["InterconnectAttachmentGroupLogicalStructureRegion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12367871, + message="InterconnectAttachmentGroupLogicalStructureRegion", + ) ) @@ -61487,6 +61657,7 @@ class GroupStatus(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_GROUP_STATUS = 0 DEGRADED = 396890926 FULLY_DOWN = 255514647 @@ -61578,6 +61749,7 @@ class IsActive(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_IS_ACTIVE = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -61622,6 +61794,7 @@ class Status(proto.Enum): UNPROVISIONED (517333979): No description available. """ + UNDEFINED_STATUS = 0 ATTACHMENT_STATUS_UNKNOWN = 472477561 CONNECTION_DISABLED = 432687805 @@ -62051,12 +62224,12 @@ class InterconnectAttachmentsScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - interconnect_attachments: MutableSequence[ - "InterconnectAttachment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=425388415, - message="InterconnectAttachment", + interconnect_attachments: MutableSequence["InterconnectAttachment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=425388415, + message="InterconnectAttachment", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -62160,6 +62333,7 @@ class BundleAggregationType(proto.Enum): BUNDLE_AGGREGATION_TYPE_STATIC (50678873): LACP is disabled. """ + UNDEFINED_BUNDLE_AGGREGATION_TYPE = 0 BUNDLE_AGGREGATION_TYPE_LACP = 27758925 BUNDLE_AGGREGATION_TYPE_STATIC = 50678873 @@ -62185,16 +62359,17 @@ class BundleOperationalStatus(proto.Enum): the bundle (typically just one) have UP operational status. """ + UNDEFINED_BUNDLE_OPERATIONAL_STATUS = 0 BUNDLE_OPERATIONAL_STATUS_DOWN = 453842693 BUNDLE_OPERATIONAL_STATUS_UP = 161366462 - arp_caches: MutableSequence[ - "InterconnectDiagnosticsARPEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=414591761, - message="InterconnectDiagnosticsARPEntry", + arp_caches: MutableSequence["InterconnectDiagnosticsARPEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=414591761, + message="InterconnectDiagnosticsARPEntry", + ) ) bundle_aggregation_type: str = proto.Field( proto.STRING, @@ -62297,6 +62472,7 @@ class State(proto.Enum): this means the rest of the object should be empty. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DETACHED = 216562546 @@ -62392,6 +62568,7 @@ class State(proto.Enum): The value of the current optical power has not crossed a warning threshold. """ + UNDEFINED_STATE = 0 HIGH_ALARM = 305363284 HIGH_WARNING = 220984799 @@ -62474,16 +62651,17 @@ class OperationalStatus(proto.Enum): The interface has low level communication with the remote end. """ + UNDEFINED_OPERATIONAL_STATUS = 0 LINK_OPERATIONAL_STATUS_DOWN = 281653885 LINK_OPERATIONAL_STATUS_UP = 305879862 - arp_caches: MutableSequence[ - "InterconnectDiagnosticsARPEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=414591761, - message="InterconnectDiagnosticsARPEntry", + arp_caches: MutableSequence["InterconnectDiagnosticsARPEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=414591761, + message="InterconnectDiagnosticsARPEntry", + ) ) circuit_id: str = proto.Field( proto.STRING, @@ -62664,13 +62842,13 @@ class InterconnectGroup(proto.Message): optional=True, message="InterconnectGroupIntent", ) - interconnects: MutableMapping[ - str, "InterconnectGroupInterconnect" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=520187301, - message="InterconnectGroupInterconnect", + interconnects: MutableMapping[str, "InterconnectGroupInterconnect"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=520187301, + message="InterconnectGroupInterconnect", + ) ) kind: str = proto.Field( proto.STRING, @@ -62752,6 +62930,7 @@ class SupportedSla(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_SUPPORTED_SLA = 0 NO_SLA = 161460618 PRODUCTION_CRITICAL = 470416485 @@ -62839,6 +63018,7 @@ class BlockerType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_BLOCKER_TYPE = 0 INCOMPATIBLE_METROS = 290410432 NOT_AVAILABLE = 140722205 @@ -62911,6 +63091,7 @@ class TopologyCapability(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TOPOLOGY_CAPABILITY = 0 NO_SLA = 161460618 PRODUCTION_CRITICAL = 470416485 @@ -62954,12 +63135,12 @@ class InterconnectGroupPhysicalStructure(proto.Message): """ - metros: MutableSequence[ - "InterconnectGroupPhysicalStructureMetros" - ] = proto.RepeatedField( - proto.MESSAGE, - number=533067386, - message="InterconnectGroupPhysicalStructureMetros", + metros: MutableSequence["InterconnectGroupPhysicalStructureMetros"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=533067386, + message="InterconnectGroupPhysicalStructureMetros", + ) ) @@ -63092,6 +63273,7 @@ class IntentMismatchBehavior(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_INTENT_MISMATCH_BEHAVIOR = 0 CREATE = 385389820 REJECT = 266102687 @@ -63264,6 +63446,7 @@ class InterconnectType(proto.Enum): A partner-managed interconnection shared between customers via partner. """ + UNDEFINED_INTERCONNECT_TYPE = 0 DEDICATED = 258411983 IT_PRIVATE = 335677007 @@ -63293,6 +63476,7 @@ class LinkType(proto.Enum): LINK_TYPE_ETHERNET_400G_LR4 (127023690): 400G Ethernet, LR4 Optics. """ + UNDEFINED_LINK_TYPE = 0 LINK_TYPE_ETHERNET_100G_LR = 337672551 LINK_TYPE_ETHERNET_10G_LR = 236739749 @@ -63312,6 +63496,7 @@ class RequestedFeatures(proto.Enum): IF_MACSEC (396279300): Media Access Control security (MACsec) """ + UNDEFINED_REQUESTED_FEATURES = 0 IF_CROSS_SITE_NETWORK = 469111095 IF_L2_FORWARDING = 125563860 @@ -63557,6 +63742,7 @@ class GroupStatus(proto.Enum): GROUPS_STATUS_UNSPECIFIED (261932693): No description available. """ + UNDEFINED_GROUP_STATUS = 0 DEGRADED = 396890926 FULLY_DOWN = 255514647 @@ -63643,6 +63829,7 @@ class IsActive(proto.Enum): IS_ACTIVE_UNSPECIFIED (274948243): No description available. """ + UNDEFINED_IS_ACTIVE = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -63914,6 +64101,7 @@ class AvailableFeatures(proto.Enum): IF_MACSEC (396279300): Media Access Control security (MACsec) """ + UNDEFINED_AVAILABLE_FEATURES = 0 IF_CROSS_SITE_NETWORK = 469111095 IF_L2_FORWARDING = 125563860 @@ -63933,6 +64121,7 @@ class AvailableLinkTypes(proto.Enum): LINK_TYPE_ETHERNET_400G_LR4 (127023690): 400G Ethernet, LR4 Optics. """ + UNDEFINED_AVAILABLE_LINK_TYPES = 0 LINK_TYPE_ETHERNET_100G_LR = 337672551 LINK_TYPE_ETHERNET_10G_LR = 236739749 @@ -63975,6 +64164,7 @@ class Continent(proto.Enum): SOUTH_AMERICA (32597340): No description available. """ + UNDEFINED_CONTINENT = 0 AFRICA = 317443706 ASIA_PAC = 119782269 @@ -64009,6 +64199,7 @@ class Status(proto.Enum): The InterconnectLocation is closed for provisioning new Interconnects. """ + UNDEFINED_STATUS = 0 AVAILABLE = 442079913 CLOSED = 380163436 @@ -64088,23 +64279,23 @@ class Status(proto.Enum): number=536567094, optional=True, ) - region_infos: MutableSequence[ - "InterconnectLocationRegionInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=312194170, - message="InterconnectLocationRegionInfo", + region_infos: MutableSequence["InterconnectLocationRegionInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=312194170, + message="InterconnectLocationRegionInfo", + ) ) self_link: str = proto.Field( proto.STRING, number=456214797, optional=True, ) - single_region_production_critical_peer_locations: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=439537103, + single_region_production_critical_peer_locations: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=439537103, + ) ) status: str = proto.Field( proto.STRING, @@ -64278,6 +64469,7 @@ class LocationPresence(proto.Enum): [Deprecated] This region shares the same regional network presence as this InterconnectLocation. """ + UNDEFINED_LOCATION_PRESENCE = 0 GLOBAL = 494663587 LOCAL_REGION = 403535464 @@ -64342,12 +64534,12 @@ class InterconnectMacsec(proto.Message): number=532597451, optional=True, ) - pre_shared_keys: MutableSequence[ - "InterconnectMacsecPreSharedKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=420308466, - message="InterconnectMacsecPreSharedKey", + pre_shared_keys: MutableSequence["InterconnectMacsecPreSharedKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=420308466, + message="InterconnectMacsecPreSharedKey", + ) ) @@ -64367,12 +64559,12 @@ class InterconnectMacsecConfig(proto.Message): link. """ - pre_shared_keys: MutableSequence[ - "InterconnectMacsecConfigPreSharedKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=420308466, - message="InterconnectMacsecConfigPreSharedKey", + pre_shared_keys: MutableSequence["InterconnectMacsecConfigPreSharedKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=420308466, + message="InterconnectMacsecConfigPreSharedKey", + ) ) @@ -64583,6 +64775,7 @@ class IssueType(proto.Enum): window. The interconnect as a whole should remain up, albeit with reduced bandwidth. """ + UNDEFINED_ISSUE_TYPE = 0 IT_OUTAGE = 175779973 IT_PARTIAL_OUTAGE = 92103971 @@ -64609,6 +64802,7 @@ class Source(proto.Enum): NSRC_GOOGLE (510574562): [Deprecated] This notification was generated by Google. """ + UNDEFINED_SOURCE = 0 GOOGLE = 497439289 NSRC_GOOGLE = 510574562 @@ -64652,6 +64846,7 @@ class State(proto.Enum): [Deprecated] The outage associated with this notification was canceled before the outage was due to start. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 CANCELLED = 41957681 @@ -64906,6 +65101,7 @@ class Continent(proto.Enum): SOUTH_AMERICA (32597340): No description available. """ + UNDEFINED_CONTINENT = 0 AFRICA = 317443706 ASIA_PAC = 119782269 @@ -64931,6 +65127,7 @@ class Lacp(proto.Enum): bundleAggregationType as "static". GCP does not support LAGs without LACP, so requestedLinkCount must be 1. """ + UNDEFINED_LACP = 0 LACP_SUPPORTED = 339576113 LACP_UNSUPPORTED = 203930104 @@ -64959,6 +65156,7 @@ class Status(proto.Enum): The InterconnectRemoteLocation is closed for provisioning new Cross-Cloud Interconnects. """ + UNDEFINED_STATUS = 0 AVAILABLE = 442079913 CLOSED = 380163436 @@ -65151,6 +65349,7 @@ class PortPairRemoteLocation(proto.Enum): to provision a redundant pair of Cross-Cloud Interconnects using two different remote locations in the same city. """ + UNDEFINED_PORT_PAIR_REMOTE_LOCATION = 0 PORT_PAIR_MATCHING_REMOTE_LOCATION = 207291859 PORT_PAIR_UNCONSTRAINED_REMOTE_LOCATION = 60609829 @@ -65175,6 +65374,7 @@ class PortPairVlan(proto.Enum): PORT_PAIR_UNCONSTRAINED_VLAN (175227948): PORT_PAIR_UNCONSTRAINED_VLAN means there is no constraint. """ + UNDEFINED_PORT_PAIR_VLAN = 0 PORT_PAIR_MATCHING_VLAN = 250295358 PORT_PAIR_UNCONSTRAINED_VLAN = 175227948 @@ -65787,6 +65987,7 @@ class State(proto.Enum): TERMINATED (250018339): Reserved state. """ + UNDEFINED_STATE = 0 DISABLED = 516696700 ENABLED = 182130465 @@ -67368,6 +67569,7 @@ class AddressFamily(proto.Enum): UNSPECIFIED_IP_VERSION (72938440): No description available. """ + UNDEFINED_ADDRESS_FAMILY = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -67388,6 +67590,7 @@ class RouteType(proto.Enum): UNSPECIFIED_ROUTE_TYPE (248064440): No description available. """ + UNDEFINED_ROUTE_TYPE = 0 ADVERTISED = 20302109 LEARNED = 231892419 @@ -76086,6 +76289,7 @@ class Direction(proto.Enum): OUTGOING (307438444): For routes exported from local network. """ + UNDEFINED_DIRECTION = 0 INCOMING = 338552870 OUTGOING = 307438444 @@ -83795,6 +83999,7 @@ class Views(proto.Enum): WITH_UTILIZATION (504090633): Utilization data is included in the response. """ + UNDEFINED_VIEWS = 0 DEFAULT = 115302945 WITH_UTILIZATION = 504090633 @@ -86863,6 +87068,7 @@ class TargetShape(proto.Enum): impact of zonal failure. Recommended for highly available serving workloads. """ + UNDEFINED_TARGET_SHAPE = 0 ANY = 64972 ANY_SINGLE_ZONE = 61100880 @@ -86914,6 +87120,7 @@ class Preference(proto.Enum): PREFERENCE_UNSPECIFIED (496219571): Default value, unused. """ + UNDEFINED_PREFERENCE = 0 ALLOW = 62368553 DENY = 2094604 @@ -87124,6 +87331,7 @@ class Status(proto.Enum): UPLOADING (267603489): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -87203,12 +87411,12 @@ class Status(proto.Enum): number=456214797, optional=True, ) - source_disk_encryption_keys: MutableSequence[ - "SourceDiskEncryptionKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=370408498, - message="SourceDiskEncryptionKey", + source_disk_encryption_keys: MutableSequence["SourceDiskEncryptionKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=370408498, + message="SourceDiskEncryptionKey", + ) ) source_instance: str = proto.Field( proto.STRING, @@ -87416,6 +87624,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -87876,6 +88085,7 @@ class CurrentAction(proto.Enum): performed as post-instance creation (subject to future extensions). """ + UNDEFINED_CURRENT_ACTION = 0 ABANDONING = 388244813 CREATING = 455564985 @@ -87929,6 +88139,7 @@ class InstanceStatus(proto.Enum): The instance has stopped (either by explicit action or underlying failure). """ + UNDEFINED_INSTANCE_STATUS = 0 DEPROVISIONING = 428935662 PENDING = 35394935 @@ -87957,12 +88168,12 @@ class InstanceStatus(proto.Enum): number=18257045, optional=True, ) - instance_health: MutableSequence[ - "ManagedInstanceInstanceHealth" - ] = proto.RepeatedField( - proto.MESSAGE, - number=382667078, - message="ManagedInstanceInstanceHealth", + instance_health: MutableSequence["ManagedInstanceInstanceHealth"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=382667078, + message="ManagedInstanceInstanceHealth", + ) ) instance_status: str = proto.Field( proto.STRING, @@ -88056,6 +88267,7 @@ class DetailedHealthState(proto.Enum): instance but its health is not known at the moment. """ + UNDEFINED_DETAILED_HEALTH_STATE = 0 DRAINING = 480455402 HEALTHY = 439801213 @@ -88291,6 +88503,7 @@ class FilterMatchCriteria(proto.Enum): set. AmetadataFilter must never be created with this value. """ + UNDEFINED_FILTER_MATCH_CRITERIA = 0 MATCH_ALL = 180663271 MATCH_ANY = 180663346 @@ -88731,12 +88944,12 @@ class NatIpInfo(proto.Message): This field is a member of `oneof`_ ``_nat_name``. """ - nat_ip_info_mappings: MutableSequence[ - "NatIpInfoNatIpInfoMapping" - ] = proto.RepeatedField( - proto.MESSAGE, - number=241401884, - message="NatIpInfoNatIpInfoMapping", + nat_ip_info_mappings: MutableSequence["NatIpInfoNatIpInfoMapping"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=241401884, + message="NatIpInfoNatIpInfoMapping", + ) ) nat_name: str = proto.Field( proto.STRING, @@ -88783,6 +88996,7 @@ class Mode(proto.Enum): MANUAL (119397318): No description available. """ + UNDEFINED_MODE = 0 AUTO = 2020783 MANUAL = 119397318 @@ -88800,6 +89014,7 @@ class Usage(proto.Enum): UNUSED (360643030): No description available. """ + UNDEFINED_USAGE = 0 IN_USE = 17393485 UNUSED = 360643030 @@ -89004,6 +89219,7 @@ class NetworkFirewallPolicyEnforcementOrder(proto.Enum): BEFORE_CLASSIC_FIREWALL (338458349): No description available. """ + UNDEFINED_NETWORK_FIREWALL_POLICY_ENFORCEMENT_ORDER = 0 AFTER_CLASSIC_FIREWALL = 154582608 BEFORE_CLASSIC_FIREWALL = 338458349 @@ -89221,17 +89437,18 @@ class ConnectionPreference(proto.Enum): INVALID (530283991): No description available. """ + UNDEFINED_CONNECTION_PREFERENCE = 0 ACCEPT_AUTOMATIC = 75250580 ACCEPT_MANUAL = 373061341 INVALID = 530283991 - connection_endpoints: MutableSequence[ - "NetworkAttachmentConnectedEndpoint" - ] = proto.RepeatedField( - proto.MESSAGE, - number=326078813, - message="NetworkAttachmentConnectedEndpoint", + connection_endpoints: MutableSequence["NetworkAttachmentConnectedEndpoint"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=326078813, + message="NetworkAttachmentConnectedEndpoint", + ) ) connection_preference: str = proto.Field( proto.STRING, @@ -89446,6 +89663,7 @@ class Status(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -89783,13 +90001,13 @@ def raw_page(self): number=3355, optional=True, ) - items: MutableMapping[ - str, "NetworkEdgeSecurityServicesScopedList" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=100526016, - message="NetworkEdgeSecurityServicesScopedList", + items: MutableMapping[str, "NetworkEdgeSecurityServicesScopedList"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=100526016, + message="NetworkEdgeSecurityServicesScopedList", + ) ) kind: str = proto.Field( proto.STRING, @@ -89834,12 +90052,12 @@ class NetworkEdgeSecurityServicesScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - network_edge_security_services: MutableSequence[ - "NetworkEdgeSecurityService" - ] = proto.RepeatedField( - proto.MESSAGE, - number=35530156, - message="NetworkEdgeSecurityService", + network_edge_security_services: MutableSequence["NetworkEdgeSecurityService"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=35530156, + message="NetworkEdgeSecurityService", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -90127,6 +90345,7 @@ class NetworkEndpointType(proto.Enum): The network endpoint is handled by specified serverless infrastructure. """ + UNDEFINED_NETWORK_ENDPOINT_TYPE = 0 GCE_VM_IP = 401880793 GCE_VM_IP_PORT = 501838375 @@ -90657,6 +90876,7 @@ class PscConnectionStatus(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_PSC_CONNECTION_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -90752,6 +90972,7 @@ class HealthStatus(proto.Enum): Health status for network endpoints will not be provided. """ + UNDEFINED_HEALTH_STATUS = 0 SHOW = 2544381 SKIP = 2547071 @@ -90848,12 +91069,12 @@ class NetworkEndpointGroupsScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - network_endpoint_groups: MutableSequence[ - "NetworkEndpointGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29346733, - message="NetworkEndpointGroup", + network_endpoint_groups: MutableSequence["NetworkEndpointGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29346733, + message="NetworkEndpointGroup", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -91160,6 +91381,7 @@ class IgmpQuery(proto.Enum): The network interface has enabled IGMP query - v2. """ + UNDEFINED_IGMP_QUERY = 0 IGMP_QUERY_DISABLED = 28285169 IGMP_QUERY_V2 = 333493457 @@ -91184,6 +91406,7 @@ class Ipv6AccessType(proto.Enum): UNSPECIFIED_IPV6_ACCESS_TYPE (313080613): No description available. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -91210,6 +91433,7 @@ class NicType(proto.Enum): VIRTIO_NET (452123481): VIRTIO """ + UNDEFINED_NIC_TYPE = 0 GVNIC = 68209305 IDPF = 2242641 @@ -91242,6 +91466,7 @@ class StackType(proto.Enum): UNSPECIFIED_STACK_TYPE (298084569): No description available. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -91580,6 +91805,7 @@ class StackType(proto.Enum): This Peering will only allow IPv4 traffic and routes to be exchanged, even if the matching peering is IPV4_IPV6. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -91600,6 +91826,7 @@ class State(proto.Enum): peer, including the case when peer does not exist. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -91630,6 +91857,7 @@ class UpdateStrategy(proto.Enum): Peerings with update strategy UNSPECIFIED are created with update strategy INDEPENDENT. """ + UNDEFINED_UPDATE_STRATEGY = 0 CONSENSUS = 203373655 INDEPENDENT = 127011674 @@ -91765,6 +91993,7 @@ class UpdateStrategy(proto.Enum): Peerings with update strategy UNSPECIFIED are created with update strategy INDEPENDENT. """ + UNDEFINED_UPDATE_STRATEGY = 0 CONSENSUS = 203373655 INDEPENDENT = 127011674 @@ -91833,6 +92062,7 @@ class DeleteStatus(proto.Enum): The peer network admin has requested deletion of this peering connection. """ + UNDEFINED_DELETE_STATUS = 0 DELETE_ACKNOWLEDGED = 325293916 DELETE_STATUS_UNSPECIFIED = 395396446 @@ -91861,6 +92091,7 @@ class UpdateStatus(proto.Enum): UPDATE_STATUS_UNSPECIFIED (120836480): No description available. """ + UNDEFINED_UPDATE_STATUS = 0 IN_SYNC = 2273653 PENDING_LOCAL_ACKNOWLEDMENT = 229926592 @@ -91931,6 +92162,7 @@ class StackType(proto.Enum): This Peering will only allow IPv4 traffic and routes to be exchanged, even if the matching peering is IPV4_IPV6. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -91987,6 +92219,7 @@ class TotalEgressBandwidthTier(proto.Enum): TIER_1 (326919444): No description available. """ + UNDEFINED_TOTAL_EGRESS_BANDWIDTH_TIER = 0 DEFAULT = 115302945 TIER_1 = 326919444 @@ -92147,6 +92380,7 @@ class Scope(proto.Enum): ZONE (2759596): No description available. """ + UNDEFINED_SCOPE = 0 REGION = 266017524 ZONE = 2759596 @@ -92431,6 +92665,7 @@ class AddressPurposes(proto.Enum): VPC_PEERING (400800170): IP range for peer networks. """ + UNDEFINED_ADDRESS_PURPOSES = 0 DNS_RESOLVER = 476114556 GCE_ENDPOINT = 230515243 @@ -92453,6 +92688,7 @@ class AllowAddressCreation(proto.Enum): ADDRESS_CREATION_BLOCKED (534937975): No description available. """ + UNDEFINED_ALLOW_ADDRESS_CREATION = 0 ADDRESS_CREATION_ALLOWED = 181903667 ADDRESS_CREATION_BLOCKED = 534937975 @@ -92470,6 +92706,7 @@ class AllowAliasIpRanges(proto.Enum): ALIAS_IP_RANGES_BLOCKED (281030444): No description available. """ + UNDEFINED_ALLOW_ALIAS_IP_RANGES = 0 ALIAS_IP_RANGES_ALLOWED = 464867048 ALIAS_IP_RANGES_BLOCKED = 281030444 @@ -92486,6 +92723,7 @@ class AllowAutoModeSubnet(proto.Enum): AUTO_MODE_SUBNET_BLOCKED (207206006): No description available. """ + UNDEFINED_ALLOW_AUTO_MODE_SUBNET = 0 AUTO_MODE_SUBNET_ALLOWED = 391042610 AUTO_MODE_SUBNET_BLOCKED = 207206006 @@ -92503,6 +92741,7 @@ class AllowClassDFirewalls(proto.Enum): CLASS_D_FIREWALLS_BLOCKED (164382782): No description available. """ + UNDEFINED_ALLOW_CLASS_D_FIREWALLS = 0 CLASS_D_FIREWALLS_ALLOWED = 348219386 CLASS_D_FIREWALLS_BLOCKED = 164382782 @@ -92519,6 +92758,7 @@ class AllowCloudNat(proto.Enum): CLOUD_NAT_BLOCKED (62094692): No description available. """ + UNDEFINED_ALLOW_CLOUD_NAT = 0 CLOUD_NAT_ALLOWED = 245931296 CLOUD_NAT_BLOCKED = 62094692 @@ -92535,6 +92775,7 @@ class AllowCloudRouter(proto.Enum): CLOUD_ROUTER_BLOCKED (181551680): No description available. """ + UNDEFINED_ALLOW_CLOUD_ROUTER = 0 CLOUD_ROUTER_ALLOWED = 365388284 CLOUD_ROUTER_BLOCKED = 181551680 @@ -92551,6 +92792,7 @@ class AllowDefaultNicAttachment(proto.Enum): DEFAULT_NIC_ATTACHMENT_BLOCKED (364604997): No description available. """ + UNDEFINED_ALLOW_DEFAULT_NIC_ATTACHMENT = 0 DEFAULT_NIC_ATTACHMENT_ALLOWED = 11570689 DEFAULT_NIC_ATTACHMENT_BLOCKED = 364604997 @@ -92568,6 +92810,7 @@ class AllowExternalIpAccess(proto.Enum): EXTERNAL_IP_ACCESS_BLOCKED (462564501): No description available. """ + UNDEFINED_ALLOW_EXTERNAL_IP_ACCESS = 0 EXTERNAL_IP_ACCESS_ALLOWED = 109530193 EXTERNAL_IP_ACCESS_BLOCKED = 462564501 @@ -92585,6 +92828,7 @@ class AllowFirewallPolicy(proto.Enum): FIREWALL_POLICY_BLOCKED (204651742): No description available. """ + UNDEFINED_ALLOW_FIREWALL_POLICY = 0 FIREWALL_POLICY_ALLOWED = 388488346 FIREWALL_POLICY_BLOCKED = 204651742 @@ -92601,6 +92845,7 @@ class AllowInterconnect(proto.Enum): INTERCONNECT_BLOCKED (515879707): No description available. """ + UNDEFINED_ALLOW_INTERCONNECT = 0 INTERCONNECT_ALLOWED = 162845399 INTERCONNECT_BLOCKED = 515879707 @@ -92617,6 +92862,7 @@ class AllowIpForwarding(proto.Enum): IP_FORWARDING_BLOCKED (505629858): No description available. """ + UNDEFINED_ALLOW_IP_FORWARDING = 0 IP_FORWARDING_ALLOWED = 152595550 IP_FORWARDING_BLOCKED = 505629858 @@ -92633,6 +92879,7 @@ class AllowLoadBalancing(proto.Enum): LOAD_BALANCING_BLOCKED (381442285): No description available. """ + UNDEFINED_ALLOW_LOAD_BALANCING = 0 LOAD_BALANCING_ALLOWED = 28407977 LOAD_BALANCING_BLOCKED = 381442285 @@ -92649,6 +92896,7 @@ class AllowMultiNicInSameNetwork(proto.Enum): MULTI_NIC_IN_SAME_NETWORK_BLOCKED (273718815): No description available. """ + UNDEFINED_ALLOW_MULTI_NIC_IN_SAME_NETWORK = 0 MULTI_NIC_IN_SAME_NETWORK_ALLOWED = 457555419 MULTI_NIC_IN_SAME_NETWORK_BLOCKED = 273718815 @@ -92666,6 +92914,7 @@ class AllowMultiNicInSameSubnetwork(proto.Enum): MULTI_NIC_IN_SAME_SUBNETWORK_BLOCKED (104207991): No description available. """ + UNDEFINED_ALLOW_MULTI_NIC_IN_SAME_SUBNETWORK = 0 MULTI_NIC_IN_SAME_SUBNETWORK_ALLOWED = 288044595 MULTI_NIC_IN_SAME_SUBNETWORK_BLOCKED = 104207991 @@ -92682,6 +92931,7 @@ class AllowMulticast(proto.Enum): MULTICAST_BLOCKED (397727845): No description available. """ + UNDEFINED_ALLOW_MULTICAST = 0 MULTICAST_ALLOWED = 44693537 MULTICAST_BLOCKED = 397727845 @@ -92698,6 +92948,7 @@ class AllowNcc(proto.Enum): NCC_BLOCKED (283390907): No description available. """ + UNDEFINED_ALLOW_NCC = 0 NCC_ALLOWED = 467227511 NCC_BLOCKED = 283390907 @@ -92714,6 +92965,7 @@ class AllowNetworkMigration(proto.Enum): NETWORK_MIGRATION_BLOCKED (367424074): No description available. """ + UNDEFINED_ALLOW_NETWORK_MIGRATION = 0 NETWORK_MIGRATION_ALLOWED = 14389766 NETWORK_MIGRATION_BLOCKED = 367424074 @@ -92730,6 +92982,7 @@ class AllowPacketMirroring(proto.Enum): PACKET_MIRRORING_BLOCKED (445450553): No description available. """ + UNDEFINED_ALLOW_PACKET_MIRRORING = 0 PACKET_MIRRORING_ALLOWED = 92416245 PACKET_MIRRORING_BLOCKED = 445450553 @@ -92746,6 +92999,7 @@ class AllowPrivateGoogleAccess(proto.Enum): PRIVATE_GOOGLE_ACCESS_BLOCKED (36950747): No description available. """ + UNDEFINED_ALLOW_PRIVATE_GOOGLE_ACCESS = 0 PRIVATE_GOOGLE_ACCESS_ALLOWED = 220787351 PRIVATE_GOOGLE_ACCESS_BLOCKED = 36950747 @@ -92762,6 +93016,7 @@ class AllowPsc(proto.Enum): PSC_BLOCKED (524593965): No description available. """ + UNDEFINED_ALLOW_PSC = 0 PSC_ALLOWED = 171559657 PSC_BLOCKED = 524593965 @@ -92778,6 +93033,7 @@ class AllowSameNetworkUnicast(proto.Enum): SAME_NETWORK_UNICAST_BLOCKED (512767122): No description available. """ + UNDEFINED_ALLOW_SAME_NETWORK_UNICAST = 0 SAME_NETWORK_UNICAST_ALLOWED = 159732814 SAME_NETWORK_UNICAST_BLOCKED = 512767122 @@ -92794,6 +93050,7 @@ class AllowStaticRoutes(proto.Enum): STATIC_ROUTES_BLOCKED (225212360): No description available. """ + UNDEFINED_ALLOW_STATIC_ROUTES = 0 STATIC_ROUTES_ALLOWED = 409048964 STATIC_ROUTES_BLOCKED = 225212360 @@ -92810,6 +93067,7 @@ class AllowSubInterfaces(proto.Enum): SUBINTERFACES_BLOCKED (511720199): No description available. """ + UNDEFINED_ALLOW_SUB_INTERFACES = 0 SUBINTERFACES_ALLOWED = 158685891 SUBINTERFACES_BLOCKED = 511720199 @@ -92826,6 +93084,7 @@ class AllowSubnetworkCreation(proto.Enum): SUBNETWORK_CREATION_BLOCKED (511615133): No description available. """ + UNDEFINED_ALLOW_SUBNETWORK_CREATION = 0 SUBNETWORK_CREATION_ALLOWED = 158580825 SUBNETWORK_CREATION_BLOCKED = 511615133 @@ -92843,6 +93102,7 @@ class AllowVpcFirewallRules(proto.Enum): VPC_FIREWALL_RULES_BLOCKED (305749403): No description available. """ + UNDEFINED_ALLOW_VPC_FIREWALL_RULES = 0 VPC_FIREWALL_RULES_ALLOWED = 489586007 VPC_FIREWALL_RULES_BLOCKED = 305749403 @@ -92859,6 +93119,7 @@ class AllowVpcPeering(proto.Enum): VPC_PEERING_BLOCKED (77628471): No description available. """ + UNDEFINED_ALLOW_VPC_PEERING = 0 VPC_PEERING_ALLOWED = 261465075 VPC_PEERING_BLOCKED = 77628471 @@ -92875,6 +93136,7 @@ class AllowVpn(proto.Enum): VPN_BLOCKED (515198305): No description available. """ + UNDEFINED_ALLOW_VPN = 0 VPN_ALLOWED = 162163997 VPN_BLOCKED = 515198305 @@ -92891,6 +93153,7 @@ class FirewallPolicyTypes(proto.Enum): VPC_POLICY (74319208): No description available. """ + UNDEFINED_FIREWALL_POLICY_TYPES = 0 RDMA_ROCE_POLICY = 148757145 VPC_POLICY = 74319208 @@ -92915,6 +93178,7 @@ class InterfaceTypes(proto.Enum): VIRTIO_NET (452123481): VIRTIO """ + UNDEFINED_INTERFACE_TYPES = 0 GVNIC = 68209305 IDPF = 2242641 @@ -92935,6 +93199,7 @@ class Multicast(proto.Enum): MULTICAST_ULL (532211630): No description available. """ + UNDEFINED_MULTICAST = 0 MULTICAST_SDN = 532209462 MULTICAST_ULL = 532211630 @@ -92951,6 +93216,7 @@ class SubnetPurposes(proto.Enum): SUBNET_PURPOSE_PRIVATE (404371008): No description available. """ + UNDEFINED_SUBNET_PURPOSES = 0 SUBNET_PURPOSE_CUSTOM_HARDWARE = 283160275 SUBNET_PURPOSE_PRIVATE = 404371008 @@ -92969,6 +93235,7 @@ class SubnetStackTypes(proto.Enum): SUBNET_STACK_TYPE_IPV6_ONLY (98889336): No description available. """ + UNDEFINED_SUBNET_STACK_TYPES = 0 SUBNET_STACK_TYPE_IPV4_IPV6 = 41454485 SUBNET_STACK_TYPE_IPV4_ONLY = 41631034 @@ -93006,6 +93273,7 @@ class SubnetworkPurposes(proto.Enum): Subnetwork used for Regional Envoy-based Load Balancing. """ + UNDEFINED_SUBNETWORK_PURPOSES = 0 GLOBAL_MANAGED_PROXY = 236463602 INTERNAL_HTTPS_LOAD_BALANCER = 248748889 @@ -93032,6 +93300,7 @@ class SubnetworkStackTypes(proto.Enum): New VMs in this subnet will only be assigned IPv6 addresses. """ + UNDEFINED_SUBNETWORK_STACK_TYPES = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -93049,6 +93318,7 @@ class Unicast(proto.Enum): UNICAST_ULL (379956325): No description available. """ + UNDEFINED_UNICAST = 0 UNICAST_SDN = 379954157 UNICAST_ULL = 379956325 @@ -93311,6 +93581,7 @@ class NetworkType(proto.Enum): VPC (85193): VPC network. """ + UNDEFINED_NETWORK_TYPE = 0 RDMA = 2510662 ULL = 84117 @@ -93331,6 +93602,7 @@ class RdmaSubtype(proto.Enum): RDMA over Converged Ethernet (RoCE) for Bare Metal. """ + UNDEFINED_RDMA_SUBTYPE = 0 FALCON = 455787729 ROCE = 2520927 @@ -93348,6 +93620,7 @@ class UllSubtype(proto.Enum): PARTICIPANT (236028691): Exchange participant. """ + UNDEFINED_ULL_SUBTYPE = 0 OPERATOR = 282073252 PARTICIPANT = 236028691 @@ -93362,6 +93635,7 @@ class VpcSubtype(proto.Enum): REGIONAL (92288543): Regionally bound VPC network. """ + UNDEFINED_VPC_SUBTYPE = 0 REGIONAL = 92288543 @@ -93550,6 +93824,7 @@ class BgpBestPathSelectionMode(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_BGP_BEST_PATH_SELECTION_MODE = 0 LEGACY = 94234569 STANDARD = 484642493 @@ -93570,6 +93845,7 @@ class BgpInterRegionCost(proto.Enum): DEFAULT (115302945): No description available. """ + UNDEFINED_BGP_INTER_REGION_COST = 0 ADD_COST_TO_MED = 490583004 DEFAULT = 115302945 @@ -93585,6 +93861,7 @@ class EffectiveBgpInterRegionCost(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_EFFECTIVE_BGP_INTER_REGION_COST = 0 class RoutingMode(proto.Enum): @@ -93603,6 +93880,7 @@ class RoutingMode(proto.Enum): REGIONAL (92288543): No description available. """ + UNDEFINED_ROUTING_MODE = 0 GLOBAL = 494663587 REGIONAL = 92288543 @@ -93784,6 +94062,7 @@ class Type(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TYPE = 0 HIERARCHY = 69902869 NETWORK = 413984270 @@ -94021,6 +94300,7 @@ class MaintenanceInterval(proto.Enum): available. RECURRENT is used for GEN3 and Slice of Hardware VMs. """ + UNDEFINED_MAINTENANCE_INTERVAL = 0 AS_NEEDED = 500724834 RECURRENT = 194244550 @@ -94056,6 +94336,7 @@ class MaintenancePolicy(proto.Enum): TERMINATE, and they will only restart if automaticRestart = true. """ + UNDEFINED_MAINTENANCE_POLICY = 0 DEFAULT = 115302945 MAINTENANCE_POLICY_UNSPECIFIED = 72964182 @@ -94078,6 +94359,7 @@ class Status(proto.Enum): READY (77848963): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -94300,6 +94582,7 @@ class Mode(proto.Enum): Autoscaling will only scale out and will not remove nodes. """ + UNDEFINED_MODE = 0 MODE_UNSPECIFIED = 371348091 OFF = 78159 @@ -94511,6 +94794,7 @@ class CpuOvercommitType(proto.Enum): NONE (2402104): No description available. """ + UNDEFINED_CPU_OVERCOMMIT_TYPE = 0 CPU_OVERCOMMIT_TYPE_UNSPECIFIED = 520665615 ENABLED = 182130465 @@ -94534,6 +94818,7 @@ class Status(proto.Enum): REPAIRING (413483285): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -94562,12 +94847,12 @@ class Status(proto.Enum): number=95594102, message="LocalDisk", ) - instance_consumption_data: MutableSequence[ - "InstanceConsumptionData" - ] = proto.RepeatedField( - proto.MESSAGE, - number=84715576, - message="InstanceConsumptionData", + instance_consumption_data: MutableSequence["InstanceConsumptionData"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=84715576, + message="InstanceConsumptionData", + ) ) instances: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -94934,6 +95219,7 @@ class CpuOvercommitType(proto.Enum): NONE (2402104): No description available. """ + UNDEFINED_CPU_OVERCOMMIT_TYPE = 0 CPU_OVERCOMMIT_TYPE_UNSPECIFIED = 520665615 ENABLED = 182130465 @@ -94956,6 +95242,7 @@ class Status(proto.Enum): READY (77848963): The node template is ready. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -96041,6 +96328,7 @@ class Status(proto.Enum): RUNNING (121282975): No description available. """ + UNDEFINED_STATUS = 0 DONE = 2104194 PENDING = 35394935 @@ -96643,6 +96931,7 @@ class Duration(proto.Enum): MINUTE (126786068): No description available. """ + UNDEFINED_DURATION = 0 DURATION_UNSPECIFIED = 529071340 HOUR = 2223588 @@ -96668,6 +96957,7 @@ class Type(proto.Enum): TYPE_UNSPECIFIED (437714322): No description available. """ + UNDEFINED_TYPE = 0 LOOPBACK = 356174219 RECEIVE = 189660867 @@ -96832,6 +97122,7 @@ class Enable(proto.Enum): TRUE (2583950): No description available. """ + UNDEFINED_ENABLE = 0 FALSE = 66658563 TRUE = 2583950 @@ -97035,6 +97326,7 @@ class Direction(proto.Enum): INGRESS (516931221): Only ingress traffic is mirrored. """ + UNDEFINED_DIRECTION = 0 BOTH = 2044801 EGRESS = 432880501 @@ -97190,19 +97482,19 @@ class PacketMirroringMirroredResourceInfo(proto.Message): will be mirrored. """ - instances: MutableSequence[ - "PacketMirroringMirroredResourceInfoInstanceInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29097598, - message="PacketMirroringMirroredResourceInfoInstanceInfo", + instances: MutableSequence["PacketMirroringMirroredResourceInfoInstanceInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29097598, + message="PacketMirroringMirroredResourceInfoInstanceInfo", + ) ) - subnetworks: MutableSequence[ - "PacketMirroringMirroredResourceInfoSubnetInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=415853125, - message="PacketMirroringMirroredResourceInfoSubnetInfo", + subnetworks: MutableSequence["PacketMirroringMirroredResourceInfoSubnetInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=415853125, + message="PacketMirroringMirroredResourceInfoSubnetInfo", + ) ) tags: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -101457,6 +101749,7 @@ class Status(proto.Enum): The per-instance configuration has been deleted, but the deletion is not yet applied. """ + UNDEFINED_STATUS = 0 APPLYING = 352003508 DELETING = 528602024 @@ -102037,21 +102330,21 @@ class PreservedState(proto.Message): number=95594102, message="PreservedStatePreservedDisk", ) - external_i_ps: MutableMapping[ - str, "PreservedStatePreservedNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=532687245, - message="PreservedStatePreservedNetworkIp", + external_i_ps: MutableMapping[str, "PreservedStatePreservedNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=532687245, + message="PreservedStatePreservedNetworkIp", + ) ) - internal_i_ps: MutableMapping[ - str, "PreservedStatePreservedNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=215731675, - message="PreservedStatePreservedNetworkIp", + internal_i_ps: MutableMapping[str, "PreservedStatePreservedNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=215731675, + message="PreservedStatePreservedNetworkIp", + ) ) metadata: MutableMapping[str, str] = proto.MapField( proto.STRING, @@ -102106,6 +102399,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -102127,6 +102421,7 @@ class Mode(proto.Enum): VM instance at a time can be attached to a disk inREAD_WRITE mode. """ + UNDEFINED_MODE = 0 READ_ONLY = 91950261 READ_WRITE = 173607894 @@ -102188,6 +102483,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -102299,6 +102595,7 @@ class ActivationStatus(proto.Enum): ENABLED (182130465): No description available. """ + UNDEFINED_ACTIVATION_STATUS = 0 ACTIVATION_STATE_UNSPECIFIED = 632160 DISABLED = 516696700 @@ -102492,6 +102789,7 @@ class PredefinedRolloutPlan(proto.Enum): ROLLOUT_PLAN_UNSPECIFIED (144511983): No description available. """ + UNDEFINED_PREDEFINED_ROLLOUT_PLAN = 0 ROLLOUT_PLAN_FAST_ROLLOUT = 167808726 ROLLOUT_PLAN_TWO_DAY_ROLLOUT = 349866771 @@ -102581,6 +102879,7 @@ class Stage(proto.Enum): STAGE_UNSPECIFIED (63695670): No description available. """ + UNDEFINED_STAGE = 0 DEPRECATED = 463360435 GA = 2266 @@ -102751,6 +103050,7 @@ class CloudArmorTier(proto.Enum): CA_STANDARD (13156734): Standard protection. """ + UNDEFINED_CLOUD_ARMOR_TIER = 0 CA_ENTERPRISE_ANNUAL = 219921116 CA_ENTERPRISE_PAYGO = 453530323 @@ -102778,6 +103078,7 @@ class DefaultNetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_DEFAULT_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -102801,6 +103102,7 @@ class VmDnsSetting(proto.Enum): ZONAL_ONLY (521198951): No description available. """ + UNDEFINED_VM_DNS_SETTING = 0 GLOBAL_DEFAULT = 345419141 UNSPECIFIED_VM_DNS_SETTING = 35691930 @@ -102821,6 +103123,7 @@ class XpnProjectStatus(proto.Enum): UNSPECIFIED_XPN_PROJECT_STATUS (340393257): No description available. """ + UNDEFINED_XPN_PROJECT_STATUS = 0 HOST = 2223528 UNSPECIFIED_XPN_PROJECT_STATUS = 340393257 @@ -103041,6 +103344,7 @@ class CloudArmorTier(proto.Enum): CA_STANDARD (13156734): Standard protection. """ + UNDEFINED_CLOUD_ARMOR_TIER = 0 CA_ENTERPRISE_ANNUAL = 219921116 CA_ENTERPRISE_PAYGO = 453530323 @@ -103086,6 +103390,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -103247,6 +103552,7 @@ class ByoipApiVersion(proto.Enum): deletion takes minutes and the BGP status can be modified. """ + UNDEFINED_BYOIP_API_VERSION = 0 V1 = 2715 V2 = 2716 @@ -103269,6 +103575,7 @@ class Ipv6AccessType(proto.Enum): Cloud. All children Public Delegated Prefixes will have IPv6 access type as INTERNAL. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -103302,6 +103609,7 @@ class PdpScope(proto.Enum): The public delegated prefix is regional only. The provisioning will take a few minutes. """ + UNDEFINED_PDP_SCOPE = 0 GLOBAL = 494663587 GLOBAL_AND_REGIONAL = 318053059 @@ -103345,6 +103653,7 @@ class Status(proto.Enum): VALIDATED (66197998): Reverse DNS lookup is successful. """ + UNDEFINED_STATUS = 0 ANNOUNCED_TO_INTERNET = 177880897 INITIAL = 518841124 @@ -103732,6 +104041,7 @@ class ByoipApiVersion(proto.Enum): delete. Announce and Withdraw APIs can be used on this prefix to change the BGP status. """ + UNDEFINED_BYOIP_API_VERSION = 0 V1 = 2715 V2 = 2716 @@ -103756,6 +104066,7 @@ class Ipv6AccessType(proto.Enum): delegated prefixes will have IPv6 access type as INTERNAL. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -103791,6 +104102,7 @@ class Mode(proto.Enum): allocatablePrefixLength. Parent public delegated prefix must have IPv6 access type as INTERNAL. """ + UNDEFINED_MODE = 0 DELEGATION = 264149288 EXTERNAL_IPV6_FORWARDING_RULE_CREATION = 398684356 @@ -103837,6 +104149,7 @@ class Status(proto.Enum): The public delegated prefix is currently withdrawn but ready to be announced. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 ANNOUNCED = 365103355 @@ -104186,6 +104499,7 @@ class Ipv6AccessType(proto.Enum): delegated prefixes will have IPv6 access type as INTERNAL. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -104221,6 +104535,7 @@ class Mode(proto.Enum): allocatablePrefixLength. Parent public delegated prefix must have IPv6 access type as INTERNAL. """ + UNDEFINED_MODE = 0 DELEGATION = 264149288 EXTERNAL_IPV6_FORWARDING_RULE_CREATION = 398684356 @@ -104240,6 +104555,7 @@ class Status(proto.Enum): INACTIVE (270421099): No description available. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -104317,12 +104633,12 @@ class PublicDelegatedPrefixesScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - public_delegated_prefixes: MutableSequence[ - "PublicDelegatedPrefix" - ] = proto.RepeatedField( - proto.MESSAGE, - number=315261206, - message="PublicDelegatedPrefix", + public_delegated_prefixes: MutableSequence["PublicDelegatedPrefix"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=315261206, + message="PublicDelegatedPrefix", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -104695,6 +105011,7 @@ class Metric(proto.Enum): XPN_SERVICE_PROJECTS (95191981): No description available. """ + UNDEFINED_METRIC = 0 A2_CPUS = 153206585 AFFINITY_GROUPS = 108303563 @@ -104934,6 +105251,7 @@ class RolloutStatus(proto.Enum): ROLLOUT_STATUS_UNSPECIFIED - Rollout status is not specified. The default value. """ + UNDEFINED_ROLLOUT_STATUS = 0 IN_PROGRESS = 469193735 ROLLOUT_STATUS_UNSPECIFIED = 26864568 @@ -105098,6 +105416,7 @@ class Code(proto.Enum): UNREACHABLE (13328052): A given scope cannot be reached. """ + UNDEFINED_CODE = 0 CLEANUP_FAILED = 150308440 DEPRECATED_RESOURCE_USED = 391835586 @@ -105203,6 +105522,7 @@ class ContainerType(proto.Enum): TAR (82821): No description available. """ + UNDEFINED_CONTAINER_TYPE = 0 TAR = 82821 @@ -105484,6 +105804,7 @@ class Status(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATUS = 0 DOWN = 2104482 UP = 2715 @@ -106139,6 +106460,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -106169,6 +106491,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 all_instances: bool = proto.Field( @@ -106627,6 +106950,7 @@ class InstanceState(proto.Enum): Instance is in RUNNING state if it is running. """ + UNDEFINED_INSTANCE_STATE = 0 ALL = 64897 RUNNING = 121282975 @@ -106870,6 +107194,7 @@ class Type(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TYPE = 0 HIERARCHY = 69902869 NETWORK = 413984270 @@ -108510,6 +108835,7 @@ class DeploymentType(proto.Enum): DEPLOYMENT_TYPE_UNSPECIFIED (234847180): No description available. """ + UNDEFINED_DEPLOYMENT_TYPE = 0 DENSE = 64932607 DEPLOYMENT_TYPE_UNSPECIFIED = 234847180 @@ -108541,6 +108867,7 @@ class ProtectionTier(proto.Enum): expected to continue as normal using the redundancies. """ + UNDEFINED_PROTECTION_TIER = 0 CAPACITY_OPTIMIZED = 17430466 PROTECTION_TIER_UNSPECIFIED = 262261984 @@ -108563,6 +108890,7 @@ class SchedulingType(proto.Enum): reservation. Instead, each instance has its own maintenance window. """ + UNDEFINED_SCHEDULING_TYPE = 0 GROUPED = 474540862 GROUP_MAINTENANCE_TYPE_UNSPECIFIED = 447183678 @@ -108596,6 +108924,7 @@ class Status(proto.Enum): UPDATING (494614342): Reservation update is in progress. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -108771,6 +109100,7 @@ class ReservationOperationalMode(proto.Enum): RESERVATION_OPERATIONAL_MODE_UNSPECIFIED (194296603): No description available. """ + UNDEFINED_RESERVATION_OPERATIONAL_MODE = 0 ALL_CAPACITY = 500029880 HIGHLY_AVAILABLE_CAPACITY = 110861600 @@ -108835,6 +109165,7 @@ class ConsumeReservationType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_CONSUME_RESERVATION_TYPE = 0 ANY_RESERVATION = 200008121 NO_RESERVATION = 169322030 @@ -109049,6 +109380,7 @@ class Status(proto.Enum): Reservation block has allocated all its resources. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -109177,6 +109509,7 @@ class HealthStatus(proto.Enum): The health status of the reservation block is unspecified. """ + UNDEFINED_HEALTH_STATUS = 0 DEGRADED = 396890926 HEALTHY = 439801213 @@ -109229,12 +109562,12 @@ class ReservationBlockPhysicalTopology(proto.Message): number=335221242, optional=True, ) - instances: MutableSequence[ - "ReservationBlockPhysicalTopologyInstance" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29097598, - message="ReservationBlockPhysicalTopologyInstance", + instances: MutableSequence["ReservationBlockPhysicalTopologyInstance"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29097598, + message="ReservationBlockPhysicalTopologyInstance", + ) ) @@ -109583,6 +109916,7 @@ class Status(proto.Enum): Reservation subBlock has allocated all its resources. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -109719,6 +110053,7 @@ class HealthStatus(proto.Enum): The health status of the reservation subBlock is unspecified. """ + UNDEFINED_HEALTH_STATUS = 0 DEGRADED = 396890926 HEALTHY = 439801213 @@ -109920,6 +110255,7 @@ class DisruptionSchedule(proto.Enum): IMMEDIATE (152881041): All VMs will be disrupted immediately. """ + UNDEFINED_DISRUPTION_SCHEDULE = 0 DISRUPTION_SCHEDULE_UNSPECIFIED = 332543835 IMMEDIATE = 152881041 @@ -109938,6 +110274,7 @@ class FailureComponent(proto.Enum): NVLINK_SWITCH (239107153): The NVLink switch experienced the fault. """ + UNDEFINED_FAILURE_COMPONENT = 0 FAILURE_COMPONENT_UNSPECIFIED = 332003744 MULTIPLE_FAULTY_HOSTS = 423545298 @@ -110000,6 +110337,7 @@ class Behavior(proto.Enum): SWITCH_FAILURE (254909279): The subBlock experienced a switch failure. """ + UNDEFINED_BEHAVIOR = 0 FAULT_BEHAVIOR_UNSPECIFIED = 447660743 GPU_ERROR = 198817909 @@ -110058,6 +110396,7 @@ class MaintenanceScope(proto.Enum): any VMs running on them. This is not allowed for Standard ExR """ + UNDEFINED_MAINTENANCE_SCOPE = 0 ALL = 64897 MAINTENANCE_SCOPE_UNSPECIFIED = 78827328 @@ -110110,6 +110449,7 @@ class MaintenanceScope(proto.Enum): any VMs running on them. This is not allowed for Standard ExR """ + UNDEFINED_MAINTENANCE_SCOPE = 0 ALL = 64897 MAINTENANCE_SCOPE_UNSPECIFIED = 78827328 @@ -110632,6 +110972,7 @@ class Type(proto.Enum): VCPU (2628978): No description available. """ + UNDEFINED_TYPE = 0 ACCELERATOR = 429815371 LOCAL_SSD = 508934896 @@ -110809,6 +111150,7 @@ class Status(proto.Enum): READY (77848963): Resource policy is ready to be used. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -111081,6 +111423,7 @@ class Collocation(proto.Enum): UNSPECIFIED_COLLOCATION (464308205): No description available. """ + UNDEFINED_COLLOCATION = 0 COLLOCATED = 103257554 UNSPECIFIED_COLLOCATION = 464308205 @@ -111466,6 +111809,7 @@ class OnSourceDiskDelete(proto.Enum): UNSPECIFIED_ON_SOURCE_DISK_DELETE (239140769): No description available. """ + UNDEFINED_ON_SOURCE_DISK_DELETE = 0 APPLY_RETENTION_POLICY = 535071332 KEEP_AUTO_SNAPSHOTS = 258925689 @@ -111578,12 +111922,12 @@ class ResourcePolicyWeeklyCycle(proto.Message): of the week. """ - day_of_weeks: MutableSequence[ - "ResourcePolicyWeeklyCycleDayOfWeek" - ] = proto.RepeatedField( - proto.MESSAGE, - number=257871834, - message="ResourcePolicyWeeklyCycleDayOfWeek", + day_of_weeks: MutableSequence["ResourcePolicyWeeklyCycleDayOfWeek"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=257871834, + message="ResourcePolicyWeeklyCycleDayOfWeek", + ) ) @@ -111643,6 +111987,7 @@ class Day(proto.Enum): WEDNESDAY (422029110): No description available. """ + UNDEFINED_DAY = 0 FRIDAY = 471398751 INVALID = 530283991 @@ -111709,6 +112054,7 @@ class MaxTopologyDistance(proto.Enum): SUBBLOCK (316202573): VMs must be provisioned in the same subblock. """ + UNDEFINED_MAX_TOPOLOGY_DISTANCE = 0 BLOCK = 63294573 CLUSTER = 516333018 @@ -111728,6 +112074,7 @@ class Type(proto.Enum): MIG provisions instances as close to each other as possible for high throughput. """ + UNDEFINED_TYPE = 0 HIGH_AVAILABILITY = 409487576 HIGH_THROUGHPUT = 146499815 @@ -112443,6 +112790,7 @@ class NextHopOrigin(proto.Enum): INCOMPLETE (11941214): No description available. """ + UNDEFINED_NEXT_HOP_ORIGIN = 0 EGP = 68590 IGP = 72434 @@ -112471,6 +112819,7 @@ class RouteStatus(proto.Enum): This route is being processed internally. The status will change once processed. """ + UNDEFINED_ROUTE_STATUS = 0 ACTIVE = 314733318 DROPPED = 496235424 @@ -112500,6 +112849,7 @@ class RouteType(proto.Enum): TRANSIT (187793843): No description available. """ + UNDEFINED_ROUTE_TYPE = 0 BGP = 65707 STATIC = 308331118 @@ -112696,6 +113046,7 @@ class PathSegmentType(proto.Enum): AS_SET (329846453): No description available. """ + UNDEFINED_PATH_SEGMENT_TYPE = 0 AS_CONFED_SEQUENCE = 222152624 AS_CONFED_SET = 374040307 @@ -112870,6 +113221,7 @@ class Type(proto.Enum): ROUTE_POLICY_TYPE_IMPORT (397444755): The Route Policy is an Import Policy. """ + UNDEFINED_TYPE = 0 ROUTE_POLICY_TYPE_EXPORT = 293086882 ROUTE_POLICY_TYPE_IMPORT = 397444755 @@ -113081,12 +113433,12 @@ class Router(proto.Message): number=3292052, optional=True, ) - md5_authentication_keys: MutableSequence[ - "RouterMd5AuthenticationKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=71063322, - message="RouterMd5AuthenticationKey", + md5_authentication_keys: MutableSequence["RouterMd5AuthenticationKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=71063322, + message="RouterMd5AuthenticationKey", + ) ) name: str = proto.Field( proto.STRING, @@ -113312,6 +113664,7 @@ class AdvertiseMode(proto.Enum): DEFAULT (115302945): No description available. """ + UNDEFINED_ADVERTISE_MODE = 0 CUSTOM = 388595569 DEFAULT = 115302945 @@ -113327,6 +113680,7 @@ class AdvertisedGroups(proto.Enum): Advertise all available subnets (including peer VPC subnets). """ + UNDEFINED_ADVERTISED_GROUPS = 0 ALL_SUBNETS = 3622872 @@ -113339,12 +113693,12 @@ class AdvertisedGroups(proto.Enum): proto.STRING, number=21065526, ) - advertised_ip_ranges: MutableSequence[ - "RouterAdvertisedIpRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=35449932, - message="RouterAdvertisedIpRange", + advertised_ip_ranges: MutableSequence["RouterAdvertisedIpRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=35449932, + message="RouterAdvertisedIpRange", + ) ) asn: int = proto.Field( proto.UINT32, @@ -113553,6 +113907,7 @@ class AdvertiseMode(proto.Enum): DEFAULT (115302945): No description available. """ + UNDEFINED_ADVERTISE_MODE = 0 CUSTOM = 388595569 DEFAULT = 115302945 @@ -113568,6 +113923,7 @@ class AdvertisedGroups(proto.Enum): Advertise all available subnets (including peer VPC subnets). """ + UNDEFINED_ADVERTISED_GROUPS = 0 ALL_SUBNETS = 3622872 @@ -113588,6 +113944,7 @@ class Enable(proto.Enum): TRUE (2583950): No description available. """ + UNDEFINED_ENABLE = 0 FALSE = 66658563 TRUE = 2583950 @@ -113625,6 +113982,7 @@ class ManagementType(proto.Enum): Default value, the BGP peer is manually created and managed by user. """ + UNDEFINED_MANAGEMENT_TYPE = 0 MANAGED_BY_ATTACHMENT = 458926411 MANAGED_BY_USER = 317294067 @@ -113638,12 +113996,12 @@ class ManagementType(proto.Enum): proto.STRING, number=21065526, ) - advertised_ip_ranges: MutableSequence[ - "RouterAdvertisedIpRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=35449932, - message="RouterAdvertisedIpRange", + advertised_ip_ranges: MutableSequence["RouterAdvertisedIpRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=35449932, + message="RouterAdvertisedIpRange", + ) ) advertised_route_priority: int = proto.Field( proto.UINT32, @@ -113656,12 +114014,12 @@ class ManagementType(proto.Enum): optional=True, message="RouterBgpPeerBfd", ) - custom_learned_ip_ranges: MutableSequence[ - "RouterBgpPeerCustomLearnedIpRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=481363012, - message="RouterBgpPeerCustomLearnedIpRange", + custom_learned_ip_ranges: MutableSequence["RouterBgpPeerCustomLearnedIpRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=481363012, + message="RouterBgpPeerCustomLearnedIpRange", + ) ) custom_learned_route_priority: int = proto.Field( proto.INT32, @@ -113834,6 +114192,7 @@ class SessionInitializationMode(proto.Enum): PASSIVE (462813959): No description available. """ + UNDEFINED_SESSION_INITIALIZATION_MODE = 0 ACTIVE = 314733318 DISABLED = 516696700 @@ -114008,6 +114367,7 @@ class IpVersion(proto.Enum): IPV6 (2254343): No description available. """ + UNDEFINED_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -114043,6 +114403,7 @@ class ManagementType(proto.Enum): Default value, the interface is manually created and managed by user. """ + UNDEFINED_MANAGEMENT_TYPE = 0 MANAGED_BY_ATTACHMENT = 458926411 MANAGED_BY_USER = 317294067 @@ -114430,6 +114791,7 @@ class AutoNetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_AUTO_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -114454,6 +114816,7 @@ class EndpointTypes(proto.Enum): ENDPOINT_TYPE_VM (57095474): This is the default. """ + UNDEFINED_ENDPOINT_TYPES = 0 ENDPOINT_TYPE_MANAGED_PROXY_LB = 439196930 ENDPOINT_TYPE_SWG = 159344456 @@ -114484,6 +114847,7 @@ class NatIpAllocateOption(proto.Enum): specified Nat IPs are not enough then the Nat service fails for new VMs. """ + UNDEFINED_NAT_IP_ALLOCATE_OPTION = 0 AUTO_ONLY = 182333500 MANUAL_ONLY = 261251205 @@ -114519,6 +114883,7 @@ class SourceSubnetworkIpRangesToNat(proto.Enum): A list of Subnetworks are allowed to Nat (specified in the field subnetwork below) """ + UNDEFINED_SOURCE_SUBNETWORK_IP_RANGES_TO_NAT = 0 ALL_SUBNETWORKS_ALL_IP_RANGES = 179964376 ALL_SUBNETWORKS_ALL_PRIMARY_IP_RANGES = 185573819 @@ -114555,6 +114920,7 @@ class SourceSubnetworkIpRangesToNat64(proto.Enum): If this option is used, the nat64_subnetworks field must be specified. """ + UNDEFINED_SOURCE_SUBNETWORK_IP_RANGES_TO_NAT64 = 0 ALL_IPV6_SUBNETWORKS = 341632747 LIST_OF_IPV6_SUBNETWORKS = 521079860 @@ -114573,6 +114939,7 @@ class Type(proto.Enum): NAT used for public IP translation. This is the default. """ + UNDEFINED_TYPE = 0 PRIVATE = 403485027 PUBLIC = 223389289 @@ -114626,12 +114993,12 @@ class Type(proto.Enum): number=3373707, optional=True, ) - nat64_subnetworks: MutableSequence[ - "RouterNatSubnetworkToNat64" - ] = proto.RepeatedField( - proto.MESSAGE, - number=63585701, - message="RouterNatSubnetworkToNat64", + nat64_subnetworks: MutableSequence["RouterNatSubnetworkToNat64"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=63585701, + message="RouterNatSubnetworkToNat64", + ) ) nat_ip_allocate_option: str = proto.Field( proto.STRING, @@ -114744,6 +115111,7 @@ class Filter(proto.Enum): TRANSLATIONS_ONLY (357212649): Export logs for successful connections only. """ + UNDEFINED_FILTER = 0 ALL = 64897 ERRORS_ONLY = 307484672 @@ -114915,6 +115283,7 @@ class SourceIpRangesToNat(proto.Enum): PRIMARY_IP_RANGE (297109954): The primary range is allowed to Nat. """ + UNDEFINED_SOURCE_IP_RANGES_TO_NAT = 0 ALL_IP_RANGES = 35608496 LIST_OF_SECONDARY_IP_RANGES = 192289308 @@ -115179,6 +115548,7 @@ class Status(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATUS = 0 DOWN = 2104482 UNKNOWN = 433141802 @@ -115205,6 +115575,7 @@ class StatusReason(proto.Enum): STATUS_REASON_UNSPECIFIED (394331913): No description available. """ + UNDEFINED_STATUS_REASON = 0 IPV4_PEER_ON_IPV6_ONLY_CONNECTION = 435936662 IPV6_PEER_ON_IPV4_ONLY_CONNECTION = 436304082 @@ -115384,12 +115755,12 @@ class RouterStatusNatStatus(proto.Message): number=512367468, optional=True, ) - rule_status: MutableSequence[ - "RouterStatusNatStatusNatRuleStatus" - ] = proto.RepeatedField( - proto.MESSAGE, - number=140223125, - message="RouterStatusNatStatusNatRuleStatus", + rule_status: MutableSequence["RouterStatusNatStatusNatRuleStatus"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=140223125, + message="RouterStatusNatStatusNatRuleStatus", + ) ) user_allocated_nat_ip_resources: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -115845,6 +116216,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -115863,6 +116235,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -116013,6 +116386,7 @@ class Interface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -116034,6 +116408,7 @@ class Mode(proto.Enum): virtual machine at a time can be attached to a disk in read-write mode. """ + UNDEFINED_MODE = 0 READ_ONLY = 91950261 READ_WRITE = 173607894 @@ -116054,6 +116429,7 @@ class StorageBytesStatus(proto.Enum): UP_TO_DATE (101306702): No description available. """ + UNDEFINED_STORAGE_BYTES_STATUS = 0 UPDATING = 494614342 UP_TO_DATE = 101306702 @@ -116071,6 +116447,7 @@ class Type(proto.Enum): SCRATCH (496778970): No description available. """ + UNDEFINED_TYPE = 0 PERSISTENT = 460683927 SCRATCH = 496778970 @@ -116211,6 +116588,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -116232,6 +116610,7 @@ class StorageBytesStatus(proto.Enum): UP_TO_DATE (101306702): No description available. """ + UNDEFINED_STORAGE_BYTES_STATUS = 0 UPDATING = 494614342 UP_TO_DATE = 101306702 @@ -116310,6 +116689,7 @@ class State(proto.Enum): The current autoscaling recommendation is not influenced by this scaling schedule. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DISABLED = 516696700 @@ -116466,6 +116846,7 @@ class InstanceTerminationAction(proto.Enum): Stop the VM without storing in-memory content. default action. """ + UNDEFINED_INSTANCE_TERMINATION_ACTION = 0 DELETE = 402225579 INSTANCE_TERMINATION_ACTION_UNSPECIFIED = 92954803 @@ -116496,6 +116877,7 @@ class OnHostMaintenance(proto.Enum): restarted outside the window of maintenance events. """ + UNDEFINED_ON_HOST_MAINTENANCE = 0 MIGRATE = 165699979 TERMINATE = 527617601 @@ -116519,6 +116901,7 @@ class ProvisioningModel(proto.Enum): Standard provisioning with user controlled runtime, no discounts. """ + UNDEFINED_PROVISIONING_MODEL = 0 FLEX_START = 101746812 RESERVATION_BOUND = 293538571 @@ -116646,6 +117029,7 @@ class Operator(proto.Enum): OPERATOR_UNSPECIFIED (128892924): No description available. """ + UNDEFINED_OPERATOR = 0 IN = 2341 NOT_IN = 161144369 @@ -117091,6 +117475,7 @@ class Type(proto.Enum): CLOUD_ARMOR_NETWORK (488527428): No description available. """ + UNDEFINED_TYPE = 0 CLOUD_ARMOR = 260640373 CLOUD_ARMOR_EDGE = 250728775 @@ -117195,12 +117580,12 @@ class Type(proto.Enum): number=3575610, optional=True, ) - user_defined_fields: MutableSequence[ - "SecurityPolicyUserDefinedField" - ] = proto.RepeatedField( - proto.MESSAGE, - number=28312739, - message="SecurityPolicyUserDefinedField", + user_defined_fields: MutableSequence["SecurityPolicyUserDefinedField"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=28312739, + message="SecurityPolicyUserDefinedField", + ) ) @@ -117268,6 +117653,7 @@ class RuleVisibility(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_RULE_VISIBILITY = 0 PREMIUM = 399530551 STANDARD = 484642493 @@ -117424,6 +117810,7 @@ class Type(proto.Enum): UNSPECIFIED_TYPE (53933922): No description available. """ + UNDEFINED_TYPE = 0 HTTP_HEADER_HOST = 374321891 HTTP_PATH = 311503228 @@ -117494,6 +117881,7 @@ class JsonParsing(proto.Enum): STANDARD_WITH_GRAPHQL (106979218): No description available. """ + UNDEFINED_JSON_PARSING = 0 DISABLED = 516696700 STANDARD = 484642493 @@ -117511,6 +117899,7 @@ class LogLevel(proto.Enum): VERBOSE (532219234): No description available. """ + UNDEFINED_LOG_LEVEL = 0 NORMAL = 161067239 VERBOSE = 532219234 @@ -117668,6 +118057,7 @@ class DdosProtection(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_DDOS_PROTECTION = 0 ADVANCED = 63789090 ADVANCED_PREVIEW = 40905867 @@ -118098,6 +118488,7 @@ class VersionedExpr(proto.Enum): Matches the source IP address of a request to the IP ranges supplied in config. """ + UNDEFINED_VERSIONED_EXPR = 0 SRC_IPS_V1 = 70925961 @@ -118306,12 +118697,12 @@ class SecurityPolicyRulePreconfiguredWafConfig(proto.Message): preconfigured WAF evaluation. """ - exclusions: MutableSequence[ - "SecurityPolicyRulePreconfiguredWafConfigExclusion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=208665701, - message="SecurityPolicyRulePreconfiguredWafConfigExclusion", + exclusions: MutableSequence["SecurityPolicyRulePreconfiguredWafConfigExclusion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=208665701, + message="SecurityPolicyRulePreconfiguredWafConfigExclusion", + ) ) @@ -118433,6 +118824,7 @@ class Op(proto.Enum): The operator matches if the field value starts with the specified value. """ + UNDEFINED_OP = 0 CONTAINS = 215180831 ENDS_WITH = 490402221 @@ -118639,6 +119031,7 @@ class EnforceOnKey(proto.Enum): XFF_IP (438707118): No description available. """ + UNDEFINED_ENFORCE_ON_KEY = 0 ALL = 64897 HTTP_COOKIE = 494981627 @@ -118836,6 +119229,7 @@ class EnforceOnKeyType(proto.Enum): XFF_IP (438707118): No description available. """ + UNDEFINED_ENFORCE_ON_KEY_TYPE = 0 ALL = 64897 HTTP_COOKIE = 494981627 @@ -118937,6 +119331,7 @@ class Type(proto.Enum): GOOGLE_RECAPTCHA (518803009): No description available. """ + UNDEFINED_TYPE = 0 EXTERNAL_302 = 395733761 GOOGLE_RECAPTCHA = 518803009 @@ -119035,6 +119430,7 @@ class Base(proto.Enum): UDP (83873): No description available. """ + UNDEFINED_BASE = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -119261,6 +119657,7 @@ class Type(proto.Enum): SERVER_BINDING_TYPE_UNSPECIFIED (180825512): No description available. """ + UNDEFINED_TYPE = 0 RESTART_NODE_ON_ANY_SERVER = 502950985 RESTART_NODE_ON_MINIMAL_SERVERS = 204166495 @@ -119498,29 +119895,30 @@ class ConnectionPreference(proto.Enum): CONNECTION_PREFERENCE_UNSPECIFIED (34590772): No description available. """ + UNDEFINED_CONNECTION_PREFERENCE = 0 ACCEPT_AUTOMATIC = 75250580 ACCEPT_MANUAL = 373061341 CONNECTION_PREFERENCE_UNSPECIFIED = 34590772 - connected_endpoints: MutableSequence[ - "ServiceAttachmentConnectedEndpoint" - ] = proto.RepeatedField( - proto.MESSAGE, - number=72223688, - message="ServiceAttachmentConnectedEndpoint", + connected_endpoints: MutableSequence["ServiceAttachmentConnectedEndpoint"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=72223688, + message="ServiceAttachmentConnectedEndpoint", + ) ) connection_preference: str = proto.Field( proto.STRING, number=285818076, optional=True, ) - consumer_accept_lists: MutableSequence[ - "ServiceAttachmentConsumerProjectLimit" - ] = proto.RepeatedField( - proto.MESSAGE, - number=402725703, - message="ServiceAttachmentConsumerProjectLimit", + consumer_accept_lists: MutableSequence["ServiceAttachmentConsumerProjectLimit"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=402725703, + message="ServiceAttachmentConsumerProjectLimit", + ) ) consumer_reject_lists: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -119758,6 +120156,7 @@ class Status(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -120378,6 +120777,7 @@ class State(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_STATE = 0 ABANDONED = 81797556 DONE = 2104194 @@ -125020,6 +125420,7 @@ class ShareType(proto.Enum): Shared-reservation is open to specific projects """ + UNDEFINED_SHARE_TYPE = 0 LOCAL = 72607563 ORGANIZATION = 274978099 @@ -125674,6 +126075,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -125691,6 +126093,7 @@ class SnapshotType(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_SNAPSHOT_TYPE = 0 ARCHIVE = 506752162 STANDARD = 484642493 @@ -125714,6 +126117,7 @@ class Status(proto.Enum): UPLOADING (267603489): Snapshot is being uploaded. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -125737,6 +126141,7 @@ class StorageBytesStatus(proto.Enum): UP_TO_DATE (101306702): No description available. """ + UNDEFINED_STORAGE_BYTES_STATUS = 0 UPDATING = 494614342 UP_TO_DATE = 101306702 @@ -126095,6 +126500,7 @@ class Policy(proto.Enum): STORAGE_LOCATION_POLICY_UNSPECIFIED (250644592): No description available. """ + UNDEFINED_POLICY = 0 LOCAL_REGION = 403535464 NEAREST_MULTI_REGION = 212467515 @@ -126323,6 +126729,7 @@ class KeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_KEY_REVOCATION_ACTION_TYPE = 0 KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 467110106 NONE = 2402104 @@ -126343,6 +126750,7 @@ class PostKeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_POST_KEY_REVOCATION_ACTION_TYPE = 0 NOOP = 2402146 POST_KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 228738393 @@ -126563,6 +126971,7 @@ class Type(proto.Enum): TYPE_UNSPECIFIED (437714322): No description available. """ + UNDEFINED_TYPE = 0 MANAGED = 479501183 SELF_MANAGED = 434437516 @@ -126855,6 +127264,7 @@ class Status(proto.Enum): managed SslCertificate resource. For details on which domain failed, consult domain_status field. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 MANAGED_CERTIFICATE_STATUS_UNSPECIFIED = 474800850 @@ -127270,6 +127680,7 @@ class MinTlsVersion(proto.Enum): TLS_1_3 (33116737): TLS 1.3 """ + UNDEFINED_MIN_TLS_VERSION = 0 TLS_1_0 = 33116734 TLS_1_1 = 33116735 @@ -127309,6 +127720,7 @@ class Profile(proto.Enum): SSL features, intended to meet stricter compliance requirements. """ + UNDEFINED_PROFILE = 0 COMPATIBLE = 179357396 CUSTOM = 388595569 @@ -127820,29 +128232,29 @@ class StatefulPolicyPreservedState(proto.Message): network interface name. """ - disks: MutableMapping[ - str, "StatefulPolicyPreservedStateDiskDevice" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=95594102, - message="StatefulPolicyPreservedStateDiskDevice", + disks: MutableMapping[str, "StatefulPolicyPreservedStateDiskDevice"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=95594102, + message="StatefulPolicyPreservedStateDiskDevice", + ) ) - external_i_ps: MutableMapping[ - str, "StatefulPolicyPreservedStateNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=532687245, - message="StatefulPolicyPreservedStateNetworkIp", + external_i_ps: MutableMapping[str, "StatefulPolicyPreservedStateNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=532687245, + message="StatefulPolicyPreservedStateNetworkIp", + ) ) - internal_i_ps: MutableMapping[ - str, "StatefulPolicyPreservedStateNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=215731675, - message="StatefulPolicyPreservedStateNetworkIp", + internal_i_ps: MutableMapping[str, "StatefulPolicyPreservedStateNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=215731675, + message="StatefulPolicyPreservedStateNetworkIp", + ) ) @@ -127881,6 +128293,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -127928,6 +128341,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -128584,6 +128998,7 @@ class CapacityProvisioningType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_CAPACITY_PROVISIONING_TYPE = 0 class PerformanceProvisioningType(proto.Enum): @@ -128601,6 +129016,7 @@ class PerformanceProvisioningType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_PERFORMANCE_PROVISIONING_TYPE = 0 class State(proto.Enum): @@ -128627,6 +129043,7 @@ class State(proto.Enum): READY (77848963): StoragePool is ready for use. """ + UNDEFINED_STATE = 0 CREATING = 455564985 DELETING = 528602024 @@ -128912,6 +129329,7 @@ class Status(proto.Enum): Disk is currently unavailable and cannot be accessed, attached or detached. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -130060,6 +130478,7 @@ class Ipv6AccessType(proto.Enum): UNSPECIFIED_IPV6_ACCESS_TYPE (313080613): No description available. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -130088,6 +130507,7 @@ class Ipv6GceEndpoint(proto.Enum): VM_ONLY (236773428): No description available. """ + UNDEFINED_IPV6_GCE_ENDPOINT = 0 VM_AND_FR = 41830108 VM_ONLY = 236773428 @@ -130112,6 +130532,7 @@ class PrivateIpv6GoogleAccess(proto.Enum): Outbound private IPv6 access from VMs in this subnet to Google services. """ + UNDEFINED_PRIVATE_IPV6_GOOGLE_ACCESS = 0 DISABLE_GOOGLE_ACCESS = 450958579 ENABLE_BIDIRECTIONAL_ACCESS_TO_GOOGLE = 427975994 @@ -130151,6 +130572,7 @@ class Purpose(proto.Enum): Subnetwork used for Regional Envoy-based Load Balancing. """ + UNDEFINED_PURPOSE = 0 GLOBAL_MANAGED_PROXY = 236463602 INTERNAL_HTTPS_LOAD_BALANCER = 248748889 @@ -130180,6 +130602,7 @@ class Role(proto.Enum): The BACKUP subnet that could be promoted to ACTIVE. """ + UNDEFINED_ROLE = 0 ACTIVE = 314733318 BACKUP = 341010882 @@ -130209,6 +130632,7 @@ class StackType(proto.Enum): UNSPECIFIED_STACK_TYPE (298084569): No description available. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -130233,6 +130657,7 @@ class State(proto.Enum): READY (77848963): Subnetwork is ready for use. """ + UNDEFINED_STATE = 0 DRAINING = 480455402 READY = 77848963 @@ -130364,12 +130789,12 @@ class State(proto.Enum): number=3506294, optional=True, ) - secondary_ip_ranges: MutableSequence[ - "SubnetworkSecondaryRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=136658915, - message="SubnetworkSecondaryRange", + secondary_ip_ranges: MutableSequence["SubnetworkSecondaryRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=136658915, + message="SubnetworkSecondaryRange", + ) ) self_link: str = proto.Field( proto.STRING, @@ -130640,6 +131065,7 @@ class AggregationInterval(proto.Enum): INTERVAL_5_SEC (72752429): No description available. """ + UNDEFINED_AGGREGATION_INTERVAL = 0 INTERVAL_10_MIN = 487155916 INTERVAL_15_MIN = 491773521 @@ -130665,6 +131091,7 @@ class Metadata(proto.Enum): INCLUDE_ALL_METADATA (164619908): No description available. """ + UNDEFINED_METADATA = 0 CUSTOM_METADATA = 62450749 EXCLUDE_ALL_METADATA = 334519954 @@ -131051,6 +131478,7 @@ class Policy(proto.Enum): substantial imbalance in the count of clients and backends. """ + UNDEFINED_POLICY = 0 CONSISTENT_HASH_SUBSETTING = 108989492 NONE = 2402104 @@ -131427,6 +131855,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -131445,6 +131874,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -132174,6 +132604,7 @@ class QuicOverride(proto.Enum): option is implicit if no QUIC override has been specified in the request. """ + UNDEFINED_QUIC_OVERRIDE = 0 DISABLE = 241807048 ENABLE = 438835587 @@ -132496,6 +132927,7 @@ class QuicOverride(proto.Enum): option is implicit if no QUIC override has been specified in the request. """ + UNDEFINED_QUIC_OVERRIDE = 0 DISABLE = 241807048 ENABLE = 438835587 @@ -132560,6 +132992,7 @@ class TlsEarlyData(proto.Enum): security stance and mitigated the risk of replay attacks using other mechanisms. """ + UNDEFINED_TLS_EARLY_DATA = 0 DISABLED = 516696700 PERMISSIVE = 504345247 @@ -132922,6 +133355,7 @@ class NatPolicy(proto.Enum): NO_NAT (161455491): No NAT performed. """ + UNDEFINED_NAT_POLICY = 0 NO_NAT = 161455491 @@ -133352,6 +133786,7 @@ class SessionAffinity(proto.Enum): same backend VM while that VM remains healthy, as long as the cookie has not expired. """ + UNDEFINED_SESSION_AFFINITY = 0 CLIENT_IP = 345665051 CLIENT_IP_NO_DESTINATION = 106122516 @@ -133809,6 +134244,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -133936,6 +134372,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -134146,6 +134583,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -134253,6 +134691,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -134581,6 +135020,7 @@ class Status(proto.Enum): READY (77848963): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -136653,6 +137093,7 @@ class MaintenanceReasons(proto.Enum): Maintenance due to planned update to the instance. """ + UNDEFINED_MAINTENANCE_REASONS = 0 FAILURE_DISK = 8573778 FAILURE_GPU = 467876919 @@ -136687,6 +137128,7 @@ class MaintenanceStatus(proto.Enum): Unknown maintenance status. Do not use this value. """ + UNDEFINED_MAINTENANCE_STATUS = 0 ONGOING = 473158491 PENDING = 35394935 @@ -136711,6 +137153,7 @@ class Type(proto.Enum): Unscheduled maintenance (e.g. emergency maintenance during uptime guarantee). """ + UNDEFINED_TYPE = 0 MULTIPLE = 362714640 SCHEDULED = 478400653 @@ -137424,6 +137867,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -137440,6 +137884,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 instance: str = proto.Field( @@ -139425,6 +139870,7 @@ class LoadBalancingSchemes(proto.Enum): inference is not possible, EXTERNAL will be used as the default type. """ + UNDEFINED_LOAD_BALANCING_SCHEMES = 0 EXTERNAL = 35607499 EXTERNAL_MANAGED = 512006923 @@ -139623,6 +140069,7 @@ class Ipv6AccessType(proto.Enum): addresses that are only accessible over the VPC network. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -139661,6 +140108,7 @@ class Purpose(proto.Enum): Subnetwork used for Regional Envoy-based Load Balancing. """ + UNDEFINED_PURPOSE = 0 GLOBAL_MANAGED_PROXY = 236463602 INTERNAL_HTTPS_LOAD_BALANCER = 248748889 @@ -139690,6 +140138,7 @@ class Role(proto.Enum): The BACKUP subnet that could be promoted to ACTIVE. """ + UNDEFINED_ROLE = 0 ACTIVE = 314733318 BACKUP = 341010882 @@ -139717,6 +140166,7 @@ class StackType(proto.Enum): New VMs in this subnet will only be assigned IPv6 addresses. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -139757,12 +140207,12 @@ class StackType(proto.Enum): number=3506294, optional=True, ) - secondary_ip_ranges: MutableSequence[ - "UsableSubnetworkSecondaryRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=136658915, - message="UsableSubnetworkSecondaryRange", + secondary_ip_ranges: MutableSequence["UsableSubnetworkSecondaryRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=136658915, + message="UsableSubnetworkSecondaryRange", + ) ) stack_type: str = proto.Field( proto.STRING, @@ -140380,6 +140830,7 @@ class GatewayIpVersion(proto.Enum): Every HA-VPN gateway interface is configured with an IPv6 address. """ + UNDEFINED_GATEWAY_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -140402,6 +140853,7 @@ class StackType(proto.Enum): IPV6_ONLY (79632100): Enable VPN gateway with only IPv6 protocol. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -140467,12 +140919,12 @@ class StackType(proto.Enum): number=425908881, optional=True, ) - vpn_interfaces: MutableSequence[ - "VpnGatewayVpnGatewayInterface" - ] = proto.RepeatedField( - proto.MESSAGE, - number=91842181, - message="VpnGatewayVpnGatewayInterface", + vpn_interfaces: MutableSequence["VpnGatewayVpnGatewayInterface"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=91842181, + message="VpnGatewayVpnGatewayInterface", + ) ) @@ -140642,12 +141094,12 @@ class VpnGatewayStatus(proto.Message): VpnGateway. """ - vpn_connections: MutableSequence[ - "VpnGatewayStatusVpnConnection" - ] = proto.RepeatedField( - proto.MESSAGE, - number=439334538, - message="VpnGatewayStatusVpnConnection", + vpn_connections: MutableSequence["VpnGatewayStatusVpnConnection"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=439334538, + message="VpnGatewayStatusVpnConnection", + ) ) @@ -140699,6 +141151,7 @@ class State(proto.Enum): redundancy from the Cloud VPN gateway to the peer gateway """ + UNDEFINED_STATE = 0 CONNECTION_REDUNDANCY_MET = 505242907 CONNECTION_REDUNDANCY_NOT_MET = 511863311 @@ -140715,6 +141168,7 @@ class UnsatisfiedReason(proto.Enum): INCOMPLETE_TUNNELS_COVERAGE (55917437): No description available. """ + UNDEFINED_UNSATISFIED_REASON = 0 INCOMPLETE_TUNNELS_COVERAGE = 55917437 @@ -141232,6 +141686,7 @@ class Status(proto.Enum): ForwardingRule and Route resources are needed to setup VPN tunnel. """ + UNDEFINED_STATUS = 0 ALLOCATING_RESOURCES = 320922816 AUTHORIZATION_ERROR = 23580290 @@ -141931,6 +142386,7 @@ class Code(proto.Enum): UNREACHABLE (13328052): A given scope cannot be reached. """ + UNDEFINED_CODE = 0 CLEANUP_FAILED = 150308440 DEPRECATED_RESOURCE_USED = 391835586 @@ -142104,6 +142560,7 @@ class Code(proto.Enum): UNREACHABLE (13328052): A given scope cannot be reached. """ + UNDEFINED_CODE = 0 CLEANUP_FAILED = 150308440 DEPRECATED_RESOURCE_USED = 391835586 @@ -142472,13 +142929,13 @@ class WireGroupEndpoint(proto.Message): - Value: an Interconnect object. """ - interconnects: MutableMapping[ - str, "WireGroupEndpointInterconnect" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=520187301, - message="WireGroupEndpointInterconnect", + interconnects: MutableMapping[str, "WireGroupEndpointInterconnect"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=520187301, + message="WireGroupEndpointInterconnect", + ) ) @@ -142750,6 +143207,7 @@ class BandwidthAllocation(proto.Enum): bandwidth from unused or underused wires to other wires in the group. """ + UNDEFINED_BANDWIDTH_ALLOCATION = 0 ALLOCATE_PER_WIRE = 358730057 SHARED_WITH_WIRE_GROUP = 286454628 @@ -142775,6 +143233,7 @@ class FaultResponse(proto.Enum): NONE (2402104): Default. """ + UNDEFINED_FAULT_RESPONSE = 0 DISABLE_PORT = 287086488 NONE = 2402104 @@ -143016,6 +143475,7 @@ class Type(proto.Enum): XPN_RESOURCE_TYPE_UNSPECIFIED (151607034): No description available. """ + UNDEFINED_TYPE = 0 PROJECT = 408671993 XPN_RESOURCE_TYPE_UNSPECIFIED = 151607034 @@ -143105,6 +143565,7 @@ class Status(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATUS = 0 DOWN = 2104482 UP = 2715 diff --git a/packages/google-cloud-compute/mypy.ini b/packages/google-cloud-compute/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-compute/mypy.ini +++ b/packages/google-cloud-compute/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-compute/noxfile.py b/packages/google-cloud-compute/noxfile.py index 7b4b863a8656..5e00df8c0b74 100644 --- a/packages/google-cloud-compute/noxfile.py +++ b/packages/google-cloud-compute/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_accelerator_types.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_accelerator_types.py index bd219304763d..9010cf1a9e92 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_accelerator_types.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_accelerator_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_accelerator_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_accelerator_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_accelerator_types_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_addresses.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_addresses.py index 49bf831956ec..345a2c74b45d 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_addresses.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_addresses.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -873,10 +873,9 @@ def test_addresses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -921,10 +920,9 @@ def test_addresses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_addresses_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3561,9 +3558,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_advice.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_advice.py index 8a127b1fcb12..2f23ca3cfca2 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_advice.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_advice.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -849,10 +854,9 @@ def test_advice_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -897,10 +901,9 @@ def test_advice_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -936,10 +939,9 @@ def test_advice_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_autoscalers.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_autoscalers.py index 00533cf97f28..003a74949c3b 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_autoscalers.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_autoscalers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_autoscalers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_autoscalers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_autoscalers_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3150,9 +3147,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_buckets.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_buckets.py index fef3ea02ddc5..a864a8b9ab22 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_buckets.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_buckets.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -902,10 +902,9 @@ def test_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -950,10 +949,9 @@ def test_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +987,9 @@ def test_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1171,9 +1168,9 @@ def test_add_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key(request) @@ -1377,9 +1374,9 @@ def test_add_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key_unary(request) @@ -1978,9 +1975,9 @@ def test_delete_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key(request) @@ -2206,9 +2203,9 @@ def test_delete_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key_unary(request) @@ -4503,9 +4500,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_services.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_services.py index 5a4c7a1e4f36..1572b3bafb04 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_services.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_backend_services_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_backend_services_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_backend_services_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1185,9 +1182,9 @@ def test_add_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key(request) @@ -1391,9 +1388,9 @@ def test_add_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key_unary(request) @@ -2270,9 +2267,9 @@ def test_delete_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key(request) @@ -2498,9 +2495,9 @@ def test_delete_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key_unary(request) @@ -5460,9 +5457,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -5670,9 +5667,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -5880,9 +5877,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_cross_site_networks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_cross_site_networks.py index 2fb314afa69d..22de129d0c88 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_cross_site_networks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_cross_site_networks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_cross_site_networks_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_cross_site_networks_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_cross_site_networks_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disk_types.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disk_types.py index 8a4120080063..25d87b4c5014 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disk_types.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disk_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -868,10 +873,9 @@ def test_disk_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -916,10 +920,9 @@ def test_disk_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +958,9 @@ def test_disk_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disks.py index 97871e13796f..74c9575ac7c8 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -852,10 +852,9 @@ def test_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -900,10 +899,9 @@ def test_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -939,10 +937,9 @@ def test_disks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1122,9 +1119,9 @@ def test_add_resource_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies(request) @@ -1340,9 +1337,9 @@ def test_add_resource_policies_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies_unary(request) @@ -6553,9 +6550,9 @@ def test_stop_async_replication_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication(request) @@ -6763,9 +6760,9 @@ def test_stop_async_replication_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication_unary(request) @@ -7396,9 +7393,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_external_vpn_gateways.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_external_vpn_gateways.py index 6945020c889b..c61455bf8067 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_external_vpn_gateways.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_external_vpn_gateways.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_external_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_external_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_external_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2863,9 +2860,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewall_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewall_policies.py index 4e5641cb585a..10e8b5747d3c 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewall_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewall_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_firewall_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_firewall_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_firewall_policies_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4026,9 +4023,9 @@ def test_list_associations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_associations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_associations] = ( + mock_rpc + ) request = {} client.list_associations(request) @@ -5326,9 +5323,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -5527,9 +5524,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) @@ -6315,9 +6312,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewalls.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewalls.py index 6673e040d677..4caf656a584b 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewalls.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewalls.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -873,10 +873,9 @@ def test_firewalls_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -921,10 +920,9 @@ def test_firewalls_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_firewalls_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2784,9 +2781,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_forwarding_rules.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_forwarding_rules.py index 891e6c226c63..ed4faaa535e9 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_forwarding_rules.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_forwarding_rules.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_future_reservations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_future_reservations.py index e99357d13ee3..672560f443c5 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_future_reservations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_future_reservations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_future_reservations_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_future_reservations_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_future_reservations_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_addresses.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_addresses.py index 3a29c6bc4fcf..cd80d727b951 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_addresses.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_addresses.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_global_addresses_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_global_addresses_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_global_addresses_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3231,9 +3228,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_forwarding_rules.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_forwarding_rules.py index dc215cee85d8..304937642067 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_forwarding_rules.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_forwarding_rules.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_global_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_global_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_global_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_network_endpoint_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_network_endpoint_groups.py index efbe6a2048f5..4ebf16a75d33 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_network_endpoint_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_network_endpoint_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_global_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_global_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_global_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3361,9 +3358,9 @@ def test_list_network_endpoints_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_endpoints - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_endpoints] = ( + mock_rpc + ) request = {} client.list_network_endpoints(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_operations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_operations.py index 973759c9a642..5b3e13f51909 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_operations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_global_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_global_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_global_operations_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_organization_operations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_organization_operations.py index 7de76a4c6c32..ac6603ea03da 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_organization_operations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_organization_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -969,10 +974,9 @@ def test_global_organization_operations_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1021,9 @@ def test_global_organization_operations_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1056,10 +1059,9 @@ def test_global_organization_operations_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_public_delegated_prefixes.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_public_delegated_prefixes.py index 7e1cf90ca3ec..8f12f899a1a2 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_public_delegated_prefixes.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_public_delegated_prefixes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -987,10 +987,9 @@ def test_global_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1034,9 @@ def test_global_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1074,10 +1072,9 @@ def test_global_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_sour "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_health_checks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_health_checks.py index 64d9fae8bb57..daea6ee6d650 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_health_checks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_health_checks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -885,10 +885,9 @@ def test_health_checks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -933,10 +932,9 @@ def test_health_checks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_health_checks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3062,9 +3059,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_image_family_views.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_image_family_views.py index 2d6ab096afdb..ebba14684dc1 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_image_family_views.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_image_family_views.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -909,10 +914,9 @@ def test_image_family_views_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +961,9 @@ def test_image_family_views_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -996,10 +999,9 @@ def test_image_family_views_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_images.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_images.py index 6196f0ea4834..287f364a2399 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_images.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_images.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -856,10 +856,9 @@ def test_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -904,10 +903,9 @@ def test_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -943,10 +941,9 @@ def test_images_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4170,9 +4167,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_manager_resize_requests.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_manager_resize_requests.py index a5df10b14314..2ff9b6503a58 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_manager_resize_requests.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_manager_resize_requests.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -997,10 +997,9 @@ def test_instance_group_manager_resize_requests_client_get_mtls_endpoint_and_cer client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1044,9 @@ def test_instance_group_manager_resize_requests_client_get_mtls_endpoint_and_cer client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1084,10 +1082,9 @@ def test_instance_group_manager_resize_requests_client_get_mtls_endpoint_and_cer "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_managers.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_managers.py index 24e86a43a136..4bff4e538d88 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_managers.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_managers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_instance_group_managers_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_instance_group_managers_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_instance_group_managers_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1213,9 +1210,9 @@ def test_abandon_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances(request) @@ -1432,9 +1429,9 @@ def test_abandon_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances_unary(request) @@ -2369,9 +2366,9 @@ def test_create_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances(request) @@ -2588,9 +2585,9 @@ def test_create_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances_unary(request) @@ -3225,9 +3222,9 @@ def test_delete_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances(request) @@ -3444,9 +3441,9 @@ def test_delete_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances_unary(request) @@ -5298,9 +5295,9 @@ def test_list_managed_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_managed_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_managed_instances] = ( + mock_rpc + ) request = {} client.list_managed_instances(request) @@ -6795,9 +6792,9 @@ def test_recreate_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances(request) @@ -7016,9 +7013,9 @@ def test_recreate_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances_unary(request) @@ -7703,9 +7700,9 @@ def test_resume_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances(request) @@ -7922,9 +7919,9 @@ def test_resume_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances_unary(request) @@ -8144,9 +8141,9 @@ def test_set_instance_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template(request) @@ -8366,9 +8363,9 @@ def test_set_instance_template_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template_unary(request) @@ -8585,9 +8582,9 @@ def test_set_target_pools_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools(request) @@ -8804,9 +8801,9 @@ def test_set_target_pools_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools_unary(request) @@ -9891,9 +9888,9 @@ def test_suspend_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances(request) @@ -10110,9 +10107,9 @@ def test_suspend_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances_unary(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_groups.py index 8d353d53e5a8..2b2f1ddb8d72 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -902,10 +902,9 @@ def test_instance_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -950,10 +949,9 @@ def test_instance_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +987,9 @@ def test_instance_groups_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3440,10 +3437,10 @@ def test_list_instances_rest_pager(transport: str = "rest"): "zone": "sample2", "instance_group": "sample3", } - sample_request[ - "instance_groups_list_instances_request_resource" - ] = compute.InstanceGroupsListInstancesRequest( - instance_state="instance_state_value" + sample_request["instance_groups_list_instances_request_resource"] = ( + compute.InstanceGroupsListInstancesRequest( + instance_state="instance_state_value" + ) ) pager = client.list_instances(request=sample_request) @@ -3478,9 +3475,9 @@ def test_remove_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_instances] = ( + mock_rpc + ) request = {} client.remove_instances(request) @@ -3697,9 +3694,9 @@ def test_remove_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_instances] = ( + mock_rpc + ) request = {} client.remove_instances_unary(request) @@ -4352,9 +4349,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_settings_service.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_settings_service.py index 7ec01b09cc66..f1f73cf1b824 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_settings_service.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_settings_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -940,10 +940,9 @@ def test_instance_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +987,9 @@ def test_instance_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1025,9 @@ def test_instance_settings_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_templates.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_templates.py index 06dbebdf2fa5..3e98c8ecc3a5 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_templates.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_templates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_instance_templates_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_instance_templates_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_instance_templates_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3113,9 +3110,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instances.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instances.py index f5168ead761e..57f422e83936 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instances.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instances.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -873,10 +873,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -921,10 +920,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1140,9 +1137,9 @@ def test_add_access_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_access_config] = ( + mock_rpc + ) request = {} client.add_access_config(request) @@ -1384,9 +1381,9 @@ def test_add_access_config_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_access_config] = ( + mock_rpc + ) request = {} client.add_access_config_unary(request) @@ -1631,9 +1628,9 @@ def test_add_network_interface_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_network_interface - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_network_interface] = ( + mock_rpc + ) request = {} client.add_network_interface(request) @@ -1857,9 +1854,9 @@ def test_add_network_interface_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_network_interface - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_network_interface] = ( + mock_rpc + ) request = {} client.add_network_interface_unary(request) @@ -2083,9 +2080,9 @@ def test_add_resource_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies(request) @@ -2305,9 +2302,9 @@ def test_add_resource_policies_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies_unary(request) @@ -4079,9 +4076,9 @@ def test_delete_access_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_access_config] = ( + mock_rpc + ) request = {} client.delete_access_config(request) @@ -4333,9 +4330,9 @@ def test_delete_access_config_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_access_config] = ( + mock_rpc + ) request = {} client.delete_access_config_unary(request) @@ -5967,9 +5964,9 @@ def test_get_guest_attributes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_guest_attributes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_guest_attributes] = ( + mock_rpc + ) request = {} client.get_guest_attributes(request) @@ -6595,9 +6592,9 @@ def test_get_serial_port_output_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serial_port_output - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serial_port_output] = ( + mock_rpc + ) request = {} client.get_serial_port_output(request) @@ -8019,9 +8016,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -8232,9 +8229,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -8890,9 +8887,9 @@ def test_report_host_as_faulty_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_host_as_faulty - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_host_as_faulty] = ( + mock_rpc + ) request = {} client.report_host_as_faulty(request) @@ -9112,9 +9109,9 @@ def test_report_host_as_faulty_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_host_as_faulty - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_host_as_faulty] = ( + mock_rpc + ) request = {} client.report_host_as_faulty_unary(request) @@ -10819,9 +10816,9 @@ def test_set_disk_auto_delete_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_disk_auto_delete - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_disk_auto_delete] = ( + mock_rpc + ) request = {} client.set_disk_auto_delete(request) @@ -11073,9 +11070,9 @@ def test_set_disk_auto_delete_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_disk_auto_delete - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_disk_auto_delete] = ( + mock_rpc + ) request = {} client.set_disk_auto_delete_unary(request) @@ -11971,9 +11968,9 @@ def test_set_machine_resources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_resources] = ( + mock_rpc + ) request = {} client.set_machine_resources(request) @@ -12193,9 +12190,9 @@ def test_set_machine_resources_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_resources] = ( + mock_rpc + ) request = {} client.set_machine_resources_unary(request) @@ -12412,9 +12409,9 @@ def test_set_machine_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_type] = ( + mock_rpc + ) request = {} client.set_machine_type(request) @@ -12631,9 +12628,9 @@ def test_set_machine_type_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_type] = ( + mock_rpc + ) request = {} client.set_machine_type_unary(request) @@ -13278,9 +13275,9 @@ def test_set_min_cpu_platform_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_min_cpu_platform - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_min_cpu_platform] = ( + mock_rpc + ) request = {} client.set_min_cpu_platform(request) @@ -13499,9 +13496,9 @@ def test_set_min_cpu_platform_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_min_cpu_platform - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_min_cpu_platform] = ( + mock_rpc + ) request = {} client.set_min_cpu_platform_unary(request) @@ -14578,9 +14575,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -14799,9 +14796,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -15020,9 +15017,9 @@ def test_set_service_account_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_service_account] = ( + mock_rpc + ) request = {} client.set_service_account(request) @@ -15241,9 +15238,9 @@ def test_set_service_account_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_service_account] = ( + mock_rpc + ) request = {} client.set_service_account_unary(request) @@ -18546,9 +18543,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -19223,9 +19220,9 @@ def test_update_access_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_access_config] = ( + mock_rpc + ) request = {} client.update_access_config(request) @@ -19469,9 +19466,9 @@ def test_update_access_config_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_access_config] = ( + mock_rpc + ) request = {} client.update_access_config_unary(request) @@ -19716,9 +19713,9 @@ def test_update_display_device_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_display_device - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_display_device] = ( + mock_rpc + ) request = {} client.update_display_device(request) @@ -19934,9 +19931,9 @@ def test_update_display_device_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_display_device - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_display_device] = ( + mock_rpc + ) request = {} client.update_display_device_unary(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instant_snapshots.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instant_snapshots.py index 35022dbbac53..6477ff754bda 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instant_snapshots.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instant_snapshots.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_instant_snapshots_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_instant_snapshots_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_instant_snapshots_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3615,9 +3612,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachment_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachment_groups.py index d4cb596dc3ba..fd33c77da7d9 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachment_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachment_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -976,10 +976,9 @@ def test_interconnect_attachment_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1023,9 @@ def test_interconnect_attachment_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1061,9 @@ def test_interconnect_attachment_groups_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1298,9 +1295,9 @@ def test_delete_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -1504,9 +1501,9 @@ def test_delete_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -1706,9 +1703,9 @@ def test_get_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -2065,9 +2062,9 @@ def test_get_operational_status_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_operational_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_operational_status] = ( + mock_rpc + ) request = {} client.get_operational_status(request) @@ -2105,9 +2102,9 @@ def test_get_operational_status_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -2998,9 +2995,9 @@ def test_patch_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -3230,9 +3227,9 @@ def test_patch_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -3622,9 +3619,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachments.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachments.py index ce0a41a55e88..2b7e9a5e94c3 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachments.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_interconnect_attachments_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_interconnect_attachments_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_interconnect_attachments_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_groups.py index 3019e5d4787d..b6869d3074c8 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_interconnect_groups_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_interconnect_groups_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_interconnect_groups_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2400,9 +2397,9 @@ def test_get_operational_status_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_operational_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_operational_status] = ( + mock_rpc + ) request = {} client.get_operational_status(request) @@ -3952,9 +3949,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_locations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_locations.py index d72bea2dafa8..34448902f9ee 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_locations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_locations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -930,10 +935,9 @@ def test_interconnect_locations_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -978,10 +982,9 @@ def test_interconnect_locations_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1020,9 @@ def test_interconnect_locations_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_remote_locations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_remote_locations.py index 382f6afc619b..a8e7d5ff0083 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_remote_locations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_remote_locations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -967,10 +972,9 @@ def test_interconnect_remote_locations_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1019,9 @@ def test_interconnect_remote_locations_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1054,10 +1057,9 @@ def test_interconnect_remote_locations_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1283,9 +1285,9 @@ def test_get_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectRemoteLocation" - ] = "interconnect_remote_location_value" + jsonified_request["interconnectRemoteLocation"] = ( + "interconnect_remote_location_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnects.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnects.py index 7e12463a0f28..980306d0b315 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnects.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnects.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -898,10 +898,9 @@ def test_interconnects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +945,9 @@ def test_interconnects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +983,9 @@ def test_interconnects_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1941,9 +1938,9 @@ def test_get_macsec_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_macsec_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_macsec_config] = ( + mock_rpc + ) request = {} client.get_macsec_config(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_license_codes.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_license_codes.py index 723e7f4d8b26..5a6615af7f1d 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_license_codes.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_license_codes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +882,9 @@ def test_license_codes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +929,9 @@ def test_license_codes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +967,9 @@ def test_license_codes_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1336,9 +1338,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_licenses.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_licenses.py index 0d79c496ab98..4676a62ee927 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_licenses.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_licenses.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -866,10 +866,9 @@ def test_licenses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -914,10 +913,9 @@ def test_licenses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -953,10 +951,9 @@ def test_licenses_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2806,9 +2803,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_images.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_images.py index cacc3155e8c2..5230fff0bd4f 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_images.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_images.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -898,10 +898,9 @@ def test_machine_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +945,9 @@ def test_machine_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +983,9 @@ def test_machine_images_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3227,9 +3224,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_types.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_types.py index f81865f3f315..0c008f2a6759 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_types.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -878,10 +883,9 @@ def test_machine_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -926,10 +930,9 @@ def test_machine_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +968,9 @@ def test_machine_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_attachments.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_attachments.py index 96a311133d51..473cbf5d711b 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_attachments.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_attachments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_network_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_network_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_network_attachments_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3661,9 +3658,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_edge_security_services.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_edge_security_services.py index 60ae5a72fcfd..febfab72709d 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_edge_security_services.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_edge_security_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_network_edge_security_services_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_network_edge_security_services_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_network_edge_security_services_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1576,9 +1573,9 @@ def test_delete_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -1790,9 +1787,9 @@ def test_delete_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -2000,9 +1997,9 @@ def test_get_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -2644,9 +2641,9 @@ def test_patch_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -2878,9 +2875,9 @@ def test_patch_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_endpoint_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_endpoint_groups.py index 9f7920dc42ec..81fa141d301d 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_endpoint_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_endpoint_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3700,9 +3697,9 @@ def test_list_network_endpoints_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_endpoints - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_endpoints] = ( + mock_rpc + ) request = {} client.list_network_endpoints(request) @@ -3970,10 +3967,10 @@ def test_list_network_endpoints_rest_pager(transport: str = "rest"): "zone": "sample2", "network_endpoint_group": "sample3", } - sample_request[ - "network_endpoint_groups_list_endpoints_request_resource" - ] = compute.NetworkEndpointGroupsListEndpointsRequest( - health_status="health_status_value" + sample_request["network_endpoint_groups_list_endpoints_request_resource"] = ( + compute.NetworkEndpointGroupsListEndpointsRequest( + health_status="health_status_value" + ) ) pager = client.list_network_endpoints(request=sample_request) @@ -4012,9 +4009,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_firewall_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_firewall_policies.py index f2c656c5870b..809ad2294ed9 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_firewall_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_firewall_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_network_firewall_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_network_firewall_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_network_firewall_policies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -6572,9 +6569,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -6784,9 +6781,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) @@ -8040,9 +8037,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_profiles.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_profiles.py index c275a25c6e7c..1778f95d9044 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_profiles.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_profiles.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -909,10 +914,9 @@ def test_network_profiles_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +961,9 @@ def test_network_profiles_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -996,10 +999,9 @@ def test_network_profiles_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_networks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_networks.py index b0f93fa712e5..b76a654a9b03 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_networks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_networks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -866,10 +866,9 @@ def test_networks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -914,10 +913,9 @@ def test_networks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -953,10 +951,9 @@ def test_networks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2969,9 +2966,9 @@ def test_list_peering_routes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_peering_routes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_peering_routes] = ( + mock_rpc + ) request = {} client.list_peering_routes(request) @@ -4065,9 +4062,9 @@ def test_request_remove_peering_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.request_remove_peering - ] = mock_rpc + client._transport._wrapped_methods[client._transport.request_remove_peering] = ( + mock_rpc + ) request = {} client.request_remove_peering(request) @@ -4276,9 +4273,9 @@ def test_request_remove_peering_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.request_remove_peering - ] = mock_rpc + client._transport._wrapped_methods[client._transport.request_remove_peering] = ( + mock_rpc + ) request = {} client.request_remove_peering_unary(request) @@ -4487,9 +4484,9 @@ def test_switch_to_custom_mode_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switch_to_custom_mode - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switch_to_custom_mode] = ( + mock_rpc + ) request = {} client.switch_to_custom_mode(request) @@ -4690,9 +4687,9 @@ def test_switch_to_custom_mode_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switch_to_custom_mode - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switch_to_custom_mode] = ( + mock_rpc + ) request = {} client.switch_to_custom_mode_unary(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_groups.py index 1835a5d746d6..39fb5dcb76b0 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +877,9 @@ def test_node_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +924,9 @@ def test_node_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +962,9 @@ def test_node_groups_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4548,9 +4545,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -4769,9 +4766,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -5199,9 +5196,9 @@ def test_set_node_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_node_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_node_template] = ( + mock_rpc + ) request = {} client.set_node_template(request) @@ -5418,9 +5415,9 @@ def test_set_node_template_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_node_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_node_template] = ( + mock_rpc + ) request = {} client.set_node_template_unary(request) @@ -6083,9 +6080,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_templates.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_templates.py index b54a96c97789..760f3936d724 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_templates.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_templates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -898,10 +898,9 @@ def test_node_templates_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +945,9 @@ def test_node_templates_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +983,9 @@ def test_node_templates_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3157,9 +3154,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_types.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_types.py index 3570a1b427be..99741395cd5c 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_types.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -868,10 +873,9 @@ def test_node_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -916,10 +920,9 @@ def test_node_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +958,9 @@ def test_node_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_organization_security_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_organization_security_policies.py index a0ffdf53378e..6cec75bde095 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_organization_security_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_organization_security_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -976,10 +976,9 @@ def test_organization_security_policies_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1023,9 @@ def test_organization_security_policies_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1061,9 @@ def test_organization_security_policies_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3877,9 +3874,9 @@ def test_list_associations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_associations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_associations] = ( + mock_rpc + ) request = {} client.list_associations(request) @@ -5184,9 +5181,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -5385,9 +5382,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_packet_mirrorings.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_packet_mirrorings.py index b66e3b7a656e..fc5c11b62abe 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_packet_mirrorings.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_packet_mirrorings.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_packet_mirrorings_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_packet_mirrorings_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_packet_mirrorings_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3213,9 +3210,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_preview_features.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_preview_features.py index c2c86d9f8e96..7ce98617dbba 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_preview_features.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_preview_features.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_preview_features_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_preview_features_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_preview_features_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_projects.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_projects.py index 30df2507fc2d..9c1701ddc999 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_projects.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_projects.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -866,10 +866,9 @@ def test_projects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -914,10 +913,9 @@ def test_projects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -953,10 +951,9 @@ def test_projects_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1133,9 +1130,9 @@ def test_disable_xpn_host_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_host - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_host] = ( + mock_rpc + ) request = {} client.disable_xpn_host(request) @@ -1318,9 +1315,9 @@ def test_disable_xpn_host_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_host - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_host] = ( + mock_rpc + ) request = {} client.disable_xpn_host_unary(request) @@ -1505,9 +1502,9 @@ def test_disable_xpn_resource_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_resource] = ( + mock_rpc + ) request = {} client.disable_xpn_resource(request) @@ -1708,9 +1705,9 @@ def test_disable_xpn_resource_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_resource] = ( + mock_rpc + ) request = {} client.disable_xpn_resource_unary(request) @@ -2277,9 +2274,9 @@ def test_enable_xpn_resource_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_xpn_resource] = ( + mock_rpc + ) request = {} client.enable_xpn_resource(request) @@ -2480,9 +2477,9 @@ def test_enable_xpn_resource_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_xpn_resource] = ( + mock_rpc + ) request = {} client.enable_xpn_resource_unary(request) @@ -3032,9 +3029,9 @@ def test_get_xpn_resources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_xpn_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_xpn_resources] = ( + mock_rpc + ) request = {} client.get_xpn_resources(request) @@ -3531,9 +3528,9 @@ def test_list_xpn_hosts_rest_pager(transport: str = "rest"): req.side_effect = return_values sample_request = {"project": "sample1"} - sample_request[ - "projects_list_xpn_hosts_request_resource" - ] = compute.ProjectsListXpnHostsRequest(organization="organization_value") + sample_request["projects_list_xpn_hosts_request_resource"] = ( + compute.ProjectsListXpnHostsRequest(organization="organization_value") + ) pager = client.list_xpn_hosts(request=sample_request) @@ -4359,9 +4356,9 @@ def test_set_cloud_armor_tier_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_cloud_armor_tier - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_cloud_armor_tier] = ( + mock_rpc + ) request = {} client.set_cloud_armor_tier(request) @@ -4562,9 +4559,9 @@ def test_set_cloud_armor_tier_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_cloud_armor_tier - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_cloud_armor_tier] = ( + mock_rpc + ) request = {} client.set_cloud_armor_tier_unary(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_advertised_prefixes.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_advertised_prefixes.py index 669aa76c3ab9..fd925829ff16 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_advertised_prefixes.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_advertised_prefixes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -945,10 +945,9 @@ def test_public_advertised_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +992,9 @@ def test_public_advertised_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1030,9 @@ def test_public_advertised_prefixes_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_delegated_prefixes.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_delegated_prefixes.py index 330f556e1690..11cec2a1e134 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_delegated_prefixes.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_delegated_prefixes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_autoscalers.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_autoscalers.py index 4c9b646b65c5..e7ba611ce2b3 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_autoscalers.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_autoscalers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_region_autoscalers_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_region_autoscalers_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_region_autoscalers_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2929,9 +2926,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_backend_services.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_backend_services.py index ccd49a697eb4..2236a849c071 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_backend_services.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_backend_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_region_backend_services_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_region_backend_services_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_region_backend_services_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3849,9 +3846,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -4070,9 +4067,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -4291,9 +4288,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_commitments.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_commitments.py index 437980ff5680..ace5bc3511c2 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_commitments.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_commitments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_region_commitments_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_region_commitments_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_region_commitments_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disk_types.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disk_types.py index cf4826994ffc..2d36eb228b3f 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disk_types.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disk_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -909,10 +914,9 @@ def test_region_disk_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +961,9 @@ def test_region_disk_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -996,10 +999,9 @@ def test_region_disk_types_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disks.py index ad0299a30c03..bc119d3a2c70 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_region_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_region_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_region_disks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1151,9 +1148,9 @@ def test_add_resource_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies(request) @@ -1369,9 +1366,9 @@ def test_add_resource_policies_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies_unary(request) @@ -5859,9 +5856,9 @@ def test_stop_async_replication_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication(request) @@ -6069,9 +6066,9 @@ def test_stop_async_replication_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication_unary(request) @@ -6702,9 +6699,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_check_services.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_check_services.py index 9e557b564931..73c59a75341a 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_check_services.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_check_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -950,10 +950,9 @@ def test_region_health_check_services_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +997,9 @@ def test_region_health_check_services_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1035,9 @@ def test_region_health_check_services_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_checks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_checks.py index 9531281d5a65..58f939f10b54 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_checks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_checks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_region_health_checks_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_region_health_checks_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_region_health_checks_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2919,9 +2916,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_group_managers.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_group_managers.py index ebee8073edd0..ffc0c1034a89 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_group_managers.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_group_managers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_region_instance_group_managers_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_region_instance_group_managers_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_region_instance_group_managers_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1252,9 +1249,9 @@ def test_abandon_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances(request) @@ -1471,9 +1468,9 @@ def test_abandon_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances_unary(request) @@ -2130,9 +2127,9 @@ def test_create_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances(request) @@ -2349,9 +2346,9 @@ def test_create_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances_unary(request) @@ -2986,9 +2983,9 @@ def test_delete_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances(request) @@ -3205,9 +3202,9 @@ def test_delete_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances_unary(request) @@ -5066,9 +5063,9 @@ def test_list_managed_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_managed_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_managed_instances] = ( + mock_rpc + ) request = {} client.list_managed_instances(request) @@ -6565,9 +6562,9 @@ def test_recreate_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances(request) @@ -6786,9 +6783,9 @@ def test_recreate_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances_unary(request) @@ -7473,9 +7470,9 @@ def test_resume_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances(request) @@ -7692,9 +7689,9 @@ def test_resume_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances_unary(request) @@ -7914,9 +7911,9 @@ def test_set_instance_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template(request) @@ -8136,9 +8133,9 @@ def test_set_instance_template_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template_unary(request) @@ -8355,9 +8352,9 @@ def test_set_target_pools_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools(request) @@ -8574,9 +8571,9 @@ def test_set_target_pools_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools_unary(request) @@ -9661,9 +9658,9 @@ def test_suspend_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances(request) @@ -9880,9 +9877,9 @@ def test_suspend_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances_unary(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_groups.py index f0a20d57378d..b5c84f262a0d 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_region_instance_groups_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_region_instance_groups_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_region_instance_groups_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1946,10 +1943,10 @@ def test_list_instances_rest_pager(transport: str = "rest"): "region": "sample2", "instance_group": "sample3", } - sample_request[ - "region_instance_groups_list_instances_request_resource" - ] = compute.RegionInstanceGroupsListInstancesRequest( - instance_state="instance_state_value" + sample_request["region_instance_groups_list_instances_request_resource"] = ( + compute.RegionInstanceGroupsListInstancesRequest( + instance_state="instance_state_value" + ) ) pager = client.list_instances(request=sample_request) @@ -2420,9 +2417,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_templates.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_templates.py index 550cc51498a7..859dad1199eb 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_templates.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_templates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_instance_templates_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_instance_templates_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_instance_templates_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instances.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instances.py index 000f2c71409c..c2c0c25cbf63 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instances.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instances.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -915,10 +915,9 @@ def test_region_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -963,10 +962,9 @@ def test_region_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1002,10 +1000,9 @@ def test_region_instances_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instant_snapshots.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instant_snapshots.py index 1c1cfc5accba..5b04d8fd0744 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instant_snapshots.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instant_snapshots.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_instant_snapshots_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_instant_snapshots_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_instant_snapshots_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3371,9 +3368,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_endpoint_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_endpoint_groups.py index 43bf9fd74353..b1a6f2963313 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_endpoint_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_endpoint_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_region_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_region_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_region_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3463,9 +3460,9 @@ def test_list_network_endpoints_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_endpoints - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_endpoints] = ( + mock_rpc + ) request = {} client.list_network_endpoints(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_firewall_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_firewall_policies.py index 17249a11a59d..73523fb272ad 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_firewall_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_firewall_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -987,10 +987,9 @@ def test_region_network_firewall_policies_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1034,9 @@ def test_region_network_firewall_policies_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1074,10 +1072,9 @@ def test_region_network_firewall_policies_client_get_mtls_endpoint_and_cert_sour "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -5682,9 +5679,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -5905,9 +5902,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) @@ -6777,9 +6774,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_notification_endpoints.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_notification_endpoints.py index 8d49e4faff12..e5b0b5736f97 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_notification_endpoints.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_notification_endpoints.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_region_notification_endpoints_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_region_notification_endpoints_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_region_notification_endpoints_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2558,9 +2555,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_operations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_operations.py index 05c72d41ddc7..5cbed439e4d6 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_operations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_region_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_region_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_region_operations_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_security_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_security_policies.py index d02866dcab33..0d8fc26e905e 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_security_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_security_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_security_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_security_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_security_policies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_certificates.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_certificates.py index 31c4b78f23d7..b3cadd35855b 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_certificates.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_certificates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_region_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_region_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_region_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_policies.py index 7179c123f51f..313321f9a9c1 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_region_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_region_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_region_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_http_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_http_proxies.py index 7de6b1780b97..406a495eafde 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_http_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_http_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_target_http_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_target_http_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_target_http_proxies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_https_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_https_proxies.py index d22fd1372909..57c1aa7d5b86 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_https_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_https_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -945,10 +945,9 @@ def test_region_target_https_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +992,9 @@ def test_region_target_https_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1030,9 @@ def test_region_target_https_proxies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2961,9 +2958,9 @@ def test_set_ssl_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates(request) @@ -3182,9 +3179,9 @@ def test_set_ssl_certificates_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates_unary(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_tcp_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_tcp_proxies.py index 32af2ad303f3..bec67f79bd67 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_tcp_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_tcp_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_url_maps.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_url_maps.py index 9fbc9a6588af..a1e684b088ea 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_url_maps.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_url_maps.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -898,10 +898,9 @@ def test_region_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +945,9 @@ def test_region_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +983,9 @@ def test_region_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_zones.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_zones.py index 8268b0044b4c..ee50f6a2461b 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_zones.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_zones.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -874,10 +879,9 @@ def test_region_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -922,10 +926,9 @@ def test_region_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -961,10 +964,9 @@ def test_region_zones_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_regions.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_regions.py index 6849a04f5274..ee42e1a6b6e4 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_regions.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_regions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -850,10 +855,9 @@ def test_regions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -898,10 +902,9 @@ def test_regions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -937,10 +940,9 @@ def test_regions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_blocks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_blocks.py index 0ba2313aca15..b659daa25170 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_blocks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_blocks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_reservation_blocks_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_reservation_blocks_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_reservation_blocks_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1909,9 +1906,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -2138,9 +2135,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -2586,9 +2583,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_sub_blocks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_sub_blocks.py index 89b2069cb40e..1bbf22398216 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_sub_blocks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_sub_blocks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_reservation_sub_blocks_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_reservation_sub_blocks_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_reservation_sub_blocks_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1925,9 +1922,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -2146,9 +2143,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -3036,9 +3033,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservations.py index 5d7927467d8d..80b160ccd372 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -885,10 +885,9 @@ def test_reservations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -933,10 +932,9 @@ def test_reservations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_reservations_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2939,9 +2936,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -3160,9 +3157,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -4024,9 +4021,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_resource_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_resource_policies.py index 3478b9f863fb..6401cb3ae267 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_resource_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_resource_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_resource_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_resource_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_resource_policies_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3633,9 +3630,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routers.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routers.py index d53fe0acd0d8..759eabba6d2f 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routers.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -857,10 +857,9 @@ def test_routers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -905,10 +904,9 @@ def test_routers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -944,10 +942,9 @@ def test_routers_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1813,9 +1810,9 @@ def test_delete_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_route_policy] = ( + mock_rpc + ) request = {} client.delete_route_policy(request) @@ -2036,9 +2033,9 @@ def test_delete_route_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_route_policy] = ( + mock_rpc + ) request = {} client.delete_route_policy_unary(request) @@ -2665,9 +2662,9 @@ def test_get_nat_mapping_info_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_nat_mapping_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_nat_mapping_info] = ( + mock_rpc + ) request = {} client.get_nat_mapping_info(request) @@ -2955,9 +2952,9 @@ def test_get_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_route_policy] = ( + mock_rpc + ) request = {} client.get_route_policy(request) @@ -3162,9 +3159,9 @@ def test_get_router_status_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_router_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_router_status] = ( + mock_rpc + ) request = {} client.get_router_status(request) @@ -4342,9 +4339,9 @@ def test_list_route_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_route_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_route_policies] = ( + mock_rpc + ) request = {} client.list_route_policies(request) @@ -5062,9 +5059,9 @@ def test_patch_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_route_policy] = ( + mock_rpc + ) request = {} client.patch_route_policy(request) @@ -5279,9 +5276,9 @@ def test_patch_route_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_route_policy] = ( + mock_rpc + ) request = {} client.patch_route_policy_unary(request) @@ -6135,9 +6132,9 @@ def test_update_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_route_policy] = ( + mock_rpc + ) request = {} client.update_route_policy(request) @@ -6352,9 +6349,9 @@ def test_update_route_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_route_policy] = ( + mock_rpc + ) request = {} client.update_route_policy_unary(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routes.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routes.py index b8197dd90990..26ac4a4d72fb 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routes.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -856,10 +856,9 @@ def test_routes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -904,10 +903,9 @@ def test_routes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -943,10 +941,9 @@ def test_routes_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2356,9 +2353,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_security_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_security_policies.py index b8163ae9ed1f..3fcf0e58a374 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_security_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_security_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_security_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_security_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_security_policies_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_service_attachments.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_service_attachments.py index 38b5d7ec4b71..8dbe3329720b 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_service_attachments.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_service_attachments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_service_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_service_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_service_attachments_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3663,9 +3660,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshot_settings_service.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshot_settings_service.py index 47de850d26f2..1b8ce0216682 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshot_settings_service.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshot_settings_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -940,10 +940,9 @@ def test_snapshot_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +987,9 @@ def test_snapshot_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1025,9 @@ def test_snapshot_settings_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshots.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshots.py index be79cbbbf5b3..106299268893 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshots.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshots.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -873,10 +873,9 @@ def test_snapshots_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -921,10 +920,9 @@ def test_snapshots_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_snapshots_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3168,9 +3165,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_certificates.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_certificates.py index 7ed7e6ec710c..487b993b2e1e 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_certificates.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_certificates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_policies.py index 620fbf0a6b28..a47b28d346b0 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pool_types.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pool_types.py index bceba470b5b7..a51776f9366d 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pool_types.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pool_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_storage_pool_types_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_storage_pool_types_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_storage_pool_types_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pools.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pools.py index 56c94607ec1e..e783ceeaae6f 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pools.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -885,10 +885,9 @@ def test_storage_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -933,10 +932,9 @@ def test_storage_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_storage_pools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3428,9 +3425,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_subnetworks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_subnetworks.py index 5ddf27ee5515..0a863d60d94f 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_subnetworks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_subnetworks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_subnetworks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_subnetworks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_subnetworks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1844,9 +1841,9 @@ def test_expand_ip_cidr_range_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.expand_ip_cidr_range - ] = mock_rpc + client._transport._wrapped_methods[client._transport.expand_ip_cidr_range] = ( + mock_rpc + ) request = {} client.expand_ip_cidr_range(request) @@ -2065,9 +2062,9 @@ def test_expand_ip_cidr_range_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.expand_ip_cidr_range - ] = mock_rpc + client._transport._wrapped_methods[client._transport.expand_ip_cidr_range] = ( + mock_rpc + ) request = {} client.expand_ip_cidr_range_unary(request) @@ -4746,9 +4743,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_grpc_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_grpc_proxies.py index 8275b32333b7..118d9c0b2ca5 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_grpc_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_grpc_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_target_grpc_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_target_grpc_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_target_grpc_proxies_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_http_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_http_proxies.py index 815dab028023..af8752893ccc 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_http_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_http_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_target_http_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_target_http_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_target_http_proxies_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_https_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_https_proxies.py index 7485166103f4..4e7fe771bf29 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_https_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_https_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_target_https_proxies_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_target_https_proxies_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_target_https_proxies_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3133,9 +3130,9 @@ def test_set_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map(request) @@ -3343,9 +3340,9 @@ def test_set_certificate_map_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map_unary(request) @@ -3551,9 +3548,9 @@ def test_set_quic_override_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_quic_override - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_quic_override] = ( + mock_rpc + ) request = {} client.set_quic_override(request) @@ -3759,9 +3756,9 @@ def test_set_quic_override_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_quic_override - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_quic_override] = ( + mock_rpc + ) request = {} client.set_quic_override_unary(request) @@ -3969,9 +3966,9 @@ def test_set_ssl_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates(request) @@ -4179,9 +4176,9 @@ def test_set_ssl_certificates_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates_unary(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_instances.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_instances.py index b62ae1d8dbc2..27dd78f886aa 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_instances.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_instances.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_target_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_target_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_target_instances_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2759,9 +2756,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -2980,9 +2977,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -3201,9 +3198,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_pools.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_pools.py index a2f3d976d196..572b2d531b3f 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_pools.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_pools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_target_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_target_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_target_pools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1148,9 +1145,9 @@ def test_add_health_check_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_health_check] = ( + mock_rpc + ) request = {} client.add_health_check(request) @@ -1371,9 +1368,9 @@ def test_add_health_check_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_health_check] = ( + mock_rpc + ) request = {} client.add_health_check_unary(request) @@ -3805,9 +3802,9 @@ def test_remove_health_check_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_health_check] = ( + mock_rpc + ) request = {} client.remove_health_check(request) @@ -4030,9 +4027,9 @@ def test_remove_health_check_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_health_check] = ( + mock_rpc + ) request = {} client.remove_health_check_unary(request) @@ -5135,9 +5132,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -5356,9 +5353,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -5577,9 +5574,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_ssl_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_ssl_proxies.py index 637261337954..e600835d4eef 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_ssl_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_ssl_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_target_ssl_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_target_ssl_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_target_ssl_proxies_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2429,9 +2426,9 @@ def test_set_backend_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service(request) @@ -2639,9 +2636,9 @@ def test_set_backend_service_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service_unary(request) @@ -2849,9 +2846,9 @@ def test_set_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map(request) @@ -3059,9 +3056,9 @@ def test_set_certificate_map_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map_unary(request) @@ -3267,9 +3264,9 @@ def test_set_proxy_header_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header(request) @@ -3475,9 +3472,9 @@ def test_set_proxy_header_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header_unary(request) @@ -3685,9 +3682,9 @@ def test_set_ssl_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates(request) @@ -3895,9 +3892,9 @@ def test_set_ssl_certificates_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates_unary(request) @@ -4517,9 +4514,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_tcp_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_tcp_proxies.py index c79be3a241af..630e4514e4c7 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_tcp_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_tcp_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2707,9 +2704,9 @@ def test_set_backend_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service(request) @@ -2917,9 +2914,9 @@ def test_set_backend_service_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service_unary(request) @@ -3125,9 +3122,9 @@ def test_set_proxy_header_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header(request) @@ -3333,9 +3330,9 @@ def test_set_proxy_header_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header_unary(request) @@ -3543,9 +3540,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_vpn_gateways.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_vpn_gateways.py index 2acf825a8913..2e35fd01c400 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_vpn_gateways.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_vpn_gateways.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_target_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_target_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_target_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_url_maps.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_url_maps.py index 004ea1e352f7..cb8416aeff30 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_url_maps.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_url_maps.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -859,10 +859,9 @@ def test_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -907,10 +906,9 @@ def test_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +944,9 @@ def test_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2373,9 +2370,9 @@ def test_invalidate_cache_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.invalidate_cache - ] = mock_rpc + client._transport._wrapped_methods[client._transport.invalidate_cache] = ( + mock_rpc + ) request = {} client.invalidate_cache(request) @@ -2581,9 +2578,9 @@ def test_invalidate_cache_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.invalidate_cache - ] = mock_rpc + client._transport._wrapped_methods[client._transport.invalidate_cache] = ( + mock_rpc + ) request = {} client.invalidate_cache_unary(request) @@ -3456,9 +3453,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_gateways.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_gateways.py index bf8c24cf9978..11a0c301057c 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_gateways.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_gateways.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3359,9 +3356,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_tunnels.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_tunnels.py index 94030d8919c2..8f1768aa1d8a 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_tunnels.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_tunnels.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +877,9 @@ def test_vpn_tunnels_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +924,9 @@ def test_vpn_tunnels_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +962,9 @@ def test_vpn_tunnels_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_wire_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_wire_groups.py index dcbe7e19bf09..f62ab05dc1f5 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_wire_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_wire_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.extended_operation as extended_operation # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +877,9 @@ def test_wire_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +924,9 @@ def test_wire_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +962,9 @@ def test_wire_groups_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zone_operations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zone_operations.py index d15880fd7aad..6a68f5d34a5d 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zone_operations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zone_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -895,10 +900,9 @@ def test_zone_operations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -943,10 +947,9 @@ def test_zone_operations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -982,10 +985,9 @@ def test_zone_operations_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zones.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zones.py index 08f4d0b60036..a2d37804b65a 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zones.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zones.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -845,10 +850,9 @@ def test_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -893,10 +897,9 @@ def test_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -932,10 +935,9 @@ def test_zones_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source diff --git a/packages/google-cloud-confidentialcomputing/CHANGELOG.md b/packages/google-cloud-confidentialcomputing/CHANGELOG.md index f09c8610c64f..315a8039f83a 100644 --- a/packages/google-cloud-confidentialcomputing/CHANGELOG.md +++ b/packages/google-cloud-confidentialcomputing/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://pypi.org/project/google-cloud-confidentialcomputing/#history +## [0.8.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-confidentialcomputing-v0.7.0...google-cloud-confidentialcomputing-v0.8.0) (2026-02-12) + + +### Features + +* add Nvidia Attestation proto message with its relevant fields and ConfidentialGke options ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) + ## [0.7.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-confidentialcomputing-v0.6.0...google-cloud-confidentialcomputing-v0.7.0) (2026-01-08) diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing/gapic_version.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing/gapic_version.py index 14847801e501..9fcfa2a067f6 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing/gapic_version.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.7.0" # {x-release-please-version} +__version__ = "0.8.0" # {x-release-please-version} diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/__init__.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/__init__.py index a669de720a80..901aa10212d7 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/__init__.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.confidential_computing import ( ConfidentialComputingAsyncClient, ConfidentialComputingClient, diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/gapic_version.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/gapic_version.py index 14847801e501..9fcfa2a067f6 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/gapic_version.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.7.0" # {x-release-please-version} +__version__ = "0.8.0" # {x-release-please-version} diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/async_client.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/async_client.py index ead0d4f24199..d59d263b51ac 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/async_client.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.confidentialcomputing_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore from google.cloud.confidentialcomputing_v1.types import service @@ -120,7 +120,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConfidentialComputingAsyncClient: The constructed client. """ - return ConfidentialComputingClient.from_service_account_info.__func__(ConfidentialComputingAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConfidentialComputingClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConfidentialComputingAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +139,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConfidentialComputingAsyncClient: The constructed client. """ - return ConfidentialComputingClient.from_service_account_file.__func__(ConfidentialComputingAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConfidentialComputingClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ConfidentialComputingAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -174,7 +180,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConfidentialComputingClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConfidentialComputingClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConfidentialComputingTransport: diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/client.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/client.py index b5c406109b36..588035880f6a 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/client.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.confidentialcomputing_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore from google.cloud.confidentialcomputing_v1.types import service @@ -81,9 +81,7 @@ class ConfidentialComputingClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConfidentialComputingTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConfidentialComputingTransport]] _transport_registry["grpc"] = ConfidentialComputingGrpcTransport _transport_registry["grpc_asyncio"] = ConfidentialComputingGrpcAsyncIOTransport _transport_registry["rest"] = ConfidentialComputingRestTransport @@ -629,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConfidentialComputingClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConfidentialComputingClient._read_environment_variables() + ) self._client_cert_source = ConfidentialComputingClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -668,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConfidentialComputingTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/__init__.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/__init__.py index ab3a745f9f42..22e614b5d1df 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/__init__.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConfidentialComputingTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConfidentialComputingTransport]] _transport_registry["grpc"] = ConfidentialComputingGrpcTransport _transport_registry["grpc_asyncio"] = ConfidentialComputingGrpcAsyncIOTransport _transport_registry["rest"] = ConfidentialComputingRestTransport diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/base.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/base.py index 0b745310cff2..801b5016064c 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/base.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.confidentialcomputing_v1 import gapic_version as package_version from google.cloud.confidentialcomputing_v1.types import service diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc.py index 41a518ee7dac..52ca1891686c 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.confidentialcomputing_v1.types import service diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc_asyncio.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc_asyncio.py index 97b23ad941b4..bf6972d07cfc 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc_asyncio.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.confidentialcomputing_v1.types import service diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/rest.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/rest.py index 3c15c5d3bc4a..672d037c7ca7 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/rest.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -501,9 +501,7 @@ def __call__( """ - http_options = ( - _BaseConfidentialComputingRestTransport._BaseCreateChallenge._get_http_options() - ) + http_options = _BaseConfidentialComputingRestTransport._BaseCreateChallenge._get_http_options() request, metadata = self._interceptor.pre_create_challenge( request, metadata @@ -662,9 +660,7 @@ def __call__( """ - http_options = ( - _BaseConfidentialComputingRestTransport._BaseVerifyAttestation._get_http_options() - ) + http_options = _BaseConfidentialComputingRestTransport._BaseVerifyAttestation._get_http_options() request, metadata = self._interceptor.pre_verify_attestation( request, metadata @@ -828,9 +824,7 @@ def __call__( """ - http_options = ( - _BaseConfidentialComputingRestTransport._BaseVerifyConfidentialGke._get_http_options() - ) + http_options = _BaseConfidentialComputingRestTransport._BaseVerifyConfidentialGke._get_http_options() request, metadata = self._interceptor.pre_verify_confidential_gke( request, metadata @@ -992,9 +986,7 @@ def __call__( """ - http_options = ( - _BaseConfidentialComputingRestTransport._BaseVerifyConfidentialSpace._get_http_options() - ) + http_options = _BaseConfidentialComputingRestTransport._BaseVerifyConfidentialSpace._get_http_options() request, metadata = self._interceptor.pre_verify_confidential_space( request, metadata @@ -1128,7 +1120,9 @@ def verify_confidential_space( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._VerifyConfidentialSpace(self._session, self._host, self._interceptor) # type: ignore + return self._VerifyConfidentialSpace( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1188,9 +1182,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseConfidentialComputingRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseConfidentialComputingRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseConfidentialComputingRestTransport._BaseGetLocation._get_transcoded_request( @@ -1329,9 +1321,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseConfidentialComputingRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseConfidentialComputingRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseConfidentialComputingRestTransport._BaseListLocations._get_transcoded_request( diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/types/service.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/types/service.py index c7476873642f..ab1170d05196 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/types/service.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/types/service.py @@ -66,6 +66,7 @@ class SigningAlgorithm(proto.Enum): ECDSA on the P-256 Curve with a SHA256 digest. """ + SIGNING_ALGORITHM_UNSPECIFIED = 0 RSASSA_PSS_SHA256 = 1 RSASSA_PKCS1V15_SHA256 = 2 @@ -88,6 +89,7 @@ class TokenType(proto.Enum): TOKEN_TYPE_AWS_PRINCIPALTAGS (4): Principal-tag-based token for AWS integration """ + TOKEN_TYPE_UNSPECIFIED = 0 TOKEN_TYPE_OIDC = 1 TOKEN_TYPE_PKI = 2 @@ -107,6 +109,7 @@ class SignatureType(proto.Enum): SIGNATURE_TYPE_PKI (2): Public Key Infrastructure (PKI) signature. """ + SIGNATURE_TYPE_UNSPECIFIED = 0 SIGNATURE_TYPE_OIDC = 1 SIGNATURE_TYPE_PKI = 2 @@ -123,6 +126,7 @@ class TokenProfile(proto.Enum): TOKEN_PROFILE_AWS (2): AWS Principal Tags claims. """ + TOKEN_PROFILE_UNSPECIFIED = 0 TOKEN_PROFILE_DEFAULT_EAT = 1 TOKEN_PROFILE_AWS = 2 @@ -340,6 +344,7 @@ class GpuArchitectureType(proto.Enum): GPU_ARCHITECTURE_TYPE_BLACKWELL (10): Blackwell GPU architecture type. """ + GPU_ARCHITECTURE_TYPE_UNSPECIFIED = 0 GPU_ARCHITECTURE_TYPE_HOPPER = 8 GPU_ARCHITECTURE_TYPE_BLACKWELL = 10 @@ -450,12 +455,12 @@ class ProtectedPcieAttestation(proto.Message): number=1, message="NvidiaAttestation.GpuInfo", ) - switch_quotes: MutableSequence[ - "NvidiaAttestation.SwitchInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="NvidiaAttestation.SwitchInfo", + switch_quotes: MutableSequence["NvidiaAttestation.SwitchInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="NvidiaAttestation.SwitchInfo", + ) ) class MultiGpuSecurePassthroughAttestation(proto.Message): @@ -812,12 +817,12 @@ class SignedEntity(proto.Message): signatures attached to an OCI image object. """ - container_image_signatures: MutableSequence[ - "ContainerImageSignature" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ContainerImageSignature", + container_image_signatures: MutableSequence["ContainerImageSignature"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ContainerImageSignature", + ) ) diff --git a/packages/google-cloud-confidentialcomputing/mypy.ini b/packages/google-cloud-confidentialcomputing/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-confidentialcomputing/mypy.ini +++ b/packages/google-cloud-confidentialcomputing/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-confidentialcomputing/noxfile.py b/packages/google-cloud-confidentialcomputing/noxfile.py index ea883d9223b7..11d53d13a6dd 100644 --- a/packages/google-cloud-confidentialcomputing/noxfile.py +++ b/packages/google-cloud-confidentialcomputing/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-confidentialcomputing/samples/generated_samples/snippet_metadata_google.cloud.confidentialcomputing.v1.json b/packages/google-cloud-confidentialcomputing/samples/generated_samples/snippet_metadata_google.cloud.confidentialcomputing.v1.json index c55d8334f182..e09983b4bc84 100644 --- a/packages/google-cloud-confidentialcomputing/samples/generated_samples/snippet_metadata_google.cloud.confidentialcomputing.v1.json +++ b/packages/google-cloud-confidentialcomputing/samples/generated_samples/snippet_metadata_google.cloud.confidentialcomputing.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-confidentialcomputing", - "version": "0.7.0" + "version": "0.8.0" }, "snippets": [ { diff --git a/packages/google-cloud-confidentialcomputing/tests/unit/gapic/confidentialcomputing_v1/test_confidential_computing.py b/packages/google-cloud-confidentialcomputing/tests/unit/gapic/confidentialcomputing_v1/test_confidential_computing.py index 481d8925fb27..dc963ff697f9 100644 --- a/packages/google-cloud-confidentialcomputing/tests/unit/gapic/confidentialcomputing_v1/test_confidential_computing.py +++ b/packages/google-cloud-confidentialcomputing/tests/unit/gapic/confidentialcomputing_v1/test_confidential_computing.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.confidentialcomputing_v1.services.confidential_computing import ( ConfidentialComputingAsyncClient, @@ -996,10 +1001,9 @@ def test_confidential_computing_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1048,9 @@ def test_confidential_computing_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1083,10 +1086,9 @@ def test_confidential_computing_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1346,9 +1348,7 @@ def test_confidential_computing_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1459,9 +1459,9 @@ def test_create_challenge_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_challenge - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_challenge] = ( + mock_rpc + ) request = {} client.create_challenge(request) @@ -1802,9 +1802,9 @@ def test_verify_attestation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.verify_attestation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.verify_attestation] = ( + mock_rpc + ) request = {} client.verify_attestation(request) @@ -2499,9 +2499,9 @@ def test_create_challenge_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_challenge - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_challenge] = ( + mock_rpc + ) request = {} client.create_challenge(request) @@ -2691,9 +2691,9 @@ def test_verify_attestation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.verify_attestation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.verify_attestation] = ( + mock_rpc + ) request = {} client.verify_attestation(request) diff --git a/packages/google-cloud-config/google/cloud/config_v1/__init__.py b/packages/google-cloud-config/google/cloud/config_v1/__init__.py index 70a54ee1fe28..ba61f7e34884 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/__init__.py +++ b/packages/google-cloud-config/google/cloud/config_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.config import ConfigAsyncClient, ConfigClient from .types.config import ( ApplyResults, diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/async_client.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/async_client.py index 1393f13b7bf4..197c0c21e6f5 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/async_client.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.config_v1 import gapic_version as package_version @@ -47,13 +47,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_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 google.rpc.status_pb2 as status_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.config_v1.services.config import pagers from google.cloud.config_v1.types import config @@ -139,7 +141,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConfigAsyncClient: The constructed client. """ - return ConfigClient.from_service_account_info.__func__(ConfigAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConfigClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConfigAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +160,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConfigAsyncClient: The constructed client. """ - return ConfigClient.from_service_account_file.__func__(ConfigAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConfigClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ConfigAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/client.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/client.py index f10e20a2ad10..b123f02fdb4c 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/client.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.config_v1 import gapic_version as package_version @@ -64,13 +64,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_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 google.rpc.status_pb2 as status_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.config_v1.services.config import pagers from google.cloud.config_v1.types import config @@ -840,11 +842,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConfigClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConfigClient._read_environment_variables() + ) self._client_cert_source = ConfigClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -879,8 +879,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConfigTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/pagers.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/pagers.py index bc92b28aa74e..06aaa046b659 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/pagers.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/base.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/base.py index a1125f787af2..d22f48979335 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/base.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.config_v1 import gapic_version as package_version from google.cloud.config_v1.types import config @@ -643,13 +645,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc.py index 9c1e47a72581..e7295ca94886 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.config_v1.types import config @@ -600,12 +602,12 @@ def export_deployment_statefile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_deployment_statefile" not in self._stubs: - self._stubs[ - "export_deployment_statefile" - ] = self._logged_channel.unary_unary( - "/google.cloud.config.v1.Config/ExportDeploymentStatefile", - request_serializer=config.ExportDeploymentStatefileRequest.serialize, - response_deserializer=config.Statefile.deserialize, + self._stubs["export_deployment_statefile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.config.v1.Config/ExportDeploymentStatefile", + request_serializer=config.ExportDeploymentStatefileRequest.serialize, + response_deserializer=config.Statefile.deserialize, + ) ) return self._stubs["export_deployment_statefile"] @@ -1110,12 +1112,12 @@ def update_auto_migration_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_auto_migration_config" not in self._stubs: - self._stubs[ - "update_auto_migration_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.config.v1.Config/UpdateAutoMigrationConfig", - request_serializer=config.UpdateAutoMigrationConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_auto_migration_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.config.v1.Config/UpdateAutoMigrationConfig", + request_serializer=config.UpdateAutoMigrationConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_auto_migration_config"] diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc_asyncio.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc_asyncio.py index 767f24294bd1..7943d5927c24 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc_asyncio.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.config_v1.types import config @@ -626,12 +628,12 @@ def export_deployment_statefile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_deployment_statefile" not in self._stubs: - self._stubs[ - "export_deployment_statefile" - ] = self._logged_channel.unary_unary( - "/google.cloud.config.v1.Config/ExportDeploymentStatefile", - request_serializer=config.ExportDeploymentStatefileRequest.serialize, - response_deserializer=config.Statefile.deserialize, + self._stubs["export_deployment_statefile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.config.v1.Config/ExportDeploymentStatefile", + request_serializer=config.ExportDeploymentStatefileRequest.serialize, + response_deserializer=config.Statefile.deserialize, + ) ) return self._stubs["export_deployment_statefile"] @@ -1149,12 +1151,12 @@ def update_auto_migration_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_auto_migration_config" not in self._stubs: - self._stubs[ - "update_auto_migration_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.config.v1.Config/UpdateAutoMigrationConfig", - request_serializer=config.UpdateAutoMigrationConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_auto_migration_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.config.v1.Config/UpdateAutoMigrationConfig", + request_serializer=config.UpdateAutoMigrationConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_auto_migration_config"] diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest.py index 8cb523f64377..4f4353d88c48 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest.py @@ -16,21 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.config_v1.types import config @@ -2778,9 +2780,7 @@ def __call__( """ - http_options = ( - _BaseConfigRestTransport._BaseExportDeploymentStatefile._get_http_options() - ) + http_options = _BaseConfigRestTransport._BaseExportDeploymentStatefile._get_http_options() request, metadata = self._interceptor.pre_export_deployment_statefile( request, metadata @@ -3241,9 +3241,7 @@ def __call__( """ - http_options = ( - _BaseConfigRestTransport._BaseExportRevisionStatefile._get_http_options() - ) + http_options = _BaseConfigRestTransport._BaseExportRevisionStatefile._get_http_options() request, metadata = self._interceptor.pre_export_revision_statefile( request, metadata @@ -6127,9 +6125,7 @@ def __call__( """ - http_options = ( - _BaseConfigRestTransport._BaseUpdateAutoMigrationConfig._get_http_options() - ) + http_options = _BaseConfigRestTransport._BaseUpdateAutoMigrationConfig._get_http_options() request, metadata = self._interceptor.pre_update_auto_migration_config( request, metadata @@ -6427,7 +6423,9 @@ def export_deployment_statefile( ) -> Callable[[config.ExportDeploymentStatefileRequest], config.Statefile]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ExportDeploymentStatefile(self._session, self._host, self._interceptor) # type: ignore + return self._ExportDeploymentStatefile( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_lock_info( @@ -6453,7 +6451,9 @@ def export_revision_statefile( ) -> Callable[[config.ExportRevisionStatefileRequest], config.Statefile]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ExportRevisionStatefile(self._session, self._host, self._interceptor) # type: ignore + return self._ExportRevisionStatefile( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_auto_migration_config( @@ -6461,7 +6461,9 @@ def get_auto_migration_config( ) -> Callable[[config.GetAutoMigrationConfigRequest], config.AutoMigrationConfig]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetAutoMigrationConfig(self._session, self._host, self._interceptor) # type: ignore + return self._GetAutoMigrationConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_deployment( @@ -6605,7 +6607,9 @@ def update_auto_migration_config( ) -> Callable[[config.UpdateAutoMigrationConfigRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateAutoMigrationConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAutoMigrationConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_deployment( diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest_base.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest_base.py index 9e5971f649d6..0dc1774eae33 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest_base.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest_base.py @@ -17,13 +17,15 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.config_v1.types import config diff --git a/packages/google-cloud-config/google/cloud/config_v1/types/config.py b/packages/google-cloud-config/google/cloud/config_v1/types/config.py index 33cfe36ecd5c..6e7b92dfcd28 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/types/config.py +++ b/packages/google-cloud-config/google/cloud/config_v1/types/config.py @@ -115,6 +115,7 @@ class QuotaValidation(proto.Enum): deploy resources in terraform configuration files. """ + QUOTA_VALIDATION_UNSPECIFIED = 0 ENABLED = 1 ENFORCED = 2 @@ -272,6 +273,7 @@ class State(proto.Enum): DELETED (7): The deployment has been deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -308,6 +310,7 @@ class ErrorCode(proto.Enum): Failed to import values from an external source. """ + ERROR_CODE_UNSPECIFIED = 0 REVISION_FAILED = 1 CLOUD_BUILD_PERMISSION_DENIED = 3 @@ -337,6 +340,7 @@ class LockState(proto.Enum): UNLOCK_FAILED (6): The deployment has failed to unlock. """ + LOCK_STATE_UNSPECIFIED = 0 LOCKED = 1 UNLOCKED = 2 @@ -971,6 +975,7 @@ class DeletePolicy(proto.Enum): Abandons resources and only deletes the deployment and its metadata. """ + DELETE_POLICY_UNSPECIFIED = 0 DELETE = 1 ABANDON = 2 @@ -1198,6 +1203,7 @@ class Action(proto.Enum): DELETE (3): The revision was deleted. """ + ACTION_UNSPECIFIED = 0 CREATE = 1 UPDATE = 2 @@ -1218,6 +1224,7 @@ class State(proto.Enum): The revision could not be applied successfully. """ + STATE_UNSPECIFIED = 0 APPLYING = 1 APPLIED = 2 @@ -1245,6 +1252,7 @@ class ErrorCode(proto.Enum): Failed to import values from an external source. """ + ERROR_CODE_UNSPECIFIED = 0 CLOUD_BUILD_PERMISSION_DENIED = 1 APPLY_BUILD_API_FAILED = 4 @@ -1483,6 +1491,7 @@ class DeploymentStep(proto.Enum): RUNNING_QUOTA_VALIDATION (12): Running quota validation """ + DEPLOYMENT_STEP_UNSPECIFIED = 0 PREPARING_STORAGE_BUCKET = 1 DOWNLOADING_BLUEPRINT = 2 @@ -1559,6 +1568,7 @@ class Intent(proto.Enum): Infra Manager will leave this Resource untouched. """ + INTENT_UNSPECIFIED = 0 CREATE = 1 UPDATE = 2 @@ -1583,6 +1593,7 @@ class State(proto.Enum): FAILED (4): Resource failed to reconcile. """ + STATE_UNSPECIFIED = 0 PLANNED = 1 IN_PROGRESS = 2 @@ -2112,6 +2123,7 @@ class State(proto.Enum): DELETED (7): The preview has been deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 SUCCEEDED = 2 @@ -2137,6 +2149,7 @@ class PreviewMode(proto.Enum): DELETE mode generates as execution plan for destroying current resources. """ + PREVIEW_MODE_UNSPECIFIED = 0 DEFAULT = 1 DELETE = 2 @@ -2169,6 +2182,7 @@ class ErrorCode(proto.Enum): Failed to import values from an external source. """ + ERROR_CODE_UNSPECIFIED = 0 CLOUD_BUILD_PERMISSION_DENIED = 1 BUCKET_CREATION_PERMISSION_DENIED = 2 @@ -2327,6 +2341,7 @@ class PreviewStep(proto.Enum): VALIDATING_REPOSITORY (10): Validating the provided repository. """ + PREVIEW_STEP_UNSPECIFIED = 0 PREPARING_STORAGE_BUCKET = 1 DOWNLOADING_BLUEPRINT = 2 @@ -2784,6 +2799,7 @@ class State(proto.Enum): OBSOLETE (3): The version is obsolete. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 DEPRECATED = 2 @@ -2892,6 +2908,7 @@ class Intent(proto.Enum): UNCHANGED (5): The resource will be untouched. """ + INTENT_UNSPECIFIED = 0 CREATE = 1 UPDATE = 2 @@ -3318,6 +3335,7 @@ class ProviderSource(proto.Enum): SERVICE_MAINTAINED (1): Service maintained provider source type. """ + PROVIDER_SOURCE_UNSPECIFIED = 0 SERVICE_MAINTAINED = 1 diff --git a/packages/google-cloud-config/mypy.ini b/packages/google-cloud-config/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-config/mypy.ini +++ b/packages/google-cloud-config/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-config/noxfile.py b/packages/google-cloud-config/noxfile.py index c3904d4ce8fb..aef008fd30a2 100644 --- a/packages/google-cloud-config/noxfile.py +++ b/packages/google-cloud-config/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-config/tests/unit/gapic/config_v1/test_config.py b/packages/google-cloud-config/tests/unit/gapic/config_v1/test_config.py index 18f5894c8b95..52e1238251c8 100644 --- a/packages/google-cloud-config/tests/unit/gapic/config_v1/test_config.py +++ b/packages/google-cloud-config/tests/unit/gapic/config_v1/test_config.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,24 +61,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 google.cloud.config_v1.services.config import ( ConfigAsyncClient, @@ -915,10 +917,9 @@ def test_config_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -963,10 +964,9 @@ def test_config_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1002,10 +1002,9 @@ def test_config_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1234,9 +1233,7 @@ def test_config_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1351,9 +1348,9 @@ def test_list_deployments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -2256,9 +2253,9 @@ def test_create_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deployment] = ( + mock_rpc + ) request = {} client.create_deployment(request) @@ -2639,9 +2636,9 @@ def test_update_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_deployment] = ( + mock_rpc + ) request = {} client.update_deployment(request) @@ -3014,9 +3011,9 @@ def test_delete_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deployment] = ( + mock_rpc + ) request = {} client.delete_deployment(request) @@ -5625,9 +5622,9 @@ def test_import_statefile_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_statefile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_statefile] = ( + mock_rpc + ) request = {} client.import_statefile(request) @@ -5953,9 +5950,9 @@ def test_delete_statefile_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_statefile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_statefile] = ( + mock_rpc + ) request = {} client.delete_statefile(request) @@ -6597,9 +6594,9 @@ def test_unlock_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.unlock_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.unlock_deployment] = ( + mock_rpc + ) request = {} client.unlock_deployment(request) @@ -6957,9 +6954,9 @@ def test_export_lock_info_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_lock_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_lock_info] = ( + mock_rpc + ) request = {} client.export_lock_info(request) @@ -8870,9 +8867,9 @@ def test_export_preview_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_preview_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_preview_result] = ( + mock_rpc + ) request = {} client.export_preview_result(request) @@ -9679,9 +9676,9 @@ def test_get_terraform_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_terraform_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_terraform_version] = ( + mock_rpc + ) request = {} client.get_terraform_version(request) @@ -10031,9 +10028,9 @@ def test_list_resource_changes_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_changes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_changes] = ( + mock_rpc + ) request = {} client.list_resource_changes(request) @@ -10578,9 +10575,9 @@ def test_get_resource_change_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_change - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_change] = ( + mock_rpc + ) request = {} client.get_resource_change(request) @@ -10929,9 +10926,9 @@ def test_list_resource_drifts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_drifts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_drifts] = ( + mock_rpc + ) request = {} client.list_resource_drifts(request) @@ -11474,9 +11471,9 @@ def test_get_resource_drift_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_drift - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_drift] = ( + mock_rpc + ) request = {} client.get_resource_drift(request) @@ -12444,9 +12441,9 @@ def test_list_deployments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -12882,9 +12879,9 @@ def test_create_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deployment] = ( + mock_rpc + ) request = {} client.create_deployment(request) @@ -13108,9 +13105,9 @@ def test_update_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_deployment] = ( + mock_rpc + ) request = {} client.update_deployment(request) @@ -13312,9 +13309,9 @@ def test_delete_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deployment] = ( + mock_rpc + ) request = {} client.delete_deployment(request) @@ -14638,9 +14635,9 @@ def test_import_statefile_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_statefile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_statefile] = ( + mock_rpc + ) request = {} client.import_statefile(request) @@ -14835,9 +14832,9 @@ def test_delete_statefile_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_statefile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_statefile] = ( + mock_rpc + ) request = {} client.delete_statefile(request) @@ -15205,9 +15202,9 @@ def test_unlock_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.unlock_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.unlock_deployment] = ( + mock_rpc + ) request = {} client.unlock_deployment(request) @@ -15401,9 +15398,9 @@ def test_export_lock_info_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_lock_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_lock_info] = ( + mock_rpc + ) request = {} client.export_lock_info(request) @@ -16397,9 +16394,9 @@ def test_export_preview_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_preview_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_preview_result] = ( + mock_rpc + ) request = {} client.export_preview_result(request) @@ -16788,9 +16785,9 @@ def test_get_terraform_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_terraform_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_terraform_version] = ( + mock_rpc + ) request = {} client.get_terraform_version(request) @@ -16973,9 +16970,9 @@ def test_list_resource_changes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_changes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_changes] = ( + mock_rpc + ) request = {} client.list_resource_changes(request) @@ -17241,9 +17238,9 @@ def test_get_resource_change_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_change - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_change] = ( + mock_rpc + ) request = {} client.get_resource_change(request) @@ -17425,9 +17422,9 @@ def test_list_resource_drifts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_drifts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_drifts] = ( + mock_rpc + ) request = {} client.list_resource_drifts(request) @@ -17691,9 +17688,9 @@ def test_get_resource_drift_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_drift - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_drift] = ( + mock_rpc + ) request = {} client.get_resource_drift(request) diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/__init__.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/__init__.py index 139dd87d6063..2a4349183414 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/__init__.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.config_delivery import ConfigDeliveryAsyncClient, ConfigDeliveryClient from .types.config_delivery import ( AbortRolloutRequest, diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/async_client.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/async_client.py index ca79b97d95c5..dd0e925e28fe 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/async_client.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1 import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.configdelivery_v1.services.config_delivery import pagers from google.cloud.configdelivery_v1.types import config_delivery @@ -139,7 +139,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConfigDeliveryAsyncClient: The constructed client. """ - return ConfigDeliveryClient.from_service_account_info.__func__(ConfigDeliveryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConfigDeliveryClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConfigDeliveryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +158,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConfigDeliveryAsyncClient: The constructed client. """ - return ConfigDeliveryClient.from_service_account_file.__func__(ConfigDeliveryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConfigDeliveryClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ConfigDeliveryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/client.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/client.py index 4522abd7caa0..fa30280f649c 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/client.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1 import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.configdelivery_v1.services.config_delivery import pagers from google.cloud.configdelivery_v1.types import config_delivery @@ -86,9 +86,7 @@ class ConfigDeliveryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConfigDeliveryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConfigDeliveryTransport]] _transport_registry["grpc"] = ConfigDeliveryGrpcTransport _transport_registry["grpc_asyncio"] = ConfigDeliveryGrpcAsyncIOTransport _transport_registry["rest"] = ConfigDeliveryRestTransport @@ -774,11 +772,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConfigDeliveryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConfigDeliveryClient._read_environment_variables() + ) self._client_cert_source = ConfigDeliveryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -813,8 +809,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConfigDeliveryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/pagers.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/pagers.py index f65ae65fd824..2d9f71b98966 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/pagers.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/base.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/base.py index 56f760462272..054233059180 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/base.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1 import gapic_version as package_version from google.cloud.configdelivery_v1.types import config_delivery @@ -665,13 +665,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc.py index 3c0e8311884b..8bf58ca4619e 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.configdelivery_v1.types import config_delivery diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc_asyncio.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc_asyncio.py index 7d2d2bdf2e54..cc448e0708c7 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc_asyncio.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.configdelivery_v1.types import config_delivery diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/rest.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/rest.py index 54f906ad5d39..7bbaa970a983 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/rest.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1999,9 +1999,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCreateFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCreateFleetPackage._get_http_options() request, metadata = self._interceptor.pre_create_fleet_package( request, metadata @@ -2305,9 +2303,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCreateResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCreateResourceBundle._get_http_options() request, metadata = self._interceptor.pre_create_resource_bundle( request, metadata @@ -2608,9 +2604,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteFleetPackage._get_http_options() request, metadata = self._interceptor.pre_delete_fleet_package( request, metadata @@ -2901,9 +2895,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteResourceBundle._get_http_options() request, metadata = self._interceptor.pre_delete_resource_bundle( request, metadata @@ -3195,9 +3187,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseGetFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseGetFleetPackage._get_http_options() request, metadata = self._interceptor.pre_get_fleet_package( request, metadata @@ -3491,9 +3481,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseGetResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseGetResourceBundle._get_http_options() request, metadata = self._interceptor.pre_get_resource_bundle( request, metadata @@ -3940,9 +3928,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseListFleetPackages._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseListFleetPackages._get_http_options() request, metadata = self._interceptor.pre_list_fleet_packages( request, metadata @@ -4241,9 +4227,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseListResourceBundles._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseListResourceBundles._get_http_options() request, metadata = self._interceptor.pre_list_resource_bundles( request, metadata @@ -4993,9 +4977,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseUpdateFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseUpdateFleetPackage._get_http_options() request, metadata = self._interceptor.pre_update_fleet_package( request, metadata @@ -5298,9 +5280,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseUpdateResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseUpdateResourceBundle._get_http_options() request, metadata = self._interceptor.pre_update_resource_bundle( request, metadata @@ -6107,9 +6087,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -6226,9 +6204,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/types/config_delivery.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/types/config_delivery.py index 8fabfcd690ae..8753011a4699 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/types/config_delivery.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/types/config_delivery.py @@ -96,6 +96,7 @@ class DeletionPropagationPolicy(proto.Enum): resources synced to the cluster will be abandoned. """ + DELETION_PROPAGATION_POLICY_UNSPECIFIED = 0 FOREGROUND = 1 ORPHAN = 2 @@ -456,6 +457,7 @@ class State(proto.Enum): SUSPENDED (2): ``FleetPackage`` is intended to be suspended. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -716,6 +718,7 @@ class State(proto.Enum): DELETING (4): ``FleetPackage`` is being deleted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -814,6 +817,7 @@ class State(proto.Enum): SKIPPED (9): Skipped state. """ + STATE_UNSPECIFIED = 0 WAITING = 1 IN_PROGRESS = 2 @@ -912,6 +916,7 @@ class SyncState(proto.Enum): DELETED (8): Deleted state. """ + SYNC_STATE_UNSPECIFIED = 0 RECONCILING = 1 STALLED = 2 @@ -1472,6 +1477,7 @@ class Lifecycle(proto.Enum): indicates that the ``Release`` is now published (or released) and immutable. """ + LIFECYCLE_UNSPECIFIED = 0 DRAFT = 1 PUBLISHED = 2 @@ -2187,6 +2193,7 @@ class State(proto.Enum): ABORTING (8): Rollout aborting. """ + STATE_UNSPECIFIED = 0 COMPLETED = 1 SUSPENDED = 2 diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/__init__.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/__init__.py index 04ccb750bef3..1bb81badce88 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/__init__.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.config_delivery import ConfigDeliveryAsyncClient, ConfigDeliveryClient from .types.config_delivery import ( AbortRolloutRequest, diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/async_client.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/async_client.py index 2abd7d4ebabc..71a66e856c45 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/async_client.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1alpha import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.configdelivery_v1alpha.services.config_delivery import pagers from google.cloud.configdelivery_v1alpha.types import config_delivery @@ -139,7 +139,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConfigDeliveryAsyncClient: The constructed client. """ - return ConfigDeliveryClient.from_service_account_info.__func__(ConfigDeliveryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConfigDeliveryClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConfigDeliveryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +158,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConfigDeliveryAsyncClient: The constructed client. """ - return ConfigDeliveryClient.from_service_account_file.__func__(ConfigDeliveryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConfigDeliveryClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ConfigDeliveryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/client.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/client.py index 415786c874fc..d70edaefc585 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/client.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1alpha import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.configdelivery_v1alpha.services.config_delivery import pagers from google.cloud.configdelivery_v1alpha.types import config_delivery @@ -86,9 +86,7 @@ class ConfigDeliveryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConfigDeliveryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConfigDeliveryTransport]] _transport_registry["grpc"] = ConfigDeliveryGrpcTransport _transport_registry["grpc_asyncio"] = ConfigDeliveryGrpcAsyncIOTransport _transport_registry["rest"] = ConfigDeliveryRestTransport @@ -774,11 +772,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConfigDeliveryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConfigDeliveryClient._read_environment_variables() + ) self._client_cert_source = ConfigDeliveryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -813,8 +809,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConfigDeliveryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/pagers.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/pagers.py index 2eb28b37dbea..ab10080ac98e 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/pagers.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/base.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/base.py index e36c6f7c58f6..45b9c0e82f11 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/base.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1alpha import gapic_version as package_version from google.cloud.configdelivery_v1alpha.types import config_delivery @@ -665,13 +665,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc.py index 377c75543f95..e9498262b2f9 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.configdelivery_v1alpha.types import config_delivery diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc_asyncio.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc_asyncio.py index 7cd43c2359bc..8135a228cdf7 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc_asyncio.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.configdelivery_v1alpha.types import config_delivery diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/rest.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/rest.py index 31b5e787dfbd..ac538514b040 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/rest.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1999,9 +1999,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCreateFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCreateFleetPackage._get_http_options() request, metadata = self._interceptor.pre_create_fleet_package( request, metadata @@ -2305,9 +2303,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCreateResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCreateResourceBundle._get_http_options() request, metadata = self._interceptor.pre_create_resource_bundle( request, metadata @@ -2608,9 +2604,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteFleetPackage._get_http_options() request, metadata = self._interceptor.pre_delete_fleet_package( request, metadata @@ -2901,9 +2895,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteResourceBundle._get_http_options() request, metadata = self._interceptor.pre_delete_resource_bundle( request, metadata @@ -3195,9 +3187,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseGetFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseGetFleetPackage._get_http_options() request, metadata = self._interceptor.pre_get_fleet_package( request, metadata @@ -3491,9 +3481,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseGetResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseGetResourceBundle._get_http_options() request, metadata = self._interceptor.pre_get_resource_bundle( request, metadata @@ -3940,9 +3928,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseListFleetPackages._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseListFleetPackages._get_http_options() request, metadata = self._interceptor.pre_list_fleet_packages( request, metadata @@ -4241,9 +4227,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseListResourceBundles._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseListResourceBundles._get_http_options() request, metadata = self._interceptor.pre_list_resource_bundles( request, metadata @@ -4993,9 +4977,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseUpdateFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseUpdateFleetPackage._get_http_options() request, metadata = self._interceptor.pre_update_fleet_package( request, metadata @@ -5298,9 +5280,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseUpdateResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseUpdateResourceBundle._get_http_options() request, metadata = self._interceptor.pre_update_resource_bundle( request, metadata @@ -6107,9 +6087,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -6226,9 +6204,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/types/config_delivery.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/types/config_delivery.py index 51cda3c169a7..dfe713f5f6fc 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/types/config_delivery.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/types/config_delivery.py @@ -96,6 +96,7 @@ class DeletionPropagationPolicy(proto.Enum): resources synced to the cluster will be abandoned. """ + DELETION_PROPAGATION_POLICY_UNSPECIFIED = 0 FOREGROUND = 1 ORPHAN = 2 @@ -456,6 +457,7 @@ class State(proto.Enum): SUSPENDED (2): ``FleetPackage`` is intended to be suspended. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -716,6 +718,7 @@ class State(proto.Enum): DELETING (4): ``FleetPackage`` is being deleted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -814,6 +817,7 @@ class State(proto.Enum): SKIPPED (9): Skipped state. """ + STATE_UNSPECIFIED = 0 WAITING = 1 IN_PROGRESS = 2 @@ -912,6 +916,7 @@ class SyncState(proto.Enum): DELETED (8): Deleted state. """ + SYNC_STATE_UNSPECIFIED = 0 RECONCILING = 1 STALLED = 2 @@ -1472,6 +1477,7 @@ class Lifecycle(proto.Enum): indicates that the ``Release`` is now published (or released) and immutable. """ + LIFECYCLE_UNSPECIFIED = 0 DRAFT = 1 PUBLISHED = 2 @@ -2188,6 +2194,7 @@ class State(proto.Enum): ABORTING (8): Rollout aborting. """ + STATE_UNSPECIFIED = 0 COMPLETED = 1 SUSPENDED = 2 diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/__init__.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/__init__.py index b360d7adac3e..91de4604abe5 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/__init__.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.config_delivery import ConfigDeliveryAsyncClient, ConfigDeliveryClient from .types.config_delivery import ( AbortRolloutRequest, diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/async_client.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/async_client.py index a2992a0ae9da..1a3468cdd10f 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/async_client.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1beta import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.configdelivery_v1beta.services.config_delivery import pagers from google.cloud.configdelivery_v1beta.types import config_delivery @@ -139,7 +139,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConfigDeliveryAsyncClient: The constructed client. """ - return ConfigDeliveryClient.from_service_account_info.__func__(ConfigDeliveryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConfigDeliveryClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConfigDeliveryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +158,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConfigDeliveryAsyncClient: The constructed client. """ - return ConfigDeliveryClient.from_service_account_file.__func__(ConfigDeliveryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConfigDeliveryClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ConfigDeliveryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/client.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/client.py index a85a04a51156..47383c193e6f 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/client.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1beta import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.configdelivery_v1beta.services.config_delivery import pagers from google.cloud.configdelivery_v1beta.types import config_delivery @@ -86,9 +86,7 @@ class ConfigDeliveryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConfigDeliveryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConfigDeliveryTransport]] _transport_registry["grpc"] = ConfigDeliveryGrpcTransport _transport_registry["grpc_asyncio"] = ConfigDeliveryGrpcAsyncIOTransport _transport_registry["rest"] = ConfigDeliveryRestTransport @@ -774,11 +772,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConfigDeliveryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConfigDeliveryClient._read_environment_variables() + ) self._client_cert_source = ConfigDeliveryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -813,8 +809,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConfigDeliveryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/pagers.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/pagers.py index 1211b059f53c..2f21561e46a7 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/pagers.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/base.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/base.py index 2594d0b630a8..3e5c33990a0f 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/base.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1beta import gapic_version as package_version from google.cloud.configdelivery_v1beta.types import config_delivery @@ -665,13 +665,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc.py index 79b56697466e..e3838c903a10 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.configdelivery_v1beta.types import config_delivery diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc_asyncio.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc_asyncio.py index 3bd83ee4d3ee..d326931bf8e0 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc_asyncio.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.configdelivery_v1beta.types import config_delivery diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/rest.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/rest.py index 261045c9a914..393a0e5dcb6b 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/rest.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1999,9 +1999,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCreateFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCreateFleetPackage._get_http_options() request, metadata = self._interceptor.pre_create_fleet_package( request, metadata @@ -2305,9 +2303,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCreateResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCreateResourceBundle._get_http_options() request, metadata = self._interceptor.pre_create_resource_bundle( request, metadata @@ -2608,9 +2604,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteFleetPackage._get_http_options() request, metadata = self._interceptor.pre_delete_fleet_package( request, metadata @@ -2901,9 +2895,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteResourceBundle._get_http_options() request, metadata = self._interceptor.pre_delete_resource_bundle( request, metadata @@ -3195,9 +3187,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseGetFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseGetFleetPackage._get_http_options() request, metadata = self._interceptor.pre_get_fleet_package( request, metadata @@ -3491,9 +3481,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseGetResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseGetResourceBundle._get_http_options() request, metadata = self._interceptor.pre_get_resource_bundle( request, metadata @@ -3940,9 +3928,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseListFleetPackages._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseListFleetPackages._get_http_options() request, metadata = self._interceptor.pre_list_fleet_packages( request, metadata @@ -4241,9 +4227,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseListResourceBundles._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseListResourceBundles._get_http_options() request, metadata = self._interceptor.pre_list_resource_bundles( request, metadata @@ -4993,9 +4977,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseUpdateFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseUpdateFleetPackage._get_http_options() request, metadata = self._interceptor.pre_update_fleet_package( request, metadata @@ -5298,9 +5280,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseUpdateResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseUpdateResourceBundle._get_http_options() request, metadata = self._interceptor.pre_update_resource_bundle( request, metadata @@ -6107,9 +6087,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -6226,9 +6204,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/types/config_delivery.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/types/config_delivery.py index f1b8386086e0..7aa794649730 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/types/config_delivery.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/types/config_delivery.py @@ -96,6 +96,7 @@ class DeletionPropagationPolicy(proto.Enum): resources synced to the cluster will be abandoned. """ + DELETION_PROPAGATION_POLICY_UNSPECIFIED = 0 FOREGROUND = 1 ORPHAN = 2 @@ -456,6 +457,7 @@ class State(proto.Enum): SUSPENDED (2): ``FleetPackage`` is intended to be suspended. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -716,6 +718,7 @@ class State(proto.Enum): DELETING (4): ``FleetPackage`` is being deleted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -814,6 +817,7 @@ class State(proto.Enum): SKIPPED (9): Skipped state. """ + STATE_UNSPECIFIED = 0 WAITING = 1 IN_PROGRESS = 2 @@ -912,6 +916,7 @@ class SyncState(proto.Enum): DELETED (8): Deleted state. """ + SYNC_STATE_UNSPECIFIED = 0 RECONCILING = 1 STALLED = 2 @@ -1472,6 +1477,7 @@ class Lifecycle(proto.Enum): indicates that the ``Release`` is now published (or released) and immutable. """ + LIFECYCLE_UNSPECIFIED = 0 DRAFT = 1 PUBLISHED = 2 @@ -2188,6 +2194,7 @@ class State(proto.Enum): ABORTING (8): Rollout aborting. """ + STATE_UNSPECIFIED = 0 COMPLETED = 1 SUSPENDED = 2 diff --git a/packages/google-cloud-configdelivery/mypy.ini b/packages/google-cloud-configdelivery/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-configdelivery/mypy.ini +++ b/packages/google-cloud-configdelivery/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-configdelivery/noxfile.py b/packages/google-cloud-configdelivery/noxfile.py index 2b4fb7abe9df..5351315212fc 100644 --- a/packages/google-cloud-configdelivery/noxfile.py +++ b/packages/google-cloud-configdelivery/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1/test_config_delivery.py b/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1/test_config_delivery.py index 54399ea90459..f63e8b8f9113 100644 --- a/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1/test_config_delivery.py +++ b/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1/test_config_delivery.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.configdelivery_v1.services.config_delivery import ( ConfigDeliveryAsyncClient, @@ -959,10 +959,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1007,10 +1006,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1044,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1296,9 +1293,7 @@ def test_config_delivery_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1420,9 +1415,9 @@ def test_list_resource_bundles_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_bundles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_bundles] = ( + mock_rpc + ) request = {} client.list_resource_bundles(request) @@ -1968,9 +1963,9 @@ def test_get_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_bundle] = ( + mock_rpc + ) request = {} client.get_resource_bundle(request) @@ -2312,9 +2307,9 @@ def test_create_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_resource_bundle] = ( + mock_rpc + ) request = {} client.create_resource_bundle(request) @@ -2675,9 +2670,9 @@ def test_update_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_resource_bundle] = ( + mock_rpc + ) request = {} client.update_resource_bundle(request) @@ -3032,9 +3027,9 @@ def test_delete_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_resource_bundle] = ( + mock_rpc + ) request = {} client.delete_resource_bundle(request) @@ -3389,9 +3384,9 @@ def test_list_fleet_packages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_fleet_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_fleet_packages] = ( + mock_rpc + ) request = {} client.list_fleet_packages(request) @@ -3940,9 +3935,9 @@ def test_get_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_fleet_package] = ( + mock_rpc + ) request = {} client.get_fleet_package(request) @@ -4287,9 +4282,9 @@ def test_create_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_fleet_package] = ( + mock_rpc + ) request = {} client.create_fleet_package(request) @@ -4649,9 +4644,9 @@ def test_update_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fleet_package] = ( + mock_rpc + ) request = {} client.update_fleet_package(request) @@ -5005,9 +5000,9 @@ def test_delete_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_fleet_package] = ( + mock_rpc + ) request = {} client.delete_fleet_package(request) @@ -10868,9 +10863,9 @@ def test_list_resource_bundles_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_bundles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_bundles] = ( + mock_rpc + ) request = {} client.list_resource_bundles(request) @@ -11132,9 +11127,9 @@ def test_get_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_bundle] = ( + mock_rpc + ) request = {} client.get_resource_bundle(request) @@ -11317,9 +11312,9 @@ def test_create_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_resource_bundle] = ( + mock_rpc + ) request = {} client.create_resource_bundle(request) @@ -11538,9 +11533,9 @@ def test_update_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_resource_bundle] = ( + mock_rpc + ) request = {} client.update_resource_bundle(request) @@ -11742,9 +11737,9 @@ def test_delete_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_resource_bundle] = ( + mock_rpc + ) request = {} client.delete_resource_bundle(request) @@ -11940,9 +11935,9 @@ def test_list_fleet_packages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_fleet_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_fleet_packages] = ( + mock_rpc + ) request = {} client.list_fleet_packages(request) @@ -12202,9 +12197,9 @@ def test_get_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_fleet_package] = ( + mock_rpc + ) request = {} client.get_fleet_package(request) @@ -12386,9 +12381,9 @@ def test_create_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_fleet_package] = ( + mock_rpc + ) request = {} client.create_fleet_package(request) @@ -12606,9 +12601,9 @@ def test_update_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fleet_package] = ( + mock_rpc + ) request = {} client.update_fleet_package(request) @@ -12809,9 +12804,9 @@ def test_delete_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_fleet_package] = ( + mock_rpc + ) request = {} client.delete_fleet_package(request) diff --git a/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1alpha/test_config_delivery.py b/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1alpha/test_config_delivery.py index 382656bc8063..4689577b70e3 100644 --- a/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1alpha/test_config_delivery.py +++ b/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1alpha/test_config_delivery.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.configdelivery_v1alpha.services.config_delivery import ( ConfigDeliveryAsyncClient, @@ -959,10 +959,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1007,10 +1006,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1044,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1296,9 +1293,7 @@ def test_config_delivery_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1420,9 +1415,9 @@ def test_list_resource_bundles_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_bundles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_bundles] = ( + mock_rpc + ) request = {} client.list_resource_bundles(request) @@ -1968,9 +1963,9 @@ def test_get_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_bundle] = ( + mock_rpc + ) request = {} client.get_resource_bundle(request) @@ -2312,9 +2307,9 @@ def test_create_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_resource_bundle] = ( + mock_rpc + ) request = {} client.create_resource_bundle(request) @@ -2675,9 +2670,9 @@ def test_update_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_resource_bundle] = ( + mock_rpc + ) request = {} client.update_resource_bundle(request) @@ -3032,9 +3027,9 @@ def test_delete_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_resource_bundle] = ( + mock_rpc + ) request = {} client.delete_resource_bundle(request) @@ -3389,9 +3384,9 @@ def test_list_fleet_packages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_fleet_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_fleet_packages] = ( + mock_rpc + ) request = {} client.list_fleet_packages(request) @@ -3940,9 +3935,9 @@ def test_get_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_fleet_package] = ( + mock_rpc + ) request = {} client.get_fleet_package(request) @@ -4287,9 +4282,9 @@ def test_create_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_fleet_package] = ( + mock_rpc + ) request = {} client.create_fleet_package(request) @@ -4649,9 +4644,9 @@ def test_update_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fleet_package] = ( + mock_rpc + ) request = {} client.update_fleet_package(request) @@ -5005,9 +5000,9 @@ def test_delete_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_fleet_package] = ( + mock_rpc + ) request = {} client.delete_fleet_package(request) @@ -10868,9 +10863,9 @@ def test_list_resource_bundles_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_bundles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_bundles] = ( + mock_rpc + ) request = {} client.list_resource_bundles(request) @@ -11132,9 +11127,9 @@ def test_get_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_bundle] = ( + mock_rpc + ) request = {} client.get_resource_bundle(request) @@ -11317,9 +11312,9 @@ def test_create_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_resource_bundle] = ( + mock_rpc + ) request = {} client.create_resource_bundle(request) @@ -11538,9 +11533,9 @@ def test_update_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_resource_bundle] = ( + mock_rpc + ) request = {} client.update_resource_bundle(request) @@ -11742,9 +11737,9 @@ def test_delete_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_resource_bundle] = ( + mock_rpc + ) request = {} client.delete_resource_bundle(request) @@ -11940,9 +11935,9 @@ def test_list_fleet_packages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_fleet_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_fleet_packages] = ( + mock_rpc + ) request = {} client.list_fleet_packages(request) @@ -12202,9 +12197,9 @@ def test_get_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_fleet_package] = ( + mock_rpc + ) request = {} client.get_fleet_package(request) @@ -12386,9 +12381,9 @@ def test_create_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_fleet_package] = ( + mock_rpc + ) request = {} client.create_fleet_package(request) @@ -12606,9 +12601,9 @@ def test_update_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fleet_package] = ( + mock_rpc + ) request = {} client.update_fleet_package(request) @@ -12809,9 +12804,9 @@ def test_delete_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_fleet_package] = ( + mock_rpc + ) request = {} client.delete_fleet_package(request) diff --git a/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1beta/test_config_delivery.py b/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1beta/test_config_delivery.py index 91dbbe60bcbc..c8b0099bd3bf 100644 --- a/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1beta/test_config_delivery.py +++ b/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1beta/test_config_delivery.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.configdelivery_v1beta.services.config_delivery import ( ConfigDeliveryAsyncClient, @@ -959,10 +959,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1007,10 +1006,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1044,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1296,9 +1293,7 @@ def test_config_delivery_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1420,9 +1415,9 @@ def test_list_resource_bundles_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_bundles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_bundles] = ( + mock_rpc + ) request = {} client.list_resource_bundles(request) @@ -1968,9 +1963,9 @@ def test_get_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_bundle] = ( + mock_rpc + ) request = {} client.get_resource_bundle(request) @@ -2312,9 +2307,9 @@ def test_create_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_resource_bundle] = ( + mock_rpc + ) request = {} client.create_resource_bundle(request) @@ -2675,9 +2670,9 @@ def test_update_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_resource_bundle] = ( + mock_rpc + ) request = {} client.update_resource_bundle(request) @@ -3032,9 +3027,9 @@ def test_delete_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_resource_bundle] = ( + mock_rpc + ) request = {} client.delete_resource_bundle(request) @@ -3389,9 +3384,9 @@ def test_list_fleet_packages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_fleet_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_fleet_packages] = ( + mock_rpc + ) request = {} client.list_fleet_packages(request) @@ -3940,9 +3935,9 @@ def test_get_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_fleet_package] = ( + mock_rpc + ) request = {} client.get_fleet_package(request) @@ -4287,9 +4282,9 @@ def test_create_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_fleet_package] = ( + mock_rpc + ) request = {} client.create_fleet_package(request) @@ -4649,9 +4644,9 @@ def test_update_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fleet_package] = ( + mock_rpc + ) request = {} client.update_fleet_package(request) @@ -5005,9 +5000,9 @@ def test_delete_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_fleet_package] = ( + mock_rpc + ) request = {} client.delete_fleet_package(request) @@ -10868,9 +10863,9 @@ def test_list_resource_bundles_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_bundles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_bundles] = ( + mock_rpc + ) request = {} client.list_resource_bundles(request) @@ -11132,9 +11127,9 @@ def test_get_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_bundle] = ( + mock_rpc + ) request = {} client.get_resource_bundle(request) @@ -11317,9 +11312,9 @@ def test_create_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_resource_bundle] = ( + mock_rpc + ) request = {} client.create_resource_bundle(request) @@ -11538,9 +11533,9 @@ def test_update_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_resource_bundle] = ( + mock_rpc + ) request = {} client.update_resource_bundle(request) @@ -11742,9 +11737,9 @@ def test_delete_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_resource_bundle] = ( + mock_rpc + ) request = {} client.delete_resource_bundle(request) @@ -11940,9 +11935,9 @@ def test_list_fleet_packages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_fleet_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_fleet_packages] = ( + mock_rpc + ) request = {} client.list_fleet_packages(request) @@ -12202,9 +12197,9 @@ def test_get_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_fleet_package] = ( + mock_rpc + ) request = {} client.get_fleet_package(request) @@ -12386,9 +12381,9 @@ def test_create_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_fleet_package] = ( + mock_rpc + ) request = {} client.create_fleet_package(request) @@ -12606,9 +12601,9 @@ def test_update_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fleet_package] = ( + mock_rpc + ) request = {} client.update_fleet_package(request) @@ -12809,9 +12804,9 @@ def test_delete_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_fleet_package] = ( + mock_rpc + ) request = {} client.delete_fleet_package(request) diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/__init__.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/__init__.py index 583ac39af92f..10bf73bdc44d 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/__init__.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.contact_center_insights import ( ContactCenterInsightsAsyncClient, ContactCenterInsightsClient, diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/async_client.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/async_client.py index ec8e82711b4e..23c0a6f224cb 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/async_client.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contact_center_insights_v1 import gapic_version as package_version @@ -46,13 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.contact_center_insights_v1.services.contact_center_insights import ( pagers, @@ -198,7 +200,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ContactCenterInsightsAsyncClient: The constructed client. """ - return ContactCenterInsightsClient.from_service_account_info.__func__(ContactCenterInsightsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ContactCenterInsightsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ContactCenterInsightsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -214,7 +219,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ContactCenterInsightsAsyncClient: The constructed client. """ - return ContactCenterInsightsClient.from_service_account_file.__func__(ContactCenterInsightsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ContactCenterInsightsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ContactCenterInsightsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -252,7 +260,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ContactCenterInsightsClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ContactCenterInsightsClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ContactCenterInsightsTransport: diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/client.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/client.py index 7d9ff55d3d6e..6c77219b006a 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/client.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contact_center_insights_v1 import gapic_version as package_version @@ -63,13 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.contact_center_insights_v1.services.contact_center_insights import ( pagers, @@ -93,9 +95,7 @@ class ContactCenterInsightsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ContactCenterInsightsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ContactCenterInsightsTransport]] _transport_registry["grpc"] = ContactCenterInsightsGrpcTransport _transport_registry["grpc_asyncio"] = ContactCenterInsightsGrpcAsyncIOTransport _transport_registry["rest"] = ContactCenterInsightsRestTransport @@ -1006,11 +1006,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContactCenterInsightsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContactCenterInsightsClient._read_environment_variables() + ) self._client_cert_source = ContactCenterInsightsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1045,8 +1043,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContactCenterInsightsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/pagers.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/pagers.py index 2540639d272d..c6f94458d9d4 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/pagers.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -230,7 +230,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -306,7 +306,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -388,7 +388,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -466,7 +466,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -548,7 +548,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -626,7 +626,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -708,7 +708,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -784,7 +784,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -864,7 +864,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -942,7 +942,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1024,7 +1024,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1102,7 +1102,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1184,7 +1184,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1264,7 +1264,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1346,7 +1346,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1424,7 +1424,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1506,7 +1506,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1584,7 +1584,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/__init__.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/__init__.py index 8ecedf09447d..737ede7f459f 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/__init__.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ContactCenterInsightsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ContactCenterInsightsTransport]] _transport_registry["grpc"] = ContactCenterInsightsGrpcTransport _transport_registry["grpc_asyncio"] = ContactCenterInsightsGrpcAsyncIOTransport _transport_registry["rest"] = ContactCenterInsightsRestTransport diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/base.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/base.py index d520a9353bce..708f1611d68a 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/base.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.contact_center_insights_v1 import gapic_version as package_version from google.cloud.contact_center_insights_v1.types import ( @@ -1276,7 +1278,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc.py index c77f6b1ca1e0..71aff517b1fa 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.contact_center_insights_v1.types import ( contact_center_insights, @@ -649,12 +651,12 @@ def bulk_analyze_conversations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bulk_analyze_conversations" not in self._stubs: - self._stubs[ - "bulk_analyze_conversations" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkAnalyzeConversations", - request_serializer=contact_center_insights.BulkAnalyzeConversationsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["bulk_analyze_conversations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkAnalyzeConversations", + request_serializer=contact_center_insights.BulkAnalyzeConversationsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["bulk_analyze_conversations"] @@ -1129,12 +1131,12 @@ def calculate_issue_model_stats( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "calculate_issue_model_stats" not in self._stubs: - self._stubs[ - "calculate_issue_model_stats" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CalculateIssueModelStats", - request_serializer=contact_center_insights.CalculateIssueModelStatsRequest.serialize, - response_deserializer=contact_center_insights.CalculateIssueModelStatsResponse.deserialize, + self._stubs["calculate_issue_model_stats"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CalculateIssueModelStats", + request_serializer=contact_center_insights.CalculateIssueModelStatsRequest.serialize, + response_deserializer=contact_center_insights.CalculateIssueModelStatsResponse.deserialize, + ) ) return self._stubs["calculate_issue_model_stats"] @@ -1555,12 +1557,12 @@ def initialize_encryption_spec( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "initialize_encryption_spec" not in self._stubs: - self._stubs[ - "initialize_encryption_spec" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/InitializeEncryptionSpec", - request_serializer=contact_center_insights.InitializeEncryptionSpecRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["initialize_encryption_spec"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/InitializeEncryptionSpec", + request_serializer=contact_center_insights.InitializeEncryptionSpecRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["initialize_encryption_spec"] @@ -2023,12 +2025,12 @@ def create_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "create_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CreateQaScorecardRevision", - request_serializer=contact_center_insights.CreateQaScorecardRevisionRequest.serialize, - response_deserializer=resources.QaScorecardRevision.deserialize, + self._stubs["create_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CreateQaScorecardRevision", + request_serializer=contact_center_insights.CreateQaScorecardRevisionRequest.serialize, + response_deserializer=resources.QaScorecardRevision.deserialize, + ) ) return self._stubs["create_qa_scorecard_revision"] @@ -2083,12 +2085,12 @@ def tune_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "tune_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "tune_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/TuneQaScorecardRevision", - request_serializer=contact_center_insights.TuneQaScorecardRevisionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["tune_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/TuneQaScorecardRevision", + request_serializer=contact_center_insights.TuneQaScorecardRevisionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["tune_qa_scorecard_revision"] @@ -2114,12 +2116,12 @@ def deploy_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "deploy_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "deploy_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeployQaScorecardRevision", - request_serializer=contact_center_insights.DeployQaScorecardRevisionRequest.serialize, - response_deserializer=resources.QaScorecardRevision.deserialize, + self._stubs["deploy_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeployQaScorecardRevision", + request_serializer=contact_center_insights.DeployQaScorecardRevisionRequest.serialize, + response_deserializer=resources.QaScorecardRevision.deserialize, + ) ) return self._stubs["deploy_qa_scorecard_revision"] @@ -2145,12 +2147,12 @@ def undeploy_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "undeploy_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/UndeployQaScorecardRevision", - request_serializer=contact_center_insights.UndeployQaScorecardRevisionRequest.serialize, - response_deserializer=resources.QaScorecardRevision.deserialize, + self._stubs["undeploy_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/UndeployQaScorecardRevision", + request_serializer=contact_center_insights.UndeployQaScorecardRevisionRequest.serialize, + response_deserializer=resources.QaScorecardRevision.deserialize, + ) ) return self._stubs["undeploy_qa_scorecard_revision"] @@ -2175,12 +2177,12 @@ def delete_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "delete_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeleteQaScorecardRevision", - request_serializer=contact_center_insights.DeleteQaScorecardRevisionRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeleteQaScorecardRevision", + request_serializer=contact_center_insights.DeleteQaScorecardRevisionRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_qa_scorecard_revision"] @@ -2206,12 +2208,12 @@ def list_qa_scorecard_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_qa_scorecard_revisions" not in self._stubs: - self._stubs[ - "list_qa_scorecard_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/ListQaScorecardRevisions", - request_serializer=contact_center_insights.ListQaScorecardRevisionsRequest.serialize, - response_deserializer=contact_center_insights.ListQaScorecardRevisionsResponse.deserialize, + self._stubs["list_qa_scorecard_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/ListQaScorecardRevisions", + request_serializer=contact_center_insights.ListQaScorecardRevisionsRequest.serialize, + response_deserializer=contact_center_insights.ListQaScorecardRevisionsResponse.deserialize, + ) ) return self._stubs["list_qa_scorecard_revisions"] @@ -2407,12 +2409,12 @@ def bulk_upload_feedback_labels( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bulk_upload_feedback_labels" not in self._stubs: - self._stubs[ - "bulk_upload_feedback_labels" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkUploadFeedbackLabels", - request_serializer=contact_center_insights.BulkUploadFeedbackLabelsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["bulk_upload_feedback_labels"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkUploadFeedbackLabels", + request_serializer=contact_center_insights.BulkUploadFeedbackLabelsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["bulk_upload_feedback_labels"] @@ -2438,12 +2440,12 @@ def bulk_download_feedback_labels( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bulk_download_feedback_labels" not in self._stubs: - self._stubs[ - "bulk_download_feedback_labels" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkDownloadFeedbackLabels", - request_serializer=contact_center_insights.BulkDownloadFeedbackLabelsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["bulk_download_feedback_labels"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkDownloadFeedbackLabels", + request_serializer=contact_center_insights.BulkDownloadFeedbackLabelsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["bulk_download_feedback_labels"] diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc_asyncio.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc_asyncio.py index 2e93cdf18667..ef6eb284d6e1 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc_asyncio.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.contact_center_insights_v1.types import ( contact_center_insights, @@ -668,12 +670,12 @@ def bulk_analyze_conversations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bulk_analyze_conversations" not in self._stubs: - self._stubs[ - "bulk_analyze_conversations" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkAnalyzeConversations", - request_serializer=contact_center_insights.BulkAnalyzeConversationsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["bulk_analyze_conversations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkAnalyzeConversations", + request_serializer=contact_center_insights.BulkAnalyzeConversationsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["bulk_analyze_conversations"] @@ -1165,12 +1167,12 @@ def calculate_issue_model_stats( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "calculate_issue_model_stats" not in self._stubs: - self._stubs[ - "calculate_issue_model_stats" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CalculateIssueModelStats", - request_serializer=contact_center_insights.CalculateIssueModelStatsRequest.serialize, - response_deserializer=contact_center_insights.CalculateIssueModelStatsResponse.deserialize, + self._stubs["calculate_issue_model_stats"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CalculateIssueModelStats", + request_serializer=contact_center_insights.CalculateIssueModelStatsRequest.serialize, + response_deserializer=contact_center_insights.CalculateIssueModelStatsResponse.deserialize, + ) ) return self._stubs["calculate_issue_model_stats"] @@ -1604,12 +1606,12 @@ def initialize_encryption_spec( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "initialize_encryption_spec" not in self._stubs: - self._stubs[ - "initialize_encryption_spec" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/InitializeEncryptionSpec", - request_serializer=contact_center_insights.InitializeEncryptionSpecRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["initialize_encryption_spec"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/InitializeEncryptionSpec", + request_serializer=contact_center_insights.InitializeEncryptionSpecRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["initialize_encryption_spec"] @@ -2090,12 +2092,12 @@ def create_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "create_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CreateQaScorecardRevision", - request_serializer=contact_center_insights.CreateQaScorecardRevisionRequest.serialize, - response_deserializer=resources.QaScorecardRevision.deserialize, + self._stubs["create_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CreateQaScorecardRevision", + request_serializer=contact_center_insights.CreateQaScorecardRevisionRequest.serialize, + response_deserializer=resources.QaScorecardRevision.deserialize, + ) ) return self._stubs["create_qa_scorecard_revision"] @@ -2150,12 +2152,12 @@ def tune_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "tune_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "tune_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/TuneQaScorecardRevision", - request_serializer=contact_center_insights.TuneQaScorecardRevisionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["tune_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/TuneQaScorecardRevision", + request_serializer=contact_center_insights.TuneQaScorecardRevisionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["tune_qa_scorecard_revision"] @@ -2181,12 +2183,12 @@ def deploy_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "deploy_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "deploy_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeployQaScorecardRevision", - request_serializer=contact_center_insights.DeployQaScorecardRevisionRequest.serialize, - response_deserializer=resources.QaScorecardRevision.deserialize, + self._stubs["deploy_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeployQaScorecardRevision", + request_serializer=contact_center_insights.DeployQaScorecardRevisionRequest.serialize, + response_deserializer=resources.QaScorecardRevision.deserialize, + ) ) return self._stubs["deploy_qa_scorecard_revision"] @@ -2212,12 +2214,12 @@ def undeploy_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "undeploy_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/UndeployQaScorecardRevision", - request_serializer=contact_center_insights.UndeployQaScorecardRevisionRequest.serialize, - response_deserializer=resources.QaScorecardRevision.deserialize, + self._stubs["undeploy_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/UndeployQaScorecardRevision", + request_serializer=contact_center_insights.UndeployQaScorecardRevisionRequest.serialize, + response_deserializer=resources.QaScorecardRevision.deserialize, + ) ) return self._stubs["undeploy_qa_scorecard_revision"] @@ -2243,12 +2245,12 @@ def delete_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "delete_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeleteQaScorecardRevision", - request_serializer=contact_center_insights.DeleteQaScorecardRevisionRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeleteQaScorecardRevision", + request_serializer=contact_center_insights.DeleteQaScorecardRevisionRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_qa_scorecard_revision"] @@ -2274,12 +2276,12 @@ def list_qa_scorecard_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_qa_scorecard_revisions" not in self._stubs: - self._stubs[ - "list_qa_scorecard_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/ListQaScorecardRevisions", - request_serializer=contact_center_insights.ListQaScorecardRevisionsRequest.serialize, - response_deserializer=contact_center_insights.ListQaScorecardRevisionsResponse.deserialize, + self._stubs["list_qa_scorecard_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/ListQaScorecardRevisions", + request_serializer=contact_center_insights.ListQaScorecardRevisionsRequest.serialize, + response_deserializer=contact_center_insights.ListQaScorecardRevisionsResponse.deserialize, + ) ) return self._stubs["list_qa_scorecard_revisions"] @@ -2478,12 +2480,12 @@ def bulk_upload_feedback_labels( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bulk_upload_feedback_labels" not in self._stubs: - self._stubs[ - "bulk_upload_feedback_labels" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkUploadFeedbackLabels", - request_serializer=contact_center_insights.BulkUploadFeedbackLabelsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["bulk_upload_feedback_labels"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkUploadFeedbackLabels", + request_serializer=contact_center_insights.BulkUploadFeedbackLabelsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["bulk_upload_feedback_labels"] @@ -2509,12 +2511,12 @@ def bulk_download_feedback_labels( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bulk_download_feedback_labels" not in self._stubs: - self._stubs[ - "bulk_download_feedback_labels" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkDownloadFeedbackLabels", - request_serializer=contact_center_insights.BulkDownloadFeedbackLabelsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["bulk_download_feedback_labels"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkDownloadFeedbackLabels", + request_serializer=contact_center_insights.BulkDownloadFeedbackLabelsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["bulk_download_feedback_labels"] diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest.py index 1442f649a090..6ddce1539427 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.contact_center_insights_v1.types import ( @@ -4217,9 +4219,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseBulkAnalyzeConversations._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseBulkAnalyzeConversations._get_http_options() request, metadata = self._interceptor.pre_bulk_analyze_conversations( request, metadata @@ -4372,9 +4372,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseBulkDeleteConversations._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseBulkDeleteConversations._get_http_options() request, metadata = self._interceptor.pre_bulk_delete_conversations( request, metadata @@ -4528,9 +4526,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseBulkDownloadFeedbackLabels._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseBulkDownloadFeedbackLabels._get_http_options() request, metadata = self._interceptor.pre_bulk_download_feedback_labels( request, metadata @@ -4597,11 +4593,10 @@ def __call__( resp = self._interceptor.post_bulk_download_feedback_labels(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_bulk_download_feedback_labels_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_bulk_download_feedback_labels_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4687,9 +4682,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseBulkUploadFeedbackLabels._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseBulkUploadFeedbackLabels._get_http_options() request, metadata = self._interceptor.pre_bulk_upload_feedback_labels( request, metadata @@ -4841,9 +4834,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCalculateIssueModelStats._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCalculateIssueModelStats._get_http_options() request, metadata = self._interceptor.pre_calculate_issue_model_stats( request, metadata @@ -4993,9 +4984,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCalculateStats._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCalculateStats._get_http_options() request, metadata = self._interceptor.pre_calculate_stats(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseCalculateStats._get_transcoded_request( @@ -5144,9 +5133,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateAnalysis._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateAnalysis._get_http_options() request, metadata = self._interceptor.pre_create_analysis(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseCreateAnalysis._get_transcoded_request( @@ -5304,9 +5291,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateAnalysisRule._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateAnalysisRule._get_http_options() request, metadata = self._interceptor.pre_create_analysis_rule( request, metadata @@ -5459,9 +5444,7 @@ def __call__( The conversation resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -5617,9 +5600,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateFeedbackLabel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateFeedbackLabel._get_http_options() request, metadata = self._interceptor.pre_create_feedback_label( request, metadata @@ -5775,9 +5756,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateIssueModel._get_http_options() request, metadata = self._interceptor.pre_create_issue_model( request, metadata @@ -5928,9 +5907,7 @@ def __call__( The phrase matcher resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreatePhraseMatcher._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreatePhraseMatcher._get_http_options() request, metadata = self._interceptor.pre_create_phrase_matcher( request, metadata @@ -6086,9 +6063,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateQaQuestion._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateQaQuestion._get_http_options() request, metadata = self._interceptor.pre_create_qa_question( request, metadata @@ -6245,9 +6220,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateQaScorecard._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateQaScorecard._get_http_options() request, metadata = self._interceptor.pre_create_qa_scorecard( request, metadata @@ -6412,9 +6385,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateQaScorecardRevision._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateQaScorecardRevision._get_http_options() request, metadata = self._interceptor.pre_create_qa_scorecard_revision( request, metadata @@ -6565,9 +6536,7 @@ def __call__( The View resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateView._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateView._get_http_options() request, metadata = self._interceptor.pre_create_view(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseCreateView._get_transcoded_request( @@ -6711,9 +6680,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteAnalysis._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteAnalysis._get_http_options() request, metadata = self._interceptor.pre_delete_analysis(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseDeleteAnalysis._get_transcoded_request( @@ -6819,9 +6786,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteAnalysisRule._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteAnalysisRule._get_http_options() request, metadata = self._interceptor.pre_delete_analysis_rule( request, metadata @@ -6930,9 +6895,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -7042,9 +7005,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteFeedbackLabel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteFeedbackLabel._get_http_options() request, metadata = self._interceptor.pre_delete_feedback_label( request, metadata @@ -7153,9 +7114,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteIssue._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteIssue._get_http_options() request, metadata = self._interceptor.pre_delete_issue(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseDeleteIssue._get_transcoded_request( @@ -7267,9 +7226,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteIssueModel._get_http_options() request, metadata = self._interceptor.pre_delete_issue_model( request, metadata @@ -7411,9 +7368,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeletePhraseMatcher._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeletePhraseMatcher._get_http_options() request, metadata = self._interceptor.pre_delete_phrase_matcher( request, metadata @@ -7523,9 +7478,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteQaQuestion._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteQaQuestion._get_http_options() request, metadata = self._interceptor.pre_delete_qa_question( request, metadata @@ -7635,9 +7588,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteQaScorecard._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteQaScorecard._get_http_options() request, metadata = self._interceptor.pre_delete_qa_scorecard( request, metadata @@ -7748,9 +7699,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteQaScorecardRevision._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteQaScorecardRevision._get_http_options() request, metadata = self._interceptor.pre_delete_qa_scorecard_revision( request, metadata @@ -7857,9 +7806,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteView._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteView._get_http_options() request, metadata = self._interceptor.pre_delete_view(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseDeleteView._get_transcoded_request( @@ -7972,9 +7919,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeployIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeployIssueModel._get_http_options() request, metadata = self._interceptor.pre_deploy_issue_model( request, metadata @@ -8137,9 +8082,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeployQaScorecardRevision._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeployQaScorecardRevision._get_http_options() request, metadata = self._interceptor.pre_deploy_qa_scorecard_revision( request, metadata @@ -8293,9 +8236,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseExportInsightsData._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseExportInsightsData._get_http_options() request, metadata = self._interceptor.pre_export_insights_data( request, metadata @@ -8449,9 +8390,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseExportIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseExportIssueModel._get_http_options() request, metadata = self._interceptor.pre_export_issue_model( request, metadata @@ -8601,9 +8540,7 @@ def __call__( The analysis resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetAnalysis._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetAnalysis._get_http_options() request, metadata = self._interceptor.pre_get_analysis(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseGetAnalysis._get_transcoded_request( @@ -8757,9 +8694,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetAnalysisRule._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetAnalysisRule._get_http_options() request, metadata = self._interceptor.pre_get_analysis_rule( request, metadata @@ -8906,9 +8841,7 @@ def __call__( The conversation resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -9059,9 +8992,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetEncryptionSpec._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetEncryptionSpec._get_http_options() request, metadata = self._interceptor.pre_get_encryption_spec( request, metadata @@ -9211,9 +9142,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetFeedbackLabel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetFeedbackLabel._get_http_options() request, metadata = self._interceptor.pre_get_feedback_label( request, metadata @@ -9360,9 +9289,7 @@ def __call__( The issue resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetIssue._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetIssue._get_http_options() request, metadata = self._interceptor.pre_get_issue(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseGetIssue._get_transcoded_request( @@ -9505,9 +9432,7 @@ def __call__( The issue model resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetIssueModel._get_http_options() request, metadata = self._interceptor.pre_get_issue_model(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseGetIssueModel._get_transcoded_request( @@ -9651,9 +9576,7 @@ def __call__( The phrase matcher resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetPhraseMatcher._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetPhraseMatcher._get_http_options() request, metadata = self._interceptor.pre_get_phrase_matcher( request, metadata @@ -9802,9 +9725,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetQaQuestion._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetQaQuestion._get_http_options() request, metadata = self._interceptor.pre_get_qa_question(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseGetQaQuestion._get_transcoded_request( @@ -9951,9 +9872,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetQaScorecard._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetQaScorecard._get_http_options() request, metadata = self._interceptor.pre_get_qa_scorecard( request, metadata @@ -10109,9 +10028,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetQaScorecardRevision._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetQaScorecardRevision._get_http_options() request, metadata = self._interceptor.pre_get_qa_scorecard_revision( request, metadata @@ -10263,9 +10180,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetSettings._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetSettings._get_http_options() request, metadata = self._interceptor.pre_get_settings(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseGetSettings._get_transcoded_request( @@ -10557,9 +10472,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseImportIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseImportIssueModel._get_http_options() request, metadata = self._interceptor.pre_import_issue_model( request, metadata @@ -10713,9 +10626,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseIngestConversations._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseIngestConversations._get_http_options() request, metadata = self._interceptor.pre_ingest_conversations( request, metadata @@ -10871,9 +10782,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseInitializeEncryptionSpec._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseInitializeEncryptionSpec._get_http_options() request, metadata = self._interceptor.pre_initialize_encryption_spec( request, metadata @@ -11024,9 +10933,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListAllFeedbackLabels._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListAllFeedbackLabels._get_http_options() request, metadata = self._interceptor.pre_list_all_feedback_labels( request, metadata @@ -11177,9 +11084,7 @@ def __call__( The response to list analyses. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListAnalyses._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListAnalyses._get_http_options() request, metadata = self._interceptor.pre_list_analyses(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseListAnalyses._get_transcoded_request( @@ -11324,9 +11229,7 @@ def __call__( The response of listing views. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListAnalysisRules._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListAnalysisRules._get_http_options() request, metadata = self._interceptor.pre_list_analysis_rules( request, metadata @@ -11479,9 +11382,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -11635,9 +11536,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListFeedbackLabels._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListFeedbackLabels._get_http_options() request, metadata = self._interceptor.pre_list_feedback_labels( request, metadata @@ -11788,9 +11687,7 @@ def __call__( The response of listing issue models. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListIssueModels._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListIssueModels._get_http_options() request, metadata = self._interceptor.pre_list_issue_models( request, metadata @@ -11941,9 +11838,7 @@ def __call__( The response of listing issues. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListIssues._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListIssues._get_http_options() request, metadata = self._interceptor.pre_list_issues(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseListIssues._get_transcoded_request( @@ -12090,9 +11985,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListPhraseMatchers._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListPhraseMatchers._get_http_options() request, metadata = self._interceptor.pre_list_phrase_matchers( request, metadata @@ -12245,9 +12138,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListQaQuestions._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListQaQuestions._get_http_options() request, metadata = self._interceptor.pre_list_qa_questions( request, metadata @@ -12401,9 +12292,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListQaScorecardRevisions._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListQaScorecardRevisions._get_http_options() request, metadata = self._interceptor.pre_list_qa_scorecard_revisions( request, metadata @@ -12552,9 +12441,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListQaScorecards._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListQaScorecards._get_http_options() request, metadata = self._interceptor.pre_list_qa_scorecards( request, metadata @@ -12705,9 +12592,7 @@ def __call__( The response of listing views. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListViews._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListViews._get_http_options() request, metadata = self._interceptor.pre_list_views(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseListViews._get_transcoded_request( @@ -12856,9 +12741,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseQueryMetrics._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseQueryMetrics._get_http_options() request, metadata = self._interceptor.pre_query_metrics(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseQueryMetrics._get_transcoded_request( @@ -13010,9 +12893,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseTuneQaScorecardRevision._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseTuneQaScorecardRevision._get_http_options() request, metadata = self._interceptor.pre_tune_qa_scorecard_revision( request, metadata @@ -13165,9 +13046,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUndeployIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUndeployIssueModel._get_http_options() request, metadata = self._interceptor.pre_undeploy_issue_model( request, metadata @@ -13332,9 +13211,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUndeployQaScorecardRevision._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUndeployQaScorecardRevision._get_http_options() request, metadata = self._interceptor.pre_undeploy_qa_scorecard_revision( request, metadata @@ -13403,11 +13280,10 @@ def __call__( resp = self._interceptor.post_undeploy_qa_scorecard_revision(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_undeploy_qa_scorecard_revision_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_undeploy_qa_scorecard_revision_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -13499,9 +13375,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateAnalysisRule._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateAnalysisRule._get_http_options() request, metadata = self._interceptor.pre_update_analysis_rule( request, metadata @@ -13654,9 +13528,7 @@ def __call__( The conversation resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateConversation._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateConversation._get_http_options() request, metadata = self._interceptor.pre_update_conversation( request, metadata @@ -13812,9 +13684,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateFeedbackLabel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateFeedbackLabel._get_http_options() request, metadata = self._interceptor.pre_update_feedback_label( request, metadata @@ -13967,9 +13837,7 @@ def __call__( The issue resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateIssue._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateIssue._get_http_options() request, metadata = self._interceptor.pre_update_issue(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseUpdateIssue._get_transcoded_request( @@ -14118,9 +13986,7 @@ def __call__( The issue model resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateIssueModel._get_http_options() request, metadata = self._interceptor.pre_update_issue_model( request, metadata @@ -14274,9 +14140,7 @@ def __call__( The phrase matcher resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdatePhraseMatcher._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdatePhraseMatcher._get_http_options() request, metadata = self._interceptor.pre_update_phrase_matcher( request, metadata @@ -14432,9 +14296,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateQaQuestion._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateQaQuestion._get_http_options() request, metadata = self._interceptor.pre_update_qa_question( request, metadata @@ -14591,9 +14453,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateQaScorecard._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateQaScorecard._get_http_options() request, metadata = self._interceptor.pre_update_qa_scorecard( request, metadata @@ -14753,9 +14613,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateSettings._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateSettings._get_http_options() request, metadata = self._interceptor.pre_update_settings(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseUpdateSettings._get_transcoded_request( @@ -14904,9 +14762,7 @@ def __call__( The View resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateView._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateView._get_http_options() request, metadata = self._interceptor.pre_update_view(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseUpdateView._get_transcoded_request( @@ -15058,9 +14914,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUploadConversation._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUploadConversation._get_http_options() request, metadata = self._interceptor.pre_upload_conversation( request, metadata @@ -15164,7 +15018,9 @@ def bulk_analyze_conversations( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BulkAnalyzeConversations(self._session, self._host, self._interceptor) # type: ignore + return self._BulkAnalyzeConversations( + self._session, self._host, self._interceptor + ) # type: ignore @property def bulk_delete_conversations( @@ -15175,7 +15031,9 @@ def bulk_delete_conversations( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BulkDeleteConversations(self._session, self._host, self._interceptor) # type: ignore + return self._BulkDeleteConversations( + self._session, self._host, self._interceptor + ) # type: ignore @property def bulk_download_feedback_labels( @@ -15186,7 +15044,9 @@ def bulk_download_feedback_labels( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BulkDownloadFeedbackLabels(self._session, self._host, self._interceptor) # type: ignore + return self._BulkDownloadFeedbackLabels( + self._session, self._host, self._interceptor + ) # type: ignore @property def bulk_upload_feedback_labels( @@ -15197,7 +15057,9 @@ def bulk_upload_feedback_labels( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BulkUploadFeedbackLabels(self._session, self._host, self._interceptor) # type: ignore + return self._BulkUploadFeedbackLabels( + self._session, self._host, self._interceptor + ) # type: ignore @property def calculate_issue_model_stats( @@ -15208,7 +15070,9 @@ def calculate_issue_model_stats( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CalculateIssueModelStats(self._session, self._host, self._interceptor) # type: ignore + return self._CalculateIssueModelStats( + self._session, self._host, self._interceptor + ) # type: ignore @property def calculate_stats( @@ -15310,7 +15174,9 @@ def create_qa_scorecard_revision( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateQaScorecardRevision(self._session, self._host, self._interceptor) # type: ignore + return self._CreateQaScorecardRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_view( @@ -15406,7 +15272,9 @@ def delete_qa_scorecard_revision( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteQaScorecardRevision(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteQaScorecardRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_view( @@ -15435,7 +15303,9 @@ def deploy_qa_scorecard_revision( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeployQaScorecardRevision(self._session, self._host, self._interceptor) # type: ignore + return self._DeployQaScorecardRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_insights_data( @@ -15558,7 +15428,9 @@ def get_qa_scorecard_revision( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetQaScorecardRevision(self._session, self._host, self._interceptor) # type: ignore + return self._GetQaScorecardRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_settings( @@ -15605,7 +15477,9 @@ def initialize_encryption_spec( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._InitializeEncryptionSpec(self._session, self._host, self._interceptor) # type: ignore + return self._InitializeEncryptionSpec( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_all_feedback_labels( @@ -15715,7 +15589,9 @@ def list_qa_scorecard_revisions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListQaScorecardRevisions(self._session, self._host, self._interceptor) # type: ignore + return self._ListQaScorecardRevisions( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_qa_scorecards( @@ -15758,7 +15634,9 @@ def tune_qa_scorecard_revision( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._TuneQaScorecardRevision(self._session, self._host, self._interceptor) # type: ignore + return self._TuneQaScorecardRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def undeploy_issue_model( @@ -15779,7 +15657,9 @@ def undeploy_qa_scorecard_revision( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UndeployQaScorecardRevision(self._session, self._host, self._interceptor) # type: ignore + return self._UndeployQaScorecardRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_analysis_rule( @@ -15940,9 +15820,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -16060,9 +15938,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseGetOperation._get_transcoded_request( @@ -16201,9 +16077,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest_base.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest_base.py index 45839663a925..0f8028853e2f 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest_base.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.contact_center_insights_v1.types import ( contact_center_insights, diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/contact_center_insights.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/contact_center_insights.py index 4dd2c3ce3276..906f73f1dba1 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/contact_center_insights.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/contact_center_insights.py @@ -168,6 +168,7 @@ class ConversationView(proto.Enum): Populates all fields in the conversation except the transcript. """ + CONVERSATION_VIEW_UNSPECIFIED = 0 FULL = 2 BASIC = 1 @@ -272,12 +273,12 @@ class Interval(proto.Message): number=1, message=duration_pb2.Duration, ) - points: MutableSequence[ - "CalculateStatsResponse.TimeSeries.Interval" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="CalculateStatsResponse.TimeSeries.Interval", + points: MutableSequence["CalculateStatsResponse.TimeSeries.Interval"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="CalculateStatsResponse.TimeSeries.Interval", + ) ) average_duration: duration_pb2.Duration = proto.Field( @@ -763,6 +764,7 @@ class BucketObjectType(proto.Enum): AUDIO (2): The object is an audio file. """ + BUCKET_OBJECT_TYPE_UNSPECIFIED = 0 TRANSCRIPT = 1 AUDIO = 2 @@ -1325,6 +1327,7 @@ class WriteDisposition(proto.Enum): If the table already exists, BigQuery will append data to the table. """ + WRITE_DISPOSITION_UNSPECIFIED = 0 WRITE_TRUNCATE = 1 WRITE_APPEND = 2 @@ -2574,6 +2577,7 @@ class DimensionKey(proto.Enum): The dimension is keyed by the conversation profile ID. """ + DIMENSION_KEY_UNSPECIFIED = 0 ISSUE = 1 AGENT = 2 @@ -2792,6 +2796,7 @@ class TimeGranularity(proto.Enum): granularity. 1 MONTH means [01st of the month to 1st of the next month). """ + TIME_GRANULARITY_UNSPECIFIED = 0 NONE = 1 DAILY = 2 @@ -3043,12 +3048,12 @@ class TimeSeries(proto.Message): . """ - data_points: MutableSequence[ - "QueryMetricsResponse.Slice.DataPoint" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="QueryMetricsResponse.Slice.DataPoint", + data_points: MutableSequence["QueryMetricsResponse.Slice.DataPoint"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="QueryMetricsResponse.Slice.DataPoint", + ) ) dimensions: MutableSequence["Dimension"] = proto.RepeatedField( @@ -3746,12 +3751,12 @@ class ListQaScorecardRevisionsResponse(proto.Message): def raw_page(self): return self - qa_scorecard_revisions: MutableSequence[ - resources.QaScorecardRevision - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.QaScorecardRevision, + qa_scorecard_revisions: MutableSequence[resources.QaScorecardRevision] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.QaScorecardRevision, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -4048,6 +4053,7 @@ class Format(proto.Enum): JSON (2): JSON format. """ + FORMAT_UNSPECIFIED = 0 CSV = 1 JSON = 2 @@ -4219,6 +4225,7 @@ class FeedbackLabelType(proto.Enum): Downloaded file will contain only Topic Modeling labels. """ + FEEDBACK_LABEL_TYPE_UNSPECIFIED = 0 QUALITY_AI = 1 TOPIC_MODELING = 2 @@ -4267,6 +4274,7 @@ class Format(proto.Enum): JSON format. 1 label stored per JSON file by default. """ + FORMAT_UNSPECIFIED = 0 CSV = 1 JSON = 2 diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/resources.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/resources.py index 4d1c683d46fe..99803de2762e 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/resources.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/resources.py @@ -103,6 +103,7 @@ class DatasetValidationWarning(proto.Enum): All the labels in the dataset come from a single answer choice. """ + DATASET_VALIDATION_WARNING_UNSPECIFIED = 0 TOO_MANY_INVALID_FEEDBACK_LABELS = 1 INSUFFICIENT_FEEDBACK_LABELS = 2 @@ -217,6 +218,7 @@ class Medium(proto.Enum): The format for conversations that took place over chat. """ + MEDIUM_UNSPECIFIED = 0 PHONE_CALL = 1 CHAT = 2 @@ -312,12 +314,12 @@ class AgentInfo(proto.Message): proto.STRING, number=3, ) - agent_info: MutableSequence[ - "Conversation.QualityMetadata.AgentInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Conversation.QualityMetadata.AgentInfo", + agent_info: MutableSequence["Conversation.QualityMetadata.AgentInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Conversation.QualityMetadata.AgentInfo", + ) ) class Transcript(proto.Message): @@ -797,12 +799,12 @@ class CallAnalysisMetadata(proto.Message): number=8, message="IssueModelResult", ) - qa_scorecard_results: MutableSequence[ - "QaScorecardResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=10, - message="QaScorecardResult", + qa_scorecard_results: MutableSequence["QaScorecardResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=10, + message="QaScorecardResult", + ) ) call_analysis_metadata: CallAnalysisMetadata = proto.Field( @@ -1225,6 +1227,7 @@ class Type(proto.Enum): The metadata identifies the ``value`` and ``currency``. """ + TYPE_UNSPECIFIED = 0 PERSON = 1 LOCATION = 2 @@ -1363,6 +1366,7 @@ class MentionType(proto.Enum): COMMON (2): Common noun (or noun compound). """ + MENTION_TYPE_UNSPECIFIED = 0 PROPER = 1 COMMON = 2 @@ -1491,6 +1495,7 @@ class State(proto.Enum): DELETING (5): Model is being deleted. """ + STATE_UNSPECIFIED = 0 UNDEPLOYED = 1 DEPLOYING = 2 @@ -1509,6 +1514,7 @@ class ModelType(proto.Enum): TYPE_V2 (2): Type V2. """ + MODEL_TYPE_UNSPECIFIED = 0 TYPE_V1 = 1 TYPE_V2 = 2 @@ -1759,6 +1765,7 @@ class PhraseMatcherType(proto.Enum): If any of the phrase match rule groups are met, there is a match. """ + PHRASE_MATCHER_TYPE_UNSPECIFIED = 0 ALL_OF = 1 ANY_OF = 2 @@ -1793,12 +1800,12 @@ class PhraseMatcherType(proto.Enum): proto.BOOL, number=7, ) - phrase_match_rule_groups: MutableSequence[ - "PhraseMatchRuleGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="PhraseMatchRuleGroup", + phrase_match_rule_groups: MutableSequence["PhraseMatchRuleGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="PhraseMatchRuleGroup", + ) ) activation_update_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, @@ -1843,6 +1850,7 @@ class PhraseMatchRuleGroupType(proto.Enum): If any of the phrase match rules are met, there is a match. """ + PHRASE_MATCH_RULE_GROUP_TYPE_UNSPECIFIED = 0 ALL_OF = 1 ANY_OF = 2 @@ -2319,6 +2327,7 @@ class QuerySource(proto.Enum): suggestions, e.g. from a preceding SuggestKnowledgeAssist response. """ + QUERY_SOURCE_UNSPECIFIED = 0 AGENT_QUERY = 1 SUGGESTED_QUERY = 2 @@ -2435,6 +2444,7 @@ class CorrectnessLevel(proto.Enum): FULLY_CORRECT (3): Answer is fully correct. """ + CORRECTNESS_LEVEL_UNSPECIFIED = 0 NOT_CORRECT = 1 PARTIALLY_CORRECT = 2 @@ -2764,6 +2774,7 @@ class Role(proto.Enum): Participant is either a human or automated agent. """ + ROLE_UNSPECIFIED = 0 HUMAN_AGENT = 1 AUTOMATED_AGENT = 2 @@ -2922,6 +2933,7 @@ class SummarizationModel(proto.Enum): BASELINE_MODEL_V2_0 (2): The CCAI baseline model, V2.0. """ + SUMMARIZATION_MODEL_UNSPECIFIED = 0 BASELINE_MODEL = 1 BASELINE_MODEL_V2_0 = 2 @@ -3180,12 +3192,12 @@ class TuningMetadata(proto.Message): proto.INT64, number=1, ) - dataset_validation_warnings: MutableSequence[ - "DatasetValidationWarning" - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum="DatasetValidationWarning", + dataset_validation_warnings: MutableSequence["DatasetValidationWarning"] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum="DatasetValidationWarning", + ) ) tuning_error: str = proto.Field( proto.STRING, @@ -3338,6 +3350,7 @@ class State(proto.Enum): Scorecard model training was explicitly cancelled by the user. """ + STATE_UNSPECIFIED = 0 EDITABLE = 12 TRAINING = 2 @@ -3511,6 +3524,7 @@ class SourceType(proto.Enum): Answer was created by a human via manual edit. """ + SOURCE_TYPE_UNSPECIFIED = 0 SYSTEM_GENERATED = 1 MANUAL_EDIT = 2 @@ -3688,6 +3702,7 @@ class SourceType(proto.Enum): answers, and includes any manual edits if they exist. """ + SOURCE_TYPE_UNSPECIFIED = 0 SYSTEM_GENERATED_ONLY = 1 INCLUDES_MANUAL_EDITS = 2 @@ -3712,12 +3727,12 @@ class SourceType(proto.Enum): number=4, optional=True, ) - qa_tag_results: MutableSequence[ - "QaScorecardResult.QaTagResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="QaScorecardResult.QaTagResult", + qa_tag_results: MutableSequence["QaScorecardResult.QaTagResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="QaScorecardResult.QaTagResult", + ) ) name: str = proto.Field( diff --git a/packages/google-cloud-contact-center-insights/mypy.ini b/packages/google-cloud-contact-center-insights/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-contact-center-insights/mypy.ini +++ b/packages/google-cloud-contact-center-insights/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-contact-center-insights/noxfile.py b/packages/google-cloud-contact-center-insights/noxfile.py index 996511a44cef..71b9fc3f1d02 100644 --- a/packages/google-cloud-contact-center-insights/noxfile.py +++ b/packages/google-cloud-contact-center-insights/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-contact-center-insights/tests/unit/gapic/contact_center_insights_v1/test_contact_center_insights.py b/packages/google-cloud-contact-center-insights/tests/unit/gapic/contact_center_insights_v1/test_contact_center_insights.py index 843bb607d086..b8823822581b 100644 --- a/packages/google-cloud-contact-center-insights/tests/unit/gapic/contact_center_insights_v1/test_contact_center_insights.py +++ b/packages/google-cloud-contact-center-insights/tests/unit/gapic/contact_center_insights_v1/test_contact_center_insights.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +59,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.cloud.contact_center_insights_v1.services.contact_center_insights import ( ContactCenterInsightsAsyncClient, @@ -1014,10 +1016,9 @@ def test_contact_center_insights_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1063,9 @@ def test_contact_center_insights_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1101,10 +1101,9 @@ def test_contact_center_insights_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1364,9 +1363,7 @@ def test_contact_center_insights_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1493,9 +1490,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -1878,9 +1875,9 @@ def test_upload_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.upload_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.upload_conversation] = ( + mock_rpc + ) request = {} client.upload_conversation(request) @@ -2149,9 +2146,9 @@ def test_update_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -2531,9 +2528,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -2881,9 +2878,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -3422,9 +3419,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -5972,9 +5969,9 @@ def test_ingest_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.ingest_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.ingest_conversations] = ( + mock_rpc + ) request = {} client.ingest_conversations(request) @@ -6322,9 +6319,9 @@ def test_export_insights_data_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_insights_data - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_insights_data] = ( + mock_rpc + ) request = {} client.export_insights_data(request) @@ -6668,9 +6665,9 @@ def test_create_issue_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_issue_model] = ( + mock_rpc + ) request = {} client.create_issue_model(request) @@ -7033,9 +7030,9 @@ def test_update_issue_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_issue_model] = ( + mock_rpc + ) request = {} client.update_issue_model(request) @@ -7734,9 +7731,9 @@ def test_list_issue_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_issue_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_issue_models] = ( + mock_rpc + ) request = {} client.list_issue_models(request) @@ -8070,9 +8067,9 @@ def test_delete_issue_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_issue_model] = ( + mock_rpc + ) request = {} client.delete_issue_model(request) @@ -8416,9 +8413,9 @@ def test_deploy_issue_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.deploy_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.deploy_issue_model] = ( + mock_rpc + ) request = {} client.deploy_issue_model(request) @@ -8762,9 +8759,9 @@ def test_undeploy_issue_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.undeploy_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.undeploy_issue_model] = ( + mock_rpc + ) request = {} client.undeploy_issue_model(request) @@ -9108,9 +9105,9 @@ def test_export_issue_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_issue_model] = ( + mock_rpc + ) request = {} client.export_issue_model(request) @@ -9454,9 +9451,9 @@ def test_import_issue_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_issue_model] = ( + mock_rpc + ) request = {} client.import_issue_model(request) @@ -11455,9 +11452,9 @@ def test_create_phrase_matcher_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_phrase_matcher] = ( + mock_rpc + ) request = {} client.create_phrase_matcher(request) @@ -11831,9 +11828,9 @@ def test_get_phrase_matcher_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_phrase_matcher] = ( + mock_rpc + ) request = {} client.get_phrase_matcher(request) @@ -12189,9 +12186,9 @@ def test_list_phrase_matchers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_phrase_matchers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_phrase_matchers] = ( + mock_rpc + ) request = {} client.list_phrase_matchers(request) @@ -12731,9 +12728,9 @@ def test_delete_phrase_matcher_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_phrase_matcher] = ( + mock_rpc + ) request = {} client.delete_phrase_matcher(request) @@ -13073,9 +13070,9 @@ def test_update_phrase_matcher_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_phrase_matcher] = ( + mock_rpc + ) request = {} client.update_phrase_matcher(request) @@ -14429,9 +14426,9 @@ def test_create_analysis_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_analysis_rule] = ( + mock_rpc + ) request = {} client.create_analysis_rule(request) @@ -14795,9 +14792,9 @@ def test_get_analysis_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_analysis_rule] = ( + mock_rpc + ) request = {} client.get_analysis_rule(request) @@ -15147,9 +15144,9 @@ def test_list_analysis_rules_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_analysis_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_analysis_rules] = ( + mock_rpc + ) request = {} client.list_analysis_rules(request) @@ -15695,9 +15692,9 @@ def test_update_analysis_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_analysis_rule] = ( + mock_rpc + ) request = {} client.update_analysis_rule(request) @@ -16052,9 +16049,9 @@ def test_delete_analysis_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_analysis_rule] = ( + mock_rpc + ) request = {} client.delete_analysis_rule(request) @@ -16387,9 +16384,9 @@ def test_get_encryption_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_spec] = ( + mock_rpc + ) request = {} client.get_encryption_spec(request) @@ -19161,9 +19158,9 @@ def test_create_qa_question_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_qa_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_qa_question] = ( + mock_rpc + ) request = {} client.create_qa_question(request) @@ -19883,9 +19880,9 @@ def test_update_qa_question_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_qa_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_qa_question] = ( + mock_rpc + ) request = {} client.update_qa_question(request) @@ -20242,9 +20239,9 @@ def test_delete_qa_question_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_qa_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_qa_question] = ( + mock_rpc + ) request = {} client.delete_qa_question(request) @@ -20575,9 +20572,9 @@ def test_list_qa_questions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_qa_questions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_qa_questions] = ( + mock_rpc + ) request = {} client.list_qa_questions(request) @@ -21125,9 +21122,9 @@ def test_create_qa_scorecard_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_qa_scorecard] = ( + mock_rpc + ) request = {} client.create_qa_scorecard(request) @@ -21489,9 +21486,9 @@ def test_get_qa_scorecard_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_qa_scorecard] = ( + mock_rpc + ) request = {} client.get_qa_scorecard(request) @@ -21825,9 +21822,9 @@ def test_update_qa_scorecard_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_qa_scorecard] = ( + mock_rpc + ) request = {} client.update_qa_scorecard(request) @@ -22178,9 +22175,9 @@ def test_delete_qa_scorecard_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_qa_scorecard] = ( + mock_rpc + ) request = {} client.delete_qa_scorecard(request) @@ -22513,9 +22510,9 @@ def test_list_qa_scorecards_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_qa_scorecards - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_qa_scorecards] = ( + mock_rpc + ) request = {} client.list_qa_scorecards(request) @@ -25568,9 +25565,9 @@ def test_create_feedback_label_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_feedback_label] = ( + mock_rpc + ) request = {} client.create_feedback_label(request) @@ -25936,9 +25933,9 @@ def test_list_feedback_labels_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_feedback_labels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_feedback_labels] = ( + mock_rpc + ) request = {} client.list_feedback_labels(request) @@ -26483,9 +26480,9 @@ def test_get_feedback_label_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_feedback_label] = ( + mock_rpc + ) request = {} client.get_feedback_label(request) @@ -26827,9 +26824,9 @@ def test_update_feedback_label_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_feedback_label] = ( + mock_rpc + ) request = {} client.update_feedback_label(request) @@ -27179,9 +27176,9 @@ def test_delete_feedback_label_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_feedback_label] = ( + mock_rpc + ) request = {} client.delete_feedback_label(request) @@ -28693,9 +28690,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -28894,9 +28891,9 @@ def test_upload_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.upload_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.upload_conversation] = ( + mock_rpc + ) request = {} client.upload_conversation(request) @@ -29028,9 +29025,9 @@ def test_update_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -29216,9 +29213,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -29402,9 +29399,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -29673,9 +29670,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -31050,9 +31047,9 @@ def test_ingest_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.ingest_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.ingest_conversations] = ( + mock_rpc + ) request = {} client.ingest_conversations(request) @@ -31232,9 +31229,9 @@ def test_export_insights_data_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_insights_data - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_insights_data] = ( + mock_rpc + ) request = {} client.export_insights_data(request) @@ -31414,9 +31411,9 @@ def test_create_issue_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_issue_model] = ( + mock_rpc + ) request = {} client.create_issue_model(request) @@ -31606,9 +31603,9 @@ def test_update_issue_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_issue_model] = ( + mock_rpc + ) request = {} client.update_issue_model(request) @@ -31970,9 +31967,9 @@ def test_list_issue_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_issue_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_issue_models] = ( + mock_rpc + ) request = {} client.list_issue_models(request) @@ -32154,9 +32151,9 @@ def test_delete_issue_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_issue_model] = ( + mock_rpc + ) request = {} client.delete_issue_model(request) @@ -32337,9 +32334,9 @@ def test_deploy_issue_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.deploy_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.deploy_issue_model] = ( + mock_rpc + ) request = {} client.deploy_issue_model(request) @@ -32521,9 +32518,9 @@ def test_undeploy_issue_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.undeploy_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.undeploy_issue_model] = ( + mock_rpc + ) request = {} client.undeploy_issue_model(request) @@ -32705,9 +32702,9 @@ def test_export_issue_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_issue_model] = ( + mock_rpc + ) request = {} client.export_issue_model(request) @@ -32889,9 +32886,9 @@ def test_import_issue_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_issue_model] = ( + mock_rpc + ) request = {} client.import_issue_model(request) @@ -33978,9 +33975,9 @@ def test_create_phrase_matcher_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_phrase_matcher] = ( + mock_rpc + ) request = {} client.create_phrase_matcher(request) @@ -34171,9 +34168,9 @@ def test_get_phrase_matcher_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_phrase_matcher] = ( + mock_rpc + ) request = {} client.get_phrase_matcher(request) @@ -34355,9 +34352,9 @@ def test_list_phrase_matchers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_phrase_matchers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_phrase_matchers] = ( + mock_rpc + ) request = {} client.list_phrase_matchers(request) @@ -34623,9 +34620,9 @@ def test_delete_phrase_matcher_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_phrase_matcher] = ( + mock_rpc + ) request = {} client.delete_phrase_matcher(request) @@ -34803,9 +34800,9 @@ def test_update_phrase_matcher_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_phrase_matcher] = ( + mock_rpc + ) request = {} client.update_phrase_matcher(request) @@ -35536,9 +35533,9 @@ def test_create_analysis_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_analysis_rule] = ( + mock_rpc + ) request = {} client.create_analysis_rule(request) @@ -35727,9 +35724,9 @@ def test_get_analysis_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_analysis_rule] = ( + mock_rpc + ) request = {} client.get_analysis_rule(request) @@ -35911,9 +35908,9 @@ def test_list_analysis_rules_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_analysis_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_analysis_rules] = ( + mock_rpc + ) request = {} client.list_analysis_rules(request) @@ -36176,9 +36173,9 @@ def test_update_analysis_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_analysis_rule] = ( + mock_rpc + ) request = {} client.update_analysis_rule(request) @@ -36362,9 +36359,9 @@ def test_delete_analysis_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_analysis_rule] = ( + mock_rpc + ) request = {} client.delete_analysis_rule(request) @@ -36541,9 +36538,9 @@ def test_get_encryption_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_spec] = ( + mock_rpc + ) request = {} client.get_encryption_spec(request) @@ -38010,9 +38007,9 @@ def test_create_qa_question_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_qa_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_qa_question] = ( + mock_rpc + ) request = {} client.create_qa_question(request) @@ -38389,9 +38386,9 @@ def test_update_qa_question_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_qa_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_qa_question] = ( + mock_rpc + ) request = {} client.update_qa_question(request) @@ -38583,9 +38580,9 @@ def test_delete_qa_question_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_qa_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_qa_question] = ( + mock_rpc + ) request = {} client.delete_qa_question(request) @@ -38760,9 +38757,9 @@ def test_list_qa_questions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_qa_questions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_qa_questions] = ( + mock_rpc + ) request = {} client.list_qa_questions(request) @@ -39026,9 +39023,9 @@ def test_create_qa_scorecard_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_qa_scorecard] = ( + mock_rpc + ) request = {} client.create_qa_scorecard(request) @@ -39221,9 +39218,9 @@ def test_get_qa_scorecard_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_qa_scorecard] = ( + mock_rpc + ) request = {} client.get_qa_scorecard(request) @@ -39405,9 +39402,9 @@ def test_update_qa_scorecard_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_qa_scorecard] = ( + mock_rpc + ) request = {} client.update_qa_scorecard(request) @@ -39599,9 +39596,9 @@ def test_delete_qa_scorecard_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_qa_scorecard] = ( + mock_rpc + ) request = {} client.delete_qa_scorecard(request) @@ -39780,9 +39777,9 @@ def test_list_qa_scorecards_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_qa_scorecards - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_qa_scorecards] = ( + mock_rpc + ) request = {} client.list_qa_scorecards(request) @@ -41338,9 +41335,9 @@ def test_create_feedback_label_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_feedback_label] = ( + mock_rpc + ) request = {} client.create_feedback_label(request) @@ -41537,9 +41534,9 @@ def test_list_feedback_labels_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_feedback_labels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_feedback_labels] = ( + mock_rpc + ) request = {} client.list_feedback_labels(request) @@ -41808,9 +41805,9 @@ def test_get_feedback_label_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_feedback_label] = ( + mock_rpc + ) request = {} client.get_feedback_label(request) @@ -41993,9 +41990,9 @@ def test_update_feedback_label_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_feedback_label] = ( + mock_rpc + ) request = {} client.update_feedback_label(request) @@ -42188,9 +42185,9 @@ def test_delete_feedback_label_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_feedback_label] = ( + mock_rpc + ) request = {} client.delete_feedback_label(request) diff --git a/packages/google-cloud-container/google/cloud/container_v1/__init__.py b/packages/google-cloud-container/google/cloud/container_v1/__init__.py index cdc49adeca87..63f0a6c8510f 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/__init__.py +++ b/packages/google-cloud-container/google/cloud/container_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cluster_manager import ClusterManagerAsyncClient, ClusterManagerClient from .types.cluster_service import ( AcceleratorConfig, diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/async_client.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/async_client.py index 1799fbd6731b..8efb679832ed 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/async_client.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.container_v1 import gapic_version as package_version @@ -124,7 +124,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ClusterManagerAsyncClient: The constructed client. """ - return ClusterManagerClient.from_service_account_info.__func__(ClusterManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ClusterManagerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ClusterManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +143,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ClusterManagerAsyncClient: The constructed client. """ - return ClusterManagerClient.from_service_account_file.__func__(ClusterManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ClusterManagerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ClusterManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/client.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/client.py index ea56e28228c2..73e6493415ea 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/client.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.container_v1 import gapic_version as package_version @@ -80,9 +80,7 @@ class ClusterManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ClusterManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ClusterManagerTransport]] _transport_registry["grpc"] = ClusterManagerGrpcTransport _transport_registry["grpc_asyncio"] = ClusterManagerGrpcAsyncIOTransport _transport_registry["rest"] = ClusterManagerRestTransport @@ -687,11 +685,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ClusterManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ClusterManagerClient._read_environment_variables() + ) self._client_cert_source = ClusterManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -726,8 +722,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ClusterManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/pagers.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/pagers.py index 074a56dd8ab9..4d7c5d169d12 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/pagers.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/base.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/base.py index 0f22636d6a24..16201009e18f 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/base.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.container_v1 import gapic_version as package_version from google.cloud.container_v1.types import cluster_service diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc.py index 87c94912fc87..f25e3046a2b0 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.container_v1.types import cluster_service @@ -962,12 +962,12 @@ def complete_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "complete_node_pool_upgrade" not in self._stubs: - self._stubs[ - "complete_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/CompleteNodePoolUpgrade", - request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["complete_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/CompleteNodePoolUpgrade", + request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["complete_node_pool_upgrade"] @@ -994,12 +994,12 @@ def rollback_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_node_pool_upgrade" not in self._stubs: - self._stubs[ - "rollback_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade", - request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, - response_deserializer=cluster_service.Operation.deserialize, + self._stubs["rollback_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade", + request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, + response_deserializer=cluster_service.Operation.deserialize, + ) ) return self._stubs["rollback_node_pool_upgrade"] @@ -1274,12 +1274,12 @@ def check_autopilot_compatibility( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "check_autopilot_compatibility" not in self._stubs: - self._stubs[ - "check_autopilot_compatibility" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/CheckAutopilotCompatibility", - request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, - response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + self._stubs["check_autopilot_compatibility"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/CheckAutopilotCompatibility", + request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, + response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + ) ) return self._stubs["check_autopilot_compatibility"] @@ -1305,12 +1305,12 @@ def fetch_cluster_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_cluster_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_cluster_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/FetchClusterUpgradeInfo", - request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + self._stubs["fetch_cluster_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/FetchClusterUpgradeInfo", + request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_cluster_upgrade_info"] @@ -1336,12 +1336,12 @@ def fetch_node_pool_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_node_pool_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_node_pool_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/FetchNodePoolUpgradeInfo", - request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + self._stubs["fetch_node_pool_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/FetchNodePoolUpgradeInfo", + request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_node_pool_upgrade_info"] diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py index 1fe9b53e54c2..60d3d78e1644 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.container_v1.types import cluster_service @@ -1005,12 +1005,12 @@ def complete_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "complete_node_pool_upgrade" not in self._stubs: - self._stubs[ - "complete_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/CompleteNodePoolUpgrade", - request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["complete_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/CompleteNodePoolUpgrade", + request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["complete_node_pool_upgrade"] @@ -1038,12 +1038,12 @@ def rollback_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_node_pool_upgrade" not in self._stubs: - self._stubs[ - "rollback_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade", - request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, - response_deserializer=cluster_service.Operation.deserialize, + self._stubs["rollback_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade", + request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, + response_deserializer=cluster_service.Operation.deserialize, + ) ) return self._stubs["rollback_node_pool_upgrade"] @@ -1331,12 +1331,12 @@ def check_autopilot_compatibility( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "check_autopilot_compatibility" not in self._stubs: - self._stubs[ - "check_autopilot_compatibility" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/CheckAutopilotCompatibility", - request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, - response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + self._stubs["check_autopilot_compatibility"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/CheckAutopilotCompatibility", + request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, + response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + ) ) return self._stubs["check_autopilot_compatibility"] @@ -1362,12 +1362,12 @@ def fetch_cluster_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_cluster_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_cluster_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/FetchClusterUpgradeInfo", - request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + self._stubs["fetch_cluster_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/FetchClusterUpgradeInfo", + request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_cluster_upgrade_info"] @@ -1393,12 +1393,12 @@ def fetch_node_pool_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_node_pool_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_node_pool_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/FetchNodePoolUpgradeInfo", - request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + self._stubs["fetch_node_pool_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/FetchNodePoolUpgradeInfo", + request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_node_pool_upgrade_info"] diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest.py index b2d909795de8..d026a2c5cb4e 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.container_v1.types import cluster_service @@ -2189,9 +2189,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClusterManagerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2312,9 +2310,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseCheckAutopilotCompatibility._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseCheckAutopilotCompatibility._get_http_options() request, metadata = self._interceptor.pre_check_autopilot_compatibility( request, metadata @@ -2380,11 +2376,10 @@ def __call__( resp = self._interceptor.post_check_autopilot_compatibility(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_check_autopilot_compatibility_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_check_autopilot_compatibility_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2473,9 +2468,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseCompleteIPRotation._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseCompleteIPRotation._get_http_options() request, metadata = self._interceptor.pre_complete_ip_rotation( request, metadata @@ -2625,9 +2618,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClusterManagerRestTransport._BaseCompleteNodePoolUpgrade._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseCompleteNodePoolUpgrade._get_http_options() request, metadata = self._interceptor.pre_complete_node_pool_upgrade( request, metadata @@ -3362,9 +3353,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseFetchClusterUpgradeInfo._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseFetchClusterUpgradeInfo._get_http_options() request, metadata = self._interceptor.pre_fetch_cluster_upgrade_info( request, metadata @@ -3518,9 +3507,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseFetchNodePoolUpgradeInfo._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseFetchNodePoolUpgradeInfo._get_http_options() request, metadata = self._interceptor.pre_fetch_node_pool_upgrade_info( request, metadata @@ -4277,9 +4264,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseGetServerConfig._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseGetServerConfig._get_http_options() request, metadata = self._interceptor.pre_get_server_config( request, metadata @@ -4875,9 +4860,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseListUsableSubnetworks._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseListUsableSubnetworks._get_http_options() request, metadata = self._interceptor.pre_list_usable_subnetworks( request, metadata @@ -5034,9 +5017,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseRollbackNodePoolUpgrade._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseRollbackNodePoolUpgrade._get_http_options() request, metadata = self._interceptor.pre_rollback_node_pool_upgrade( request, metadata @@ -5193,9 +5174,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetAddonsConfig._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetAddonsConfig._get_http_options() request, metadata = self._interceptor.pre_set_addons_config( request, metadata @@ -5825,9 +5804,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetLoggingService._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetLoggingService._get_http_options() request, metadata = self._interceptor.pre_set_logging_service( request, metadata @@ -5983,9 +5960,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetMaintenancePolicy._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetMaintenancePolicy._get_http_options() request, metadata = self._interceptor.pre_set_maintenance_policy( request, metadata @@ -6296,9 +6271,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetMonitoringService._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetMonitoringService._get_http_options() request, metadata = self._interceptor.pre_set_monitoring_service( request, metadata @@ -6454,9 +6427,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetNetworkPolicy._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetNetworkPolicy._get_http_options() request, metadata = self._interceptor.pre_set_network_policy( request, metadata @@ -6612,9 +6583,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetNodePoolAutoscaling._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetNodePoolAutoscaling._get_http_options() request, metadata = self._interceptor.pre_set_node_pool_autoscaling( request, metadata @@ -6773,9 +6742,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetNodePoolManagement._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetNodePoolManagement._get_http_options() request, metadata = self._interceptor.pre_set_node_pool_management( request, metadata @@ -6930,9 +6897,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetNodePoolSize._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetNodePoolSize._get_http_options() request, metadata = self._interceptor.pre_set_node_pool_size( request, metadata @@ -7089,9 +7054,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseStartIPRotation._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseStartIPRotation._get_http_options() request, metadata = self._interceptor.pre_start_ip_rotation( request, metadata @@ -7670,7 +7633,9 @@ def check_autopilot_compatibility( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CheckAutopilotCompatibility(self._session, self._host, self._interceptor) # type: ignore + return self._CheckAutopilotCompatibility( + self._session, self._host, self._interceptor + ) # type: ignore @property def complete_ip_rotation( @@ -7688,7 +7653,9 @@ def complete_node_pool_upgrade( ) -> Callable[[cluster_service.CompleteNodePoolUpgradeRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CompleteNodePoolUpgrade(self._session, self._host, self._interceptor) # type: ignore + return self._CompleteNodePoolUpgrade( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_cluster( @@ -7731,7 +7698,9 @@ def fetch_cluster_upgrade_info( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchClusterUpgradeInfo(self._session, self._host, self._interceptor) # type: ignore + return self._FetchClusterUpgradeInfo( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_node_pool_upgrade_info( @@ -7742,7 +7711,9 @@ def fetch_node_pool_upgrade_info( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchNodePoolUpgradeInfo(self._session, self._host, self._interceptor) # type: ignore + return self._FetchNodePoolUpgradeInfo( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_cluster( @@ -7837,7 +7808,9 @@ def rollback_node_pool_upgrade( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RollbackNodePoolUpgrade(self._session, self._host, self._interceptor) # type: ignore + return self._RollbackNodePoolUpgrade( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_addons_config( @@ -7925,7 +7898,9 @@ def set_node_pool_autoscaling( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetNodePoolAutoscaling(self._session, self._host, self._interceptor) # type: ignore + return self._SetNodePoolAutoscaling( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_node_pool_management( diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest_base.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest_base.py index c25a5d78dc2d..b4ef70227e0c 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest_base.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.container_v1.types import cluster_service diff --git a/packages/google-cloud-container/google/cloud/container_v1/types/cluster_service.py b/packages/google-cloud-container/google/cloud/container_v1/types/cluster_service.py index 1740c56c0040..ceab4b01dd7b 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/types/cluster_service.py +++ b/packages/google-cloud-container/google/cloud/container_v1/types/cluster_service.py @@ -254,6 +254,7 @@ class PrivateIPv6GoogleAccess(proto.Enum): Enables private IPv6 access to and from Google Services """ + PRIVATE_IPV6_GOOGLE_ACCESS_UNSPECIFIED = 0 PRIVATE_IPV6_GOOGLE_ACCESS_DISABLED = 1 PRIVATE_IPV6_GOOGLE_ACCESS_TO_GOOGLE = 2 @@ -272,6 +273,7 @@ class UpgradeResourceType(proto.Enum): NODE_POOL (2): Node pool """ + UPGRADE_RESOURCE_TYPE_UNSPECIFIED = 0 MASTER = 1 NODE_POOL = 2 @@ -294,6 +296,7 @@ class DatapathProvider(proto.Enum): documentation `__ for more. """ + DATAPATH_PROVIDER_UNSPECIFIED = 0 LEGACY_DATAPATH = 1 ADVANCED_DATAPATH = 2 @@ -318,6 +321,7 @@ class NodePoolUpdateStrategy(proto.Enum): QueuedProvisioning and flex start nodepools scaled up only by enqueueing to the Dynamic Workload Scheduler (DWS). """ + NODE_POOL_UPDATE_STRATEGY_UNSPECIFIED = 0 BLUE_GREEN = 2 SURGE = 3 @@ -335,6 +339,7 @@ class StackType(proto.Enum): IPV4_IPV6 (2): Cluster can use both IPv4 and IPv6 """ + STACK_TYPE_UNSPECIFIED = 0 IPV4 = 1 IPV4_IPV6 = 2 @@ -354,6 +359,7 @@ class IPv6AccessType(proto.Enum): Access type external (all v6 addresses are external IPs) """ + IPV6_ACCESS_TYPE_UNSPECIFIED = 0 INTERNAL = 1 EXTERNAL = 2 @@ -372,6 +378,7 @@ class InTransitEncryptionConfig(proto.Enum): Data in-transit is encrypted using inter-node transparent encryption. """ + IN_TRANSIT_ENCRYPTION_CONFIG_UNSPECIFIED = 0 IN_TRANSIT_ENCRYPTION_DISABLED = 1 IN_TRANSIT_ENCRYPTION_INTER_NODE_TRANSPARENT = 2 @@ -468,6 +475,7 @@ class CgroupMode(proto.Enum): CGROUP_MODE_V2 specifies to use cgroupv2 for the cgroup configuration on the node image. """ + CGROUP_MODE_UNSPECIFIED = 0 CGROUP_MODE_V1 = 1 CGROUP_MODE_V2 = 2 @@ -490,6 +498,7 @@ class TransparentHugepageEnabled(proto.Enum): Transparent hugepage support for anonymous memory is disabled. """ + TRANSPARENT_HUGEPAGE_ENABLED_UNSPECIFIED = 0 TRANSPARENT_HUGEPAGE_ENABLED_ALWAYS = 1 TRANSPARENT_HUGEPAGE_ENABLED_MADVISE = 2 @@ -529,6 +538,7 @@ class TransparentHugepageDefrag(proto.Enum): It means that an application will never enter direct reclaim or compaction. """ + TRANSPARENT_HUGEPAGE_DEFRAG_UNSPECIFIED = 0 TRANSPARENT_HUGEPAGE_DEFRAG_ALWAYS = 1 TRANSPARENT_HUGEPAGE_DEFRAG_DEFER = 2 @@ -766,6 +776,7 @@ class Policy(proto.Enum): For GPU nodes, the image will allow loading any module, whether it is signed or not. """ + POLICY_UNSPECIFIED = 0 ENFORCE_SIGNED_MODULES = 1 DO_NOT_ENFORCE_SIGNED_MODULES = 2 @@ -839,6 +850,7 @@ class OSVersion(proto.Enum): LTSC2022 specifies to use LTSC2022 as the Windows Servercore Base Image. """ + OS_VERSION_UNSPECIFIED = 0 OS_VERSION_LTSC2019 = 1 OS_VERSION_LTSC2022 = 2 @@ -1755,6 +1767,7 @@ class LocalSsdEncryptionMode(proto.Enum): The Local SSDs will not be able to recover data in case of node crash. """ + LOCAL_SSD_ENCRYPTION_MODE_UNSPECIFIED = 0 STANDARD_ENCRYPTION = 1 EPHEMERAL_KEY_ENCRYPTION = 2 @@ -1774,6 +1787,7 @@ class EffectiveCgroupMode(proto.Enum): CGROUP_MODE_V2 means the node pool is configured to use cgroupv2 for the cgroup configuration. """ + EFFECTIVE_CGROUP_MODE_UNSPECIFIED = 0 EFFECTIVE_CGROUP_MODE_V1 = 1 EFFECTIVE_CGROUP_MODE_V2 = 2 @@ -2046,6 +2060,7 @@ class PerformanceMonitoringUnit(proto.Enum): ENHANCED (3): Most documented core/L2 and LLC events. """ + PERFORMANCE_MONITORING_UNIT_UNSPECIFIED = 0 ARCHITECTURAL = 1 STANDARD = 2 @@ -2204,6 +2219,7 @@ class Tier(proto.Enum): Higher bandwidth, actual values based on VM size. """ + TIER_UNSPECIFIED = 0 TIER_1 = 1 @@ -2242,19 +2258,19 @@ class Tier(proto.Enum): number=13, message="PodCIDROverprovisionConfig", ) - additional_node_network_configs: MutableSequence[ - "AdditionalNodeNetworkConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=14, - message="AdditionalNodeNetworkConfig", + additional_node_network_configs: MutableSequence["AdditionalNodeNetworkConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=14, + message="AdditionalNodeNetworkConfig", + ) ) - additional_pod_network_configs: MutableSequence[ - "AdditionalPodNetworkConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=15, - message="AdditionalPodNetworkConfig", + additional_pod_network_configs: MutableSequence["AdditionalPodNetworkConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=15, + message="AdditionalPodNetworkConfig", + ) ) pod_ipv4_range_utilization: float = proto.Field( proto.DOUBLE, @@ -2382,6 +2398,7 @@ class Type(proto.Enum): GVISOR (1): Run sandbox using gvisor. """ + UNSPECIFIED = 0 GVISOR = 1 @@ -2442,6 +2459,7 @@ class Type(proto.Enum): Must specify key value fields for specifying the reservations. """ + UNSPECIFIED = 0 NO_RESERVATION = 1 ANY_RESERVATION = 2 @@ -2509,6 +2527,7 @@ class Operator(proto.Enum): NOT_IN (2): Anti-affinity operator. """ + OPERATOR_UNSPECIFIED = 0 IN = 1 NOT_IN = 2 @@ -2686,6 +2705,7 @@ class HostCapability(proto.Enum): Push represents the capability to push blobs and manifests. """ + HOST_CAPABILITY_UNSPECIFIED = 0 HOST_CAPABILITY_PULL = 1 HOST_CAPABILITY_RESOLVE = 2 @@ -2847,12 +2867,12 @@ class HostConfig(proto.Message): proto.STRING, number=1, ) - hosts: MutableSequence[ - "ContainerdConfig.RegistryHostConfig.HostConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ContainerdConfig.RegistryHostConfig.HostConfig", + hosts: MutableSequence["ContainerdConfig.RegistryHostConfig.HostConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ContainerdConfig.RegistryHostConfig.HostConfig", + ) ) private_registry_access_config: PrivateRegistryAccessConfig = proto.Field( @@ -2903,6 +2923,7 @@ class Effect(proto.Enum): NO_EXECUTE (3): NoExecute """ + EFFECT_UNSPECIFIED = 0 NO_SCHEDULE = 1 PREFER_NO_SCHEDULE = 2 @@ -3484,6 +3505,7 @@ class LoadBalancerType(proto.Enum): LOAD_BALANCER_TYPE_INTERNAL (2): Install internal load balancer for Cloud Run. """ + LOAD_BALANCER_TYPE_UNSPECIFIED = 0 LOAD_BALANCER_TYPE_EXTERNAL = 1 LOAD_BALANCER_TYPE_INTERNAL = 2 @@ -3807,6 +3829,7 @@ class Provider(proto.Enum): CALICO (1): Tigera (Calico Felix). """ + PROVIDER_UNSPECIFIED = 0 CALICO = 1 @@ -3850,6 +3873,7 @@ class EvaluationMode(proto.Enum): singleton policy. This is equivalent to setting the enabled boolean to true. """ + EVALUATION_MODE_UNSPECIFIED = 0 DISABLED = 1 PROJECT_SINGLETON_POLICY_ENFORCE = 2 @@ -4140,12 +4164,12 @@ class IPAllocationPolicy(proto.Message): proto.DOUBLE, number=25, ) - additional_ip_ranges_configs: MutableSequence[ - "AdditionalIPRangesConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29, - message="AdditionalIPRangesConfig", + additional_ip_ranges_configs: MutableSequence["AdditionalIPRangesConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29, + message="AdditionalIPRangesConfig", + ) ) auto_ipam_config: "AutoIpamConfig" = proto.Field( proto.MESSAGE, @@ -4568,6 +4592,7 @@ class Status(proto.Enum): action to restore full functionality. Details can be found in the ``statusMessage`` field. """ + STATUS_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -5053,11 +5078,11 @@ class UserManagedKeysConfig(proto.Message): proto.STRING, number=16, ) - control_plane_disk_encryption_key_versions: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=18, + control_plane_disk_encryption_key_versions: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=18, + ) ) gkeops_etcd_backup_encryption_key: str = proto.Field( proto.STRING, @@ -5089,6 +5114,7 @@ class Mode(proto.Enum): Anonymous authentication is allowed for only health check endpoints. """ + MODE_UNSPECIFIED = 0 ENABLED = 1 LIMITED = 2 @@ -5130,6 +5156,7 @@ class Mode(proto.Enum): Enables Compliance Posture features on the cluster. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -5216,6 +5243,7 @@ class Mode(proto.Enum): Applies the Security Posture off cluster Enterprise level features. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 BASIC = 2 @@ -5238,6 +5266,7 @@ class VulnerabilityMode(proto.Enum): Applies the Security Posture's vulnerability on cluster Enterprise level features. """ + VULNERABILITY_MODE_UNSPECIFIED = 0 VULNERABILITY_DISABLED = 1 VULNERABILITY_BASIC = 2 @@ -6141,6 +6170,7 @@ class Status(proto.Enum): DRAINING status indicates that the subnet is not used for new node pool creation. """ + STATUS_UNSPECIFIED = 0 ACTIVE = 1 DRAINING = 2 @@ -6172,12 +6202,12 @@ class DesiredAdditionalIPRangesConfig(proto.Message): subnetwork's IP ranges """ - additional_ip_ranges_configs: MutableSequence[ - "AdditionalIPRangesConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AdditionalIPRangesConfig", + additional_ip_ranges_configs: MutableSequence["AdditionalIPRangesConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AdditionalIPRangesConfig", + ) ) @@ -6330,6 +6360,7 @@ class Status(proto.Enum): ABORTING (4): The operation is aborting. """ + STATUS_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 @@ -6459,6 +6490,7 @@ class Type(proto.Enum): blocked for other upgrades until the operation finishes. """ + TYPE_UNSPECIFIED = 0 CREATE_CLUSTER = 1 DELETE_CLUSTER = 2 @@ -7535,6 +7567,7 @@ class Action(proto.Enum): provided, basic authentication is enabled, with either a provided password or a generated one. """ + UNKNOWN = 0 SET_PASSWORD = 1 GENERATE_PASSWORD = 2 @@ -8364,6 +8397,7 @@ class Status(proto.Enum): The ERROR state indicates the node pool may be unusable. Details can be found in the ``statusMessage`` field. """ + STATUS_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -8525,6 +8559,7 @@ class Phase(proto.Enum): ROLLBACK_STARTED (7): Rollback has been initiated. """ + PHASE_UNSPECIFIED = 0 UPDATE_STARTED = 1 CREATING_GREEN_POOL = 2 @@ -8592,6 +8627,7 @@ class Type(proto.Enum): availability domain to ensure low communication latency. """ + TYPE_UNSPECIFIED = 0 COMPACT = 1 @@ -8986,6 +9022,7 @@ class Scope(proto.Enum): the cluster, and also exclude all node pool upgrades. Only control plane patches are allowed. """ + NO_UPGRADES = 0 NO_MINOR_UPGRADES = 1 NO_MINOR_OR_NODE_UPGRADES = 2 @@ -9003,6 +9040,7 @@ class EndTimeBehavior(proto.Enum): until the end of the support of the cluster's current version. """ + END_TIME_BEHAVIOR_UNSPECIFIED = 0 UNTIL_END_OF_SUPPORT = 1 @@ -9356,6 +9394,7 @@ class AutoscalingProfile(proto.Enum): Use default (balanced) autoscaling configuration. """ + PROFILE_UNSPECIFIED = 0 OPTIMIZE_UTILIZATION = 1 BALANCED = 2 @@ -9369,6 +9408,7 @@ class AutopilotGeneralProfile(proto.Enum): NO_PERFORMANCE (1): Avoid extra IP consumption. """ + AUTOPILOT_GENERAL_PROFILE_UNSPECIFIED = 0 NO_PERFORMANCE = 1 @@ -9619,6 +9659,7 @@ class LocationPolicy(proto.Enum): ANY policy picks zones that have the highest capacity available. """ + LOCATION_POLICY_UNSPECIFIED = 0 BALANCED = 1 ANY = 2 @@ -9949,6 +9990,7 @@ class GPUSharingStrategy(proto.Enum): GPUs are shared between containers with NVIDIA MPS. """ + GPU_SHARING_STRATEGY_UNSPECIFIED = 0 TIME_SHARING = 1 MPS = 2 @@ -9994,6 +10036,7 @@ class GPUDriverVersion(proto.Enum): LATEST (3): "Latest" GPU driver in COS. """ + GPU_DRIVER_VERSION_UNSPECIFIED = 0 INSTALLATION_DISABLED = 1 DEFAULT = 2 @@ -10035,6 +10078,7 @@ class Mode(proto.Enum): only be enabled if Workload Identity is enabled at the cluster level. """ + MODE_UNSPECIFIED = 0 GCE_METADATA = 1 GKE_METADATA = 2 @@ -10191,6 +10235,7 @@ class Code(proto.Enum): encryption has been destroyed. This is a permanent error. """ + UNKNOWN = 0 GCE_STOCKOUT = 1 GKE_SERVICE_ACCOUNT_DELETED = 2 @@ -10325,6 +10370,7 @@ class Tier(proto.Enum): Higher bandwidth, actual values based on VM size. """ + TIER_UNSPECIFIED = 0 TIER_1 = 1 @@ -10444,6 +10490,7 @@ class Channel(proto.Enum): Gateway API support is enabled, standard CRDs are installed """ + CHANNEL_UNSPECIFIED = 0 CHANNEL_DISABLED = 1 CHANNEL_EXPERIMENTAL = 3 @@ -10696,6 +10743,7 @@ class IssueType(proto.Enum): business logic, there is a potential that they won't work on Autopilot. """ + UNSPECIFIED = 0 INCOMPATIBILITY = 1 ADDITIONAL_CONFIG_REQUIRED = 2 @@ -10796,6 +10844,7 @@ class Channel(proto.Enum): which are known to be stable and reliable in production. """ + UNSPECIFIED = 0 RAPID = 1 REGULAR = 2 @@ -10887,6 +10936,7 @@ class Provider(proto.Enum): KUBE_DNS (3): Use KubeDNS for DNS resolution. """ + PROVIDER_UNSPECIFIED = 0 PLATFORM_DEFAULT = 1 CLOUD_DNS = 2 @@ -10907,6 +10957,7 @@ class DNSScope(proto.Enum): DNS records are accessible from within the VPC. """ + DNS_SCOPE_UNSPECIFIED = 0 CLUSTER_SCOPE = 1 VPC_SCOPE = 2 @@ -11045,6 +11096,7 @@ class State(proto.Enum): etcd level) - this is unrelated to Compute Engine level full disk encryption. """ + UNKNOWN = 0 ENCRYPTED = 1 DECRYPTED = 2 @@ -11075,6 +11127,7 @@ class CurrentState(proto.Enum): De-crypting Secrets to plain text in etcd encountered an error. """ + CURRENT_STATE_UNSPECIFIED = 0 CURRENT_STATE_ENCRYPTED = 7 CURRENT_STATE_DECRYPTED = 2 @@ -11251,6 +11304,7 @@ class Status(proto.Enum): IN_USE_MANAGED_POD denotes this range was created by GKE and is claimed for pods. It cannot be used for other clusters. """ + UNKNOWN = 0 UNUSED = 1 IN_USE_SERVICE = 2 @@ -11310,12 +11364,12 @@ class UsableSubnetwork(proto.Message): proto.STRING, number=3, ) - secondary_ip_ranges: MutableSequence[ - "UsableSubnetworkSecondaryRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="UsableSubnetworkSecondaryRange", + secondary_ip_ranges: MutableSequence["UsableSubnetworkSecondaryRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="UsableSubnetworkSecondaryRange", + ) ) status_message: str = proto.Field( proto.STRING, @@ -11488,6 +11542,7 @@ class GPUDirectStrategy(proto.Enum): GPUDirect-RDMA on A3 Ultra, and A4 machine types """ + GPU_DIRECT_STRATEGY_UNSPECIFIED = 0 RDMA = 2 @@ -11523,6 +11578,7 @@ class EventType(proto.Enum): UPGRADE_INFO_EVENT (4): Corresponds with UpgradeInfoEvent. """ + EVENT_TYPE_UNSPECIFIED = 0 UPGRADE_AVAILABLE_EVENT = 1 UPGRADE_EVENT = 2 @@ -11572,12 +11628,12 @@ class Filter(proto.Message): Event types to allowlist. """ - event_type: MutableSequence[ - "NotificationConfig.EventType" - ] = proto.RepeatedField( - proto.ENUM, - number=1, - enum="NotificationConfig.EventType", + event_type: MutableSequence["NotificationConfig.EventType"] = ( + proto.RepeatedField( + proto.ENUM, + number=1, + enum="NotificationConfig.EventType", + ) ) pubsub: PubSub = proto.Field( @@ -11614,6 +11670,7 @@ class ConfidentialInstanceType(proto.Enum): TDX (3): Intel Trust Domain eXtension. """ + CONFIDENTIAL_INSTANCE_TYPE_UNSPECIFIED = 0 SEV = 1 SEV_SNP = 2 @@ -11741,6 +11798,7 @@ class State(proto.Enum): CANCELED (6): CANCELED indicates the upgrade has canceled. """ + STATE_UNSPECIFIED = 0 STARTED = 3 SUCCEEDED = 4 @@ -11769,6 +11827,7 @@ class EventType(proto.Enum): DISRUPTION_EVENT indicates the event is about the disruption. """ + EVENT_TYPE_UNSPECIFIED = 0 END_OF_SUPPORT = 1 COS_MILESTONE_VERSION_UPDATE = 2 @@ -11880,6 +11939,7 @@ class DisruptionType(proto.Enum): POD_PDB_VIOLATION indicates that there are force pod evictions during node drain which violate the PDB. """ + DISRUPTION_TYPE_UNSPECIFIED = 0 POD_NOT_ENOUGH_PDB = 1 POD_PDB_VIOLATION = 2 @@ -12196,6 +12256,7 @@ class Component(proto.Enum): KCP_HPA (9): horizontal pod autoscaler decision logs """ + COMPONENT_UNSPECIFIED = 0 SYSTEM_COMPONENTS = 1 WORKLOADS = 2 @@ -12292,6 +12353,7 @@ class RelayMode(proto.Enum): EXTERNAL_LB (4): exposed via external load balancer """ + RELAY_MODE_UNSPECIFIED = 0 DISABLED = 1 INTERNAL_VPC_LB = 3 @@ -12364,6 +12426,7 @@ class Variant(proto.Enum): MAX_THROUGHPUT (2): maximum logging throughput variant. """ + VARIANT_UNSPECIFIED = 0 DEFAULT = 1 MAX_THROUGHPUT = 2 @@ -12420,6 +12483,7 @@ class Component(proto.Enum): JOBSET (16): JobSet """ + COMPONENT_UNSPECIFIED = 0 SYSTEM_COMPONENTS = 1 APISERVER = 3 @@ -12486,6 +12550,7 @@ class Scope(proto.Enum): NONE (2): Disable Auto-Monitoring. """ + SCOPE_UNSPECIFIED = 0 ALL = 1 NONE = 2 @@ -12527,6 +12592,7 @@ class HPAProfile(proto.Enum): faster metrics collection for workload autoscaling. """ + HPA_PROFILE_UNSPECIFIED = 0 NONE = 1 PERFORMANCE = 2 @@ -12570,6 +12636,7 @@ class MembershipType(proto.Enum): The membership supports only lightweight compatible features. """ + MEMBERSHIP_TYPE_UNSPECIFIED = 0 LIGHTWEIGHT = 1 @@ -12877,6 +12944,7 @@ class ClusterTier(proto.Enum): ENTERPRISE indicates a GKE Enterprise cluster. """ + _pb_options = {"deprecated": True} CLUSTER_TIER_UNSPECIFIED = 0 STANDARD = 1 @@ -13011,6 +13079,7 @@ class Mode(proto.Enum): CONTAINER_IMAGE_CACHE is for using the secondary boot disk as a container image cache. """ + MODE_UNSPECIFIED = 0 CONTAINER_IMAGE_CACHE = 1 @@ -13108,6 +13177,7 @@ class AutoUpgradeStatus(proto.Enum): UPGRADE_PAUSED (5): UPGRADE_PAUSED indicates the upgrade is paused. """ + UNKNOWN = 0 ACTIVE = 1 MINOR_UPGRADE_PAUSED = 4 @@ -13142,6 +13212,7 @@ class AutoUpgradePausedReason(proto.Enum): SYSTEM_CONFIG indicates the cluster upgrade is paused by system config. """ + AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED = 0 MAINTENANCE_WINDOW = 1 MAINTENANCE_EXCLUSION_NO_UPGRADES = 5 @@ -13228,6 +13299,7 @@ class State(proto.Enum): RUNNING (4): Upgrade is running. """ + UNKNOWN = 0 FAILED = 1 SUCCEEDED = 2 @@ -13245,6 +13317,7 @@ class StartType(proto.Enum): MANUAL (2): Upgrade started manually. """ + START_TYPE_UNSPECIFIED = 0 AUTOMATIC = 1 MANUAL = 2 @@ -13356,6 +13429,7 @@ class AutoUpgradeStatus(proto.Enum): UPGRADE_PAUSED (3): UPGRADE_PAUSED indicates the upgrade is paused. """ + UNKNOWN = 0 ACTIVE = 1 MINOR_UPGRADE_PAUSED = 2 @@ -13383,6 +13457,7 @@ class AutoUpgradePausedReason(proto.Enum): SYSTEM_CONFIG indicates the cluster upgrade is paused by system config. """ + AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED = 0 MAINTENANCE_WINDOW = 1 MAINTENANCE_EXCLUSION_NO_UPGRADES = 2 @@ -13450,6 +13525,7 @@ class PatchMode(proto.Enum): build in the channel should be used as the upgrade target for the version. """ + PATCH_MODE_UNSPECIFIED = 0 ACCELERATED = 1 @@ -13490,6 +13566,7 @@ class NetworkTier(proto.Enum): NETWORK_TIER_STANDARD (3): Standard network tier. """ + NETWORK_TIER_UNSPECIFIED = 0 NETWORK_TIER_DEFAULT = 1 NETWORK_TIER_PREMIUM = 2 @@ -13530,6 +13607,7 @@ class Scope(proto.Enum): the Managed OpenTelemetry pipeline for collection and instrumentation components. """ + SCOPE_UNSPECIFIED = 0 NONE = 1 COLLECTION_AND_INSTRUMENTATION_COMPONENTS = 2 diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/__init__.py b/packages/google-cloud-container/google/cloud/container_v1beta1/__init__.py index ff75a09f8565..fdd94e441867 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/__init__.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cluster_manager import ClusterManagerAsyncClient, ClusterManagerClient from .types.cluster_service import ( AcceleratorConfig, diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/async_client.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/async_client.py index 2edc2d21461d..eb0095a767bd 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/async_client.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.container_v1beta1 import gapic_version as package_version @@ -124,7 +124,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ClusterManagerAsyncClient: The constructed client. """ - return ClusterManagerClient.from_service_account_info.__func__(ClusterManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ClusterManagerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ClusterManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +143,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ClusterManagerAsyncClient: The constructed client. """ - return ClusterManagerClient.from_service_account_file.__func__(ClusterManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ClusterManagerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ClusterManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/client.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/client.py index 3d702eba2f35..366430f47bfe 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/client.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.container_v1beta1 import gapic_version as package_version @@ -79,9 +79,7 @@ class ClusterManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ClusterManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ClusterManagerTransport]] _transport_registry["grpc"] = ClusterManagerGrpcTransport _transport_registry["grpc_asyncio"] = ClusterManagerGrpcAsyncIOTransport @@ -685,11 +683,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ClusterManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ClusterManagerClient._read_environment_variables() + ) self._client_cert_source = ClusterManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -724,8 +720,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ClusterManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/pagers.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/pagers.py index 993adf3ad4ca..c68dc9663e87 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/pagers.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/base.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/base.py index 98cf3ab9956f..2ed6c696ecd1 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/base.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.container_v1beta1 import gapic_version as package_version from google.cloud.container_v1beta1.types import cluster_service diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py index 3d0f8e428fc5..a238762b9918 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.container_v1beta1.types import cluster_service @@ -962,12 +962,12 @@ def complete_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "complete_node_pool_upgrade" not in self._stubs: - self._stubs[ - "complete_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/CompleteNodePoolUpgrade", - request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["complete_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/CompleteNodePoolUpgrade", + request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["complete_node_pool_upgrade"] @@ -994,12 +994,12 @@ def rollback_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_node_pool_upgrade" not in self._stubs: - self._stubs[ - "rollback_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/RollbackNodePoolUpgrade", - request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, - response_deserializer=cluster_service.Operation.deserialize, + self._stubs["rollback_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/RollbackNodePoolUpgrade", + request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, + response_deserializer=cluster_service.Operation.deserialize, + ) ) return self._stubs["rollback_node_pool_upgrade"] @@ -1274,12 +1274,12 @@ def check_autopilot_compatibility( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "check_autopilot_compatibility" not in self._stubs: - self._stubs[ - "check_autopilot_compatibility" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/CheckAutopilotCompatibility", - request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, - response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + self._stubs["check_autopilot_compatibility"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/CheckAutopilotCompatibility", + request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, + response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + ) ) return self._stubs["check_autopilot_compatibility"] @@ -1334,12 +1334,12 @@ def fetch_cluster_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_cluster_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_cluster_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/FetchClusterUpgradeInfo", - request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + self._stubs["fetch_cluster_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/FetchClusterUpgradeInfo", + request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_cluster_upgrade_info"] @@ -1365,12 +1365,12 @@ def fetch_node_pool_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_node_pool_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_node_pool_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/FetchNodePoolUpgradeInfo", - request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + self._stubs["fetch_node_pool_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/FetchNodePoolUpgradeInfo", + request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_node_pool_upgrade_info"] @@ -1397,12 +1397,12 @@ def complete_control_plane_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "complete_control_plane_upgrade" not in self._stubs: - self._stubs[ - "complete_control_plane_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/CompleteControlPlaneUpgrade", - request_serializer=cluster_service.CompleteControlPlaneUpgradeRequest.serialize, - response_deserializer=cluster_service.Operation.deserialize, + self._stubs["complete_control_plane_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/CompleteControlPlaneUpgrade", + request_serializer=cluster_service.CompleteControlPlaneUpgradeRequest.serialize, + response_deserializer=cluster_service.Operation.deserialize, + ) ) return self._stubs["complete_control_plane_upgrade"] diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py index 4aa8d3a09b74..5b95c1723c06 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.container_v1beta1.types import cluster_service @@ -1005,12 +1005,12 @@ def complete_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "complete_node_pool_upgrade" not in self._stubs: - self._stubs[ - "complete_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/CompleteNodePoolUpgrade", - request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["complete_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/CompleteNodePoolUpgrade", + request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["complete_node_pool_upgrade"] @@ -1038,12 +1038,12 @@ def rollback_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_node_pool_upgrade" not in self._stubs: - self._stubs[ - "rollback_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/RollbackNodePoolUpgrade", - request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, - response_deserializer=cluster_service.Operation.deserialize, + self._stubs["rollback_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/RollbackNodePoolUpgrade", + request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, + response_deserializer=cluster_service.Operation.deserialize, + ) ) return self._stubs["rollback_node_pool_upgrade"] @@ -1331,12 +1331,12 @@ def check_autopilot_compatibility( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "check_autopilot_compatibility" not in self._stubs: - self._stubs[ - "check_autopilot_compatibility" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/CheckAutopilotCompatibility", - request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, - response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + self._stubs["check_autopilot_compatibility"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/CheckAutopilotCompatibility", + request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, + response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + ) ) return self._stubs["check_autopilot_compatibility"] @@ -1392,12 +1392,12 @@ def fetch_cluster_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_cluster_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_cluster_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/FetchClusterUpgradeInfo", - request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + self._stubs["fetch_cluster_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/FetchClusterUpgradeInfo", + request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_cluster_upgrade_info"] @@ -1423,12 +1423,12 @@ def fetch_node_pool_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_node_pool_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_node_pool_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/FetchNodePoolUpgradeInfo", - request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + self._stubs["fetch_node_pool_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/FetchNodePoolUpgradeInfo", + request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_node_pool_upgrade_info"] @@ -1456,12 +1456,12 @@ def complete_control_plane_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "complete_control_plane_upgrade" not in self._stubs: - self._stubs[ - "complete_control_plane_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/CompleteControlPlaneUpgrade", - request_serializer=cluster_service.CompleteControlPlaneUpgradeRequest.serialize, - response_deserializer=cluster_service.Operation.deserialize, + self._stubs["complete_control_plane_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/CompleteControlPlaneUpgrade", + request_serializer=cluster_service.CompleteControlPlaneUpgradeRequest.serialize, + response_deserializer=cluster_service.Operation.deserialize, + ) ) return self._stubs["complete_control_plane_upgrade"] diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/types/cluster_service.py b/packages/google-cloud-container/google/cloud/container_v1beta1/types/cluster_service.py index 042d89a8a0e1..0afef074aa6c 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/types/cluster_service.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/types/cluster_service.py @@ -277,6 +277,7 @@ class PrivateIPv6GoogleAccess(proto.Enum): Enables private IPv6 access to and from Google Services """ + PRIVATE_IPV6_GOOGLE_ACCESS_UNSPECIFIED = 0 PRIVATE_IPV6_GOOGLE_ACCESS_DISABLED = 1 PRIVATE_IPV6_GOOGLE_ACCESS_TO_GOOGLE = 2 @@ -295,6 +296,7 @@ class UpgradeResourceType(proto.Enum): NODE_POOL (2): Node pool """ + UPGRADE_RESOURCE_TYPE_UNSPECIFIED = 0 MASTER = 1 NODE_POOL = 2 @@ -319,6 +321,7 @@ class NodePoolUpdateStrategy(proto.Enum): QueuedProvisioning and flex start nodepools scaled up only by enqueueing to the Dynamic Workload Scheduler (DWS). """ + NODE_POOL_UPDATE_STRATEGY_UNSPECIFIED = 0 BLUE_GREEN = 2 SURGE = 3 @@ -342,6 +345,7 @@ class DatapathProvider(proto.Enum): documentation `__ for more. """ + DATAPATH_PROVIDER_UNSPECIFIED = 0 LEGACY_DATAPATH = 1 ADVANCED_DATAPATH = 2 @@ -359,6 +363,7 @@ class StackType(proto.Enum): The value used if the cluster is a dual stack cluster """ + STACK_TYPE_UNSPECIFIED = 0 IPV4 = 1 IPV4_IPV6 = 2 @@ -377,6 +382,7 @@ class InTransitEncryptionConfig(proto.Enum): Data in-transit is encrypted using inter-node transparent encryption. """ + IN_TRANSIT_ENCRYPTION_CONFIG_UNSPECIFIED = 0 IN_TRANSIT_ENCRYPTION_DISABLED = 1 IN_TRANSIT_ENCRYPTION_INTER_NODE_TRANSPARENT = 2 @@ -497,6 +503,7 @@ class CgroupMode(proto.Enum): CGROUP_MODE_V2 specifies to use cgroupv2 for the cgroup configuration on the node image. """ + CGROUP_MODE_UNSPECIFIED = 0 CGROUP_MODE_V1 = 1 CGROUP_MODE_V2 = 2 @@ -519,6 +526,7 @@ class TransparentHugepageEnabled(proto.Enum): Transparent hugepage support for anonymous memory is disabled. """ + TRANSPARENT_HUGEPAGE_ENABLED_UNSPECIFIED = 0 TRANSPARENT_HUGEPAGE_ENABLED_ALWAYS = 1 TRANSPARENT_HUGEPAGE_ENABLED_MADVISE = 2 @@ -558,6 +566,7 @@ class TransparentHugepageDefrag(proto.Enum): It means that an application will never enter direct reclaim or compaction. """ + TRANSPARENT_HUGEPAGE_DEFRAG_UNSPECIFIED = 0 TRANSPARENT_HUGEPAGE_DEFRAG_ALWAYS = 1 TRANSPARENT_HUGEPAGE_DEFRAG_DEFER = 2 @@ -795,6 +804,7 @@ class Policy(proto.Enum): For GPU nodes, the image will allow loading any module, whether it is signed or not. """ + POLICY_UNSPECIFIED = 0 ENFORCE_SIGNED_MODULES = 1 DO_NOT_ENFORCE_SIGNED_MODULES = 2 @@ -868,6 +878,7 @@ class OSVersion(proto.Enum): LTSC2022 specifies to use LTSC2022 as the Windows Servercore Base Image. """ + OS_VERSION_UNSPECIFIED = 0 OS_VERSION_LTSC2019 = 1 OS_VERSION_LTSC2022 = 2 @@ -1784,6 +1795,7 @@ class LocalSsdEncryptionMode(proto.Enum): The Local SSDs will not be able to recover data in case of node crash. """ + LOCAL_SSD_ENCRYPTION_MODE_UNSPECIFIED = 0 STANDARD_ENCRYPTION = 1 EPHEMERAL_KEY_ENCRYPTION = 2 @@ -1803,6 +1815,7 @@ class EffectiveCgroupMode(proto.Enum): CGROUP_MODE_V2 means the node pool is configured to use cgroupv2 for the cgroup configuration. """ + EFFECTIVE_CGROUP_MODE_UNSPECIFIED = 0 EFFECTIVE_CGROUP_MODE_V1 = 1 EFFECTIVE_CGROUP_MODE_V2 = 2 @@ -2085,6 +2098,7 @@ class PerformanceMonitoringUnit(proto.Enum): ENHANCED (3): Most documented core/L2 and LLC events. """ + PERFORMANCE_MONITORING_UNIT_UNSPECIFIED = 0 ARCHITECTURAL = 1 STANDARD = 2 @@ -2256,6 +2270,7 @@ class Tier(proto.Enum): Higher bandwidth, actual values based on VM size. """ + TIER_UNSPECIFIED = 0 TIER_1 = 1 @@ -2300,19 +2315,19 @@ class Tier(proto.Enum): number=13, message="PodCIDROverprovisionConfig", ) - additional_node_network_configs: MutableSequence[ - "AdditionalNodeNetworkConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=14, - message="AdditionalNodeNetworkConfig", + additional_node_network_configs: MutableSequence["AdditionalNodeNetworkConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=14, + message="AdditionalNodeNetworkConfig", + ) ) - additional_pod_network_configs: MutableSequence[ - "AdditionalPodNetworkConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=15, - message="AdditionalPodNetworkConfig", + additional_pod_network_configs: MutableSequence["AdditionalPodNetworkConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=15, + message="AdditionalPodNetworkConfig", + ) ) pod_ipv4_range_utilization: float = proto.Field( proto.DOUBLE, @@ -2447,6 +2462,7 @@ class Type(proto.Enum): GVISOR (1): Run sandbox using gvisor. """ + UNSPECIFIED = 0 GVISOR = 1 @@ -2621,6 +2637,7 @@ class Type(proto.Enum): Must specify key value fields for specifying the reservations. """ + UNSPECIFIED = 0 NO_RESERVATION = 1 ANY_RESERVATION = 2 @@ -2688,6 +2705,7 @@ class Operator(proto.Enum): NOT_IN (2): Anti-affinity operator. """ + OPERATOR_UNSPECIFIED = 0 IN = 1 NOT_IN = 2 @@ -2865,6 +2883,7 @@ class HostCapability(proto.Enum): Push represents the capability to push blobs and manifests. """ + HOST_CAPABILITY_UNSPECIFIED = 0 HOST_CAPABILITY_PULL = 1 HOST_CAPABILITY_RESOLVE = 2 @@ -3026,12 +3045,12 @@ class HostConfig(proto.Message): proto.STRING, number=1, ) - hosts: MutableSequence[ - "ContainerdConfig.RegistryHostConfig.HostConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ContainerdConfig.RegistryHostConfig.HostConfig", + hosts: MutableSequence["ContainerdConfig.RegistryHostConfig.HostConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ContainerdConfig.RegistryHostConfig.HostConfig", + ) ) private_registry_access_config: PrivateRegistryAccessConfig = proto.Field( @@ -3094,6 +3113,7 @@ class MaintenanceInterval(proto.Enum): AS_NEEDED. Security updates will still be applied as soon as they are available. """ + MAINTENANCE_INTERVAL_UNSPECIFIED = 0 AS_NEEDED = 1 PERIODIC = 2 @@ -3193,6 +3213,7 @@ class Effect(proto.Enum): NO_EXECUTE (3): NoExecute """ + EFFECT_UNSPECIFIED = 0 NO_SCHEDULE = 1 PREFER_NO_SCHEDULE = 2 @@ -3980,6 +4001,7 @@ class IstioAuthMode(proto.Enum): AUTH_MUTUAL_TLS (1): auth mutual TLS enabled """ + AUTH_NONE = 0 AUTH_MUTUAL_TLS = 1 @@ -4018,6 +4040,7 @@ class LoadBalancerType(proto.Enum): LOAD_BALANCER_TYPE_INTERNAL (2): Install internal load balancer for Cloud Run. """ + LOAD_BALANCER_TYPE_UNSPECIFIED = 0 LOAD_BALANCER_TYPE_EXTERNAL = 1 LOAD_BALANCER_TYPE_INTERNAL = 2 @@ -4144,6 +4167,7 @@ class Provider(proto.Enum): CALICO (1): Tigera (Calico Felix). """ + PROVIDER_UNSPECIFIED = 0 CALICO = 1 @@ -4377,6 +4401,7 @@ class StackType(proto.Enum): The value used if the cluster is a dual stack cluster """ + STACK_TYPE_UNSPECIFIED = 0 IPV4 = 1 IPV4_IPV6 = 2 @@ -4395,6 +4420,7 @@ class IPv6AccessType(proto.Enum): Access type external (all v6 addresses are external IPs) """ + IPV6_ACCESS_TYPE_UNSPECIFIED = 0 INTERNAL = 1 EXTERNAL = 2 @@ -4487,12 +4513,12 @@ class IPv6AccessType(proto.Enum): proto.DOUBLE, number=25, ) - additional_ip_ranges_configs: MutableSequence[ - "AdditionalIPRangesConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29, - message="AdditionalIPRangesConfig", + additional_ip_ranges_configs: MutableSequence["AdditionalIPRangesConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29, + message="AdditionalIPRangesConfig", + ) ) auto_ipam_config: "AutoIpamConfig" = proto.Field( proto.MESSAGE, @@ -4546,6 +4572,7 @@ class EvaluationMode(proto.Enum): admission requests with Binary Authorization using the project's singleton policy. """ + EVALUATION_MODE_UNSPECIFIED = 0 DISABLED = 1 PROJECT_SINGLETON_POLICY_ENFORCE = 2 @@ -4651,6 +4678,7 @@ class Type(proto.Enum): Only system components are monitored and logged. """ + UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -5125,6 +5153,7 @@ class Status(proto.Enum): action to restore full functionality. Details can be found in the ``statusMessage`` field. """ + STATUS_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -5668,11 +5697,11 @@ class UserManagedKeysConfig(proto.Message): proto.STRING, number=16, ) - control_plane_disk_encryption_key_versions: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=18, + control_plane_disk_encryption_key_versions: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=18, + ) ) gkeops_etcd_backup_encryption_key: str = proto.Field( proto.STRING, @@ -5704,6 +5733,7 @@ class Mode(proto.Enum): Anonymous authentication is allowed for only health check endpoints. """ + MODE_UNSPECIFIED = 0 ENABLED = 1 LIMITED = 2 @@ -5745,6 +5775,7 @@ class Mode(proto.Enum): Enables Compliance Posture features on the cluster. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -5832,6 +5863,7 @@ class Mode(proto.Enum): with the Pod Security Standard Restricted policy. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 BASIC = 4 @@ -5880,6 +5912,7 @@ class WorkloadVulnerabilityMode(proto.Enum): Applies basic vulnerability scanning settings for cluster workloads. """ + WORKLOAD_VULNERABILITY_MODE_UNSPECIFIED = 0 DISABLED = 1 BASIC = 2 @@ -5935,6 +5968,7 @@ class Mode(proto.Enum): Applies the Security Posture off cluster Enterprise level features. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 BASIC = 2 @@ -5957,6 +5991,7 @@ class VulnerabilityMode(proto.Enum): Applies the Security Posture's vulnerability on cluster Enterprise level features. """ + VULNERABILITY_MODE_UNSPECIFIED = 0 VULNERABILITY_DISABLED = 1 VULNERABILITY_BASIC = 2 @@ -6971,6 +7006,7 @@ class Status(proto.Enum): DRAINING status indicates that the subnet is not used for new node pool creation. """ + STATUS_UNSPECIFIED = 0 ACTIVE = 1 DRAINING = 2 @@ -7002,12 +7038,12 @@ class DesiredAdditionalIPRangesConfig(proto.Message): subnetwork's IP ranges """ - additional_ip_ranges_configs: MutableSequence[ - "AdditionalIPRangesConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AdditionalIPRangesConfig", + additional_ip_ranges_configs: MutableSequence["AdditionalIPRangesConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AdditionalIPRangesConfig", + ) ) @@ -7160,6 +7196,7 @@ class Status(proto.Enum): ABORTING (4): The operation is aborting. """ + STATUS_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 @@ -7287,6 +7324,7 @@ class Type(proto.Enum): blocked for other upgrades until the operation finishes. """ + TYPE_UNSPECIFIED = 0 CREATE_CLUSTER = 1 DELETE_CLUSTER = 2 @@ -8357,6 +8395,7 @@ class Action(proto.Enum): provided, basic authentication is enabled, with either a provided password or a generated one. """ + UNKNOWN = 0 SET_PASSWORD = 1 GENERATE_PASSWORD = 2 @@ -9293,6 +9332,7 @@ class Status(proto.Enum): The ERROR state indicates the node pool may be unusable. Details can be found in the ``statusMessage`` field. """ + STATUS_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -9457,6 +9497,7 @@ class Phase(proto.Enum): ROLLBACK_STARTED (7): Rollback has been initiated. """ + PHASE_UNSPECIFIED = 0 UPDATE_STARTED = 1 CREATING_GREEN_POOL = 2 @@ -9525,6 +9566,7 @@ class Type(proto.Enum): availability domain to ensure low communication latency. """ + TYPE_UNSPECIFIED = 0 COMPACT = 1 @@ -9884,6 +9926,7 @@ class Scope(proto.Enum): the cluster, and also exclude all node pool upgrades. Only control plane patches are allowed. """ + NO_UPGRADES = 0 NO_MINOR_UPGRADES = 1 NO_MINOR_OR_NODE_UPGRADES = 2 @@ -9901,6 +9944,7 @@ class EndTimeBehavior(proto.Enum): until the end of the support of the cluster's current version. """ + END_TIME_BEHAVIOR_UNSPECIFIED = 0 UNTIL_END_OF_SUPPORT = 1 @@ -10251,6 +10295,7 @@ class AutoscalingProfile(proto.Enum): Use default (balanced) autoscaling configuration. """ + PROFILE_UNSPECIFIED = 0 OPTIMIZE_UTILIZATION = 1 BALANCED = 2 @@ -10264,6 +10309,7 @@ class AutopilotGeneralProfile(proto.Enum): NO_PERFORMANCE (1): Avoid extra IP consumption. """ + AUTOPILOT_GENERAL_PROFILE_UNSPECIFIED = 0 NO_PERFORMANCE = 1 @@ -10531,6 +10577,7 @@ class LocationPolicy(proto.Enum): ANY policy picks zones that have the highest capacity available. """ + LOCATION_POLICY_UNSPECIFIED = 0 BALANCED = 1 ANY = 2 @@ -10868,6 +10915,7 @@ class GPUSharingStrategy(proto.Enum): GPUs are shared between containers with NVIDIA MPS. """ + GPU_SHARING_STRATEGY_UNSPECIFIED = 0 TIME_SHARING = 1 MPS = 2 @@ -10913,6 +10961,7 @@ class GPUDriverVersion(proto.Enum): LATEST (3): "Latest" GPU driver in COS. """ + GPU_DRIVER_VERSION_UNSPECIFIED = 0 INSTALLATION_DISABLED = 1 DEFAULT = 2 @@ -10969,6 +11018,7 @@ class Scope(proto.Enum): NONE (2): Disable Auto-Monitoring. """ + SCOPE_UNSPECIFIED = 0 ALL = 1 NONE = 2 @@ -11024,6 +11074,7 @@ class NodeMetadata(proto.Enum): only be enabled if Workload Identity is enabled at the cluster level. """ + UNSPECIFIED = 0 SECURE = 1 EXPOSE = 2 @@ -11047,6 +11098,7 @@ class Mode(proto.Enum): only be enabled if Workload Identity is enabled at the cluster level. """ + MODE_UNSPECIFIED = 0 GCE_METADATA = 1 GKE_METADATA = 2 @@ -11239,6 +11291,7 @@ class LocationType(proto.Enum): A GKE Location where Regional clusters can be created. """ + LOCATION_TYPE_UNSPECIFIED = 0 ZONE = 1 REGION = 2 @@ -11303,6 +11356,7 @@ class Code(proto.Enum): encryption has been destroyed. This is a permanent error. """ + _pb_options = {"deprecated": True} UNKNOWN = 0 GCE_STOCKOUT = 1 @@ -11437,6 +11491,7 @@ class Tier(proto.Enum): Higher bandwidth, actual values based on VM size. """ + TIER_UNSPECIFIED = 0 TIER_1 = 1 @@ -11556,6 +11611,7 @@ class Channel(proto.Enum): Gateway API support is enabled, standard CRDs are installed """ + CHANNEL_UNSPECIFIED = 0 CHANNEL_DISABLED = 1 CHANNEL_EXPERIMENTAL = 3 @@ -11696,6 +11752,7 @@ class Status(proto.Enum): IN_USE_MANAGED_POD denotes this range was created by GKE and is claimed for pods. It cannot be used for other clusters. """ + UNKNOWN = 0 UNUSED = 1 IN_USE_SERVICE = 2 @@ -11755,12 +11812,12 @@ class UsableSubnetwork(proto.Message): proto.STRING, number=3, ) - secondary_ip_ranges: MutableSequence[ - "UsableSubnetworkSecondaryRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="UsableSubnetworkSecondaryRange", + secondary_ip_ranges: MutableSequence["UsableSubnetworkSecondaryRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="UsableSubnetworkSecondaryRange", + ) ) status_message: str = proto.Field( proto.STRING, @@ -11863,6 +11920,7 @@ class Provider(proto.Enum): KUBE_DNS (3): Use KubeDNS for DNS resolution. """ + PROVIDER_UNSPECIFIED = 0 PLATFORM_DEFAULT = 1 CLOUD_DNS = 2 @@ -11883,6 +11941,7 @@ class DNSScope(proto.Enum): DNS records are accessible from within the VPC. """ + DNS_SCOPE_UNSPECIFIED = 0 CLUSTER_SCOPE = 1 VPC_SCOPE = 2 @@ -12066,6 +12125,7 @@ class State(proto.Enum): etcd level) - this is unrelated to Compute Engine level full disk encryption. """ + UNKNOWN = 0 ENCRYPTED = 1 DECRYPTED = 2 @@ -12096,6 +12156,7 @@ class CurrentState(proto.Enum): De-crypting Secrets to plain text in etcd encountered an error. """ + CURRENT_STATE_UNSPECIFIED = 0 CURRENT_STATE_ENCRYPTED = 7 CURRENT_STATE_DECRYPTED = 2 @@ -12292,6 +12353,7 @@ class GPUDirectStrategy(proto.Enum): GPUDirect-RDMA on A3 Ultra, and A4 machine types """ + GPU_DIRECT_STRATEGY_UNSPECIFIED = 0 RDMA = 2 @@ -12528,6 +12590,7 @@ class IssueType(proto.Enum): business logic, there is a potential that they won't work on Autopilot. """ + UNSPECIFIED = 0 INCOMPATIBILITY = 1 ADDITIONAL_CONFIG_REQUIRED = 2 @@ -12628,6 +12691,7 @@ class Channel(proto.Enum): which are known to be stable and reliable in production. """ + UNSPECIFIED = 0 RAPID = 1 REGULAR = 2 @@ -12770,6 +12834,7 @@ class State(proto.Enum): completed. Old node pools will continue being deleted in the background. """ + STATE_UNSPECIFIED = 0 DONE = 5 @@ -12903,6 +12968,7 @@ class EventType(proto.Enum): UPGRADE_INFO_EVENT (4): Corresponds with UpgradeInfoEvent. """ + EVENT_TYPE_UNSPECIFIED = 0 UPGRADE_AVAILABLE_EVENT = 1 UPGRADE_EVENT = 2 @@ -12952,12 +13018,12 @@ class Filter(proto.Message): Event types to allowlist. """ - event_type: MutableSequence[ - "NotificationConfig.EventType" - ] = proto.RepeatedField( - proto.ENUM, - number=1, - enum="NotificationConfig.EventType", + event_type: MutableSequence["NotificationConfig.EventType"] = ( + proto.RepeatedField( + proto.ENUM, + number=1, + enum="NotificationConfig.EventType", + ) ) pubsub: PubSub = proto.Field( @@ -12994,6 +13060,7 @@ class ConfidentialInstanceType(proto.Enum): TDX (3): Intel Trust Domain eXtension. """ + CONFIDENTIAL_INSTANCE_TYPE_UNSPECIFIED = 0 SEV = 1 SEV_SNP = 2 @@ -13139,6 +13206,7 @@ class State(proto.Enum): CANCELED (6): CANCELED indicates the upgrade has canceled. """ + STATE_UNSPECIFIED = 0 STARTED = 3 SUCCEEDED = 4 @@ -13167,6 +13235,7 @@ class EventType(proto.Enum): DISRUPTION_EVENT indicates the event is about the disruption. """ + EVENT_TYPE_UNSPECIFIED = 0 END_OF_SUPPORT = 1 COS_MILESTONE_VERSION_UPDATE = 2 @@ -13286,6 +13355,7 @@ class DisruptionType(proto.Enum): POD_PDB_VIOLATION indicates that there are force pod evictions during node drain which violate the PDB. """ + DISRUPTION_TYPE_UNSPECIFIED = 0 POD_NOT_ENOUGH_PDB = 1 POD_PDB_VIOLATION = 2 @@ -13535,6 +13605,7 @@ class Component(proto.Enum): KCP_HPA (9): horizontal pod autoscaler decision logs """ + COMPONENT_UNSPECIFIED = 0 SYSTEM_COMPONENTS = 1 WORKLOADS = 2 @@ -13631,6 +13702,7 @@ class RelayMode(proto.Enum): EXTERNAL_LB (4): exposed via external load balancer """ + RELAY_MODE_UNSPECIFIED = 0 DISABLED = 1 INTERNAL_VPC_LB = 3 @@ -13703,6 +13775,7 @@ class Variant(proto.Enum): MAX_THROUGHPUT (2): maximum logging throughput variant. """ + VARIANT_UNSPECIFIED = 0 DEFAULT = 1 MAX_THROUGHPUT = 2 @@ -13762,6 +13835,7 @@ class Component(proto.Enum): JOBSET (16): JobSet """ + COMPONENT_UNSPECIFIED = 0 SYSTEM_COMPONENTS = 1 WORKLOADS = 2 @@ -13816,6 +13890,7 @@ class HPAProfile(proto.Enum): faster metrics collection for workload autoscaling. """ + HPA_PROFILE_UNSPECIFIED = 0 NONE = 1 PERFORMANCE = 2 @@ -13859,6 +13934,7 @@ class MembershipType(proto.Enum): The membership supports only lightweight compatible features. """ + MEMBERSHIP_TYPE_UNSPECIFIED = 0 LIGHTWEIGHT = 1 @@ -14089,6 +14165,7 @@ class ClusterTier(proto.Enum): ENTERPRISE indicates a GKE Enterprise cluster. """ + _pb_options = {"deprecated": True} CLUSTER_TIER_UNSPECIFIED = 0 STANDARD = 1 @@ -14223,6 +14300,7 @@ class Mode(proto.Enum): CONTAINER_IMAGE_CACHE is for using the secondary boot disk as a container image cache. """ + MODE_UNSPECIFIED = 0 CONTAINER_IMAGE_CACHE = 1 @@ -14322,6 +14400,7 @@ class AutoUpgradeStatus(proto.Enum): UPGRADE_PAUSED (5): UPGRADE_PAUSED indicates the upgrade is paused. """ + UNKNOWN = 0 ACTIVE = 1 MINOR_UPGRADE_PAUSED = 4 @@ -14356,6 +14435,7 @@ class AutoUpgradePausedReason(proto.Enum): SYSTEM_CONFIG indicates the cluster upgrade is paused by system config. """ + AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED = 0 MAINTENANCE_WINDOW = 1 MAINTENANCE_EXCLUSION_NO_UPGRADES = 5 @@ -14431,6 +14511,7 @@ class Mode(proto.Enum): rollback-safe mode after a KCP minor version step-one upgrade. """ + MODE_UNSPECIFIED = 0 KCP_MINOR_UPGRADE_ROLLBACK_SAFE_MODE = 1 @@ -14495,6 +14576,7 @@ class State(proto.Enum): RUNNING (4): Upgrade is running. """ + UNKNOWN = 0 FAILED = 1 SUCCEEDED = 2 @@ -14512,6 +14594,7 @@ class StartType(proto.Enum): MANUAL (2): Upgrade started manually. """ + START_TYPE_UNSPECIFIED = 0 AUTOMATIC = 1 MANUAL = 2 @@ -14631,6 +14714,7 @@ class AutoUpgradeStatus(proto.Enum): UPGRADE_PAUSED (3): UPGRADE_PAUSED indicates the upgrade is paused. """ + UNKNOWN = 0 ACTIVE = 1 MINOR_UPGRADE_PAUSED = 2 @@ -14658,6 +14742,7 @@ class AutoUpgradePausedReason(proto.Enum): SYSTEM_CONFIG indicates the cluster upgrade is paused by system config. """ + AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED = 0 MAINTENANCE_WINDOW = 1 MAINTENANCE_EXCLUSION_NO_UPGRADES = 2 @@ -14725,6 +14810,7 @@ class PatchMode(proto.Enum): build in the channel should be used as the upgrade target for the version. """ + PATCH_MODE_UNSPECIFIED = 0 ACCELERATED = 1 @@ -14765,6 +14851,7 @@ class NetworkTier(proto.Enum): NETWORK_TIER_STANDARD (3): Standard network tier. """ + NETWORK_TIER_UNSPECIFIED = 0 NETWORK_TIER_DEFAULT = 1 NETWORK_TIER_PREMIUM = 2 @@ -14866,6 +14953,7 @@ class Scope(proto.Enum): the Managed OpenTelemetry pipeline for collection and instrumentation components. """ + SCOPE_UNSPECIFIED = 0 NONE = 1 COLLECTION_AND_INSTRUMENTATION_COMPONENTS = 2 diff --git a/packages/google-cloud-container/mypy.ini b/packages/google-cloud-container/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-container/mypy.ini +++ b/packages/google-cloud-container/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-container/noxfile.py b/packages/google-cloud-container/noxfile.py index 3da6a3519c04..a71522e225b3 100644 --- a/packages/google-cloud-container/noxfile.py +++ b/packages/google-cloud-container/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-container/tests/unit/gapic/container_v1/test_cluster_manager.py b/packages/google-cloud-container/tests/unit/gapic/container_v1/test_cluster_manager.py index 6648d81dd036..edd061045b5b 100644 --- a/packages/google-cloud-container/tests/unit/gapic/container_v1/test_cluster_manager.py +++ b/packages/google-cloud-container/tests/unit/gapic/container_v1/test_cluster_manager.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.oauth2 import service_account import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import google.rpc.code_pb2 as code_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.container_v1.services.cluster_manager import ( ClusterManagerAsyncClient, @@ -950,10 +955,9 @@ def test_cluster_manager_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +1002,9 @@ def test_cluster_manager_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1040,9 @@ def test_cluster_manager_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1287,9 +1289,7 @@ def test_cluster_manager_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3086,9 +3086,9 @@ def test_update_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_node_pool] = ( + mock_rpc + ) request = {} client.update_node_pool(request) @@ -3688,9 +3688,9 @@ def test_set_logging_service_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_logging_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_logging_service] = ( + mock_rpc + ) request = {} client.set_logging_service(request) @@ -4119,9 +4119,9 @@ def test_set_monitoring_service_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_monitoring_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_monitoring_service] = ( + mock_rpc + ) request = {} client.set_monitoring_service(request) @@ -4545,9 +4545,9 @@ def test_set_addons_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_addons_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_addons_config] = ( + mock_rpc + ) request = {} client.set_addons_config(request) @@ -7207,9 +7207,9 @@ def test_cancel_operation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_operation] = ( + mock_rpc + ) request = {} client.cancel_operation(request) @@ -7569,9 +7569,9 @@ def test_get_server_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_config] = ( + mock_rpc + ) request = {} client.get_server_config(request) @@ -7933,9 +7933,9 @@ def test_get_json_web_keys_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_json_web_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_json_web_keys] = ( + mock_rpc + ) request = {} client.get_json_web_keys(request) @@ -8965,9 +8965,9 @@ def test_create_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_node_pool] = ( + mock_rpc + ) request = {} client.create_node_pool(request) @@ -9378,9 +9378,9 @@ def test_delete_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_node_pool] = ( + mock_rpc + ) request = {} client.delete_node_pool(request) @@ -11472,9 +11472,9 @@ def test_start_ip_rotation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_ip_rotation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_ip_rotation] = ( + mock_rpc + ) request = {} client.start_ip_rotation(request) @@ -11889,9 +11889,9 @@ def test_complete_ip_rotation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_ip_rotation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_ip_rotation] = ( + mock_rpc + ) request = {} client.complete_ip_rotation(request) @@ -12309,9 +12309,9 @@ def test_set_node_pool_size_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_node_pool_size - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_node_pool_size] = ( + mock_rpc + ) request = {} client.set_node_pool_size(request) @@ -12610,9 +12610,9 @@ def test_set_network_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_network_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_network_policy] = ( + mock_rpc + ) request = {} client.set_network_policy(request) @@ -13051,9 +13051,9 @@ def test_set_maintenance_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_maintenance_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_maintenance_policy] = ( + mock_rpc + ) request = {} client.set_maintenance_policy(request) @@ -15485,9 +15485,9 @@ def test_update_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_node_pool] = ( + mock_rpc + ) request = {} client.update_node_pool(request) @@ -15743,9 +15743,9 @@ def test_set_logging_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_logging_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_logging_service] = ( + mock_rpc + ) request = {} client.set_logging_service(request) @@ -15935,9 +15935,9 @@ def test_set_monitoring_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_monitoring_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_monitoring_service] = ( + mock_rpc + ) request = {} client.set_monitoring_service(request) @@ -16124,9 +16124,9 @@ def test_set_addons_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_addons_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_addons_config] = ( + mock_rpc + ) request = {} client.set_addons_config(request) @@ -17107,9 +17107,9 @@ def test_cancel_operation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_operation] = ( + mock_rpc + ) request = {} client.cancel_operation(request) @@ -17209,9 +17209,9 @@ def test_get_server_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_config] = ( + mock_rpc + ) request = {} client.get_server_config(request) @@ -17308,9 +17308,9 @@ def test_get_json_web_keys_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_json_web_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_json_web_keys] = ( + mock_rpc + ) request = {} client.get_json_web_keys(request) @@ -17552,9 +17552,9 @@ def test_create_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_node_pool] = ( + mock_rpc + ) request = {} client.create_node_pool(request) @@ -17738,9 +17738,9 @@ def test_delete_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_node_pool] = ( + mock_rpc + ) request = {} client.delete_node_pool(request) @@ -18429,9 +18429,9 @@ def test_start_ip_rotation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_ip_rotation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_ip_rotation] = ( + mock_rpc + ) request = {} client.start_ip_rotation(request) @@ -18533,9 +18533,9 @@ def test_complete_ip_rotation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_ip_rotation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_ip_rotation] = ( + mock_rpc + ) request = {} client.complete_ip_rotation(request) @@ -18637,9 +18637,9 @@ def test_set_node_pool_size_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_node_pool_size - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_node_pool_size] = ( + mock_rpc + ) request = {} client.set_node_pool_size(request) @@ -18762,9 +18762,9 @@ def test_set_network_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_network_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_network_policy] = ( + mock_rpc + ) request = {} client.set_network_policy(request) @@ -18953,9 +18953,9 @@ def test_set_maintenance_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_maintenance_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_maintenance_policy] = ( + mock_rpc + ) request = {} client.set_maintenance_policy(request) diff --git a/packages/google-cloud-container/tests/unit/gapic/container_v1beta1/test_cluster_manager.py b/packages/google-cloud-container/tests/unit/gapic/container_v1beta1/test_cluster_manager.py index 7aafcd9e155d..f503bd7256b4 100644 --- a/packages/google-cloud-container/tests/unit/gapic/container_v1beta1/test_cluster_manager.py +++ b/packages/google-cloud-container/tests/unit/gapic/container_v1beta1/test_cluster_manager.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,19 +40,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.oauth2 import service_account import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import google.rpc.code_pb2 as code_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.container_v1beta1.services.cluster_manager import ( ClusterManagerAsyncClient, @@ -931,10 +937,9 @@ def test_cluster_manager_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +984,9 @@ def test_cluster_manager_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1022,9 @@ def test_cluster_manager_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1266,9 +1269,7 @@ def test_cluster_manager_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3037,9 +3038,9 @@ def test_update_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_node_pool] = ( + mock_rpc + ) request = {} client.update_node_pool(request) @@ -3639,9 +3640,9 @@ def test_set_logging_service_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_logging_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_logging_service] = ( + mock_rpc + ) request = {} client.set_logging_service(request) @@ -4060,9 +4061,9 @@ def test_set_monitoring_service_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_monitoring_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_monitoring_service] = ( + mock_rpc + ) request = {} client.set_monitoring_service(request) @@ -4476,9 +4477,9 @@ def test_set_addons_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_addons_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_addons_config] = ( + mock_rpc + ) request = {} client.set_addons_config(request) @@ -7078,9 +7079,9 @@ def test_cancel_operation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_operation] = ( + mock_rpc + ) request = {} client.cancel_operation(request) @@ -7430,9 +7431,9 @@ def test_get_server_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_config] = ( + mock_rpc + ) request = {} client.get_server_config(request) @@ -7784,9 +7785,9 @@ def test_get_json_web_keys_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_json_web_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_json_web_keys] = ( + mock_rpc + ) request = {} client.get_json_web_keys(request) @@ -8796,9 +8797,9 @@ def test_create_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_node_pool] = ( + mock_rpc + ) request = {} client.create_node_pool(request) @@ -9199,9 +9200,9 @@ def test_delete_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_node_pool] = ( + mock_rpc + ) request = {} client.delete_node_pool(request) @@ -11511,9 +11512,9 @@ def test_start_ip_rotation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_ip_rotation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_ip_rotation] = ( + mock_rpc + ) request = {} client.start_ip_rotation(request) @@ -11918,9 +11919,9 @@ def test_complete_ip_rotation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_ip_rotation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_ip_rotation] = ( + mock_rpc + ) request = {} client.complete_ip_rotation(request) @@ -12328,9 +12329,9 @@ def test_set_node_pool_size_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_node_pool_size - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_node_pool_size] = ( + mock_rpc + ) request = {} client.set_node_pool_size(request) @@ -12629,9 +12630,9 @@ def test_set_network_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_network_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_network_policy] = ( + mock_rpc + ) request = {} client.set_network_policy(request) @@ -13060,9 +13061,9 @@ def test_set_maintenance_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_maintenance_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_maintenance_policy] = ( + mock_rpc + ) request = {} client.set_maintenance_policy(request) diff --git a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/__init__.py b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/__init__.py index b199144ae61f..d3b647337fc1 100644 --- a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/__init__.py +++ b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.container_analysis import ( ContainerAnalysisAsyncClient, ContainerAnalysisClient, diff --git a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/async_client.py b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/async_client.py index 161b670cca88..82470402c8aa 100644 --- a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/async_client.py +++ b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devtools.containeranalysis_v1 import gapic_version as package_version @@ -130,7 +130,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ContainerAnalysisAsyncClient: The constructed client. """ - return ContainerAnalysisClient.from_service_account_info.__func__(ContainerAnalysisAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ContainerAnalysisClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ContainerAnalysisAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +149,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ContainerAnalysisAsyncClient: The constructed client. """ - return ContainerAnalysisClient.from_service_account_file.__func__(ContainerAnalysisAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ContainerAnalysisClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ContainerAnalysisAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/client.py b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/client.py index 445084888496..302e5c8c9361 100644 --- a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/client.py +++ b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devtools.containeranalysis_v1 import gapic_version as package_version @@ -82,9 +82,7 @@ class ContainerAnalysisClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ContainerAnalysisTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ContainerAnalysisTransport]] _transport_registry["grpc"] = ContainerAnalysisGrpcTransport _transport_registry["grpc_asyncio"] = ContainerAnalysisGrpcAsyncIOTransport _transport_registry["rest"] = ContainerAnalysisRestTransport @@ -621,11 +619,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContainerAnalysisClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContainerAnalysisClient._read_environment_variables() + ) self._client_cert_source = ContainerAnalysisClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -660,8 +656,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContainerAnalysisTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/base.py b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/base.py index 19f3781acf34..5519704e8561 100644 --- a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/base.py +++ b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devtools.containeranalysis_v1 import gapic_version as package_version from google.cloud.devtools.containeranalysis_v1.types import containeranalysis diff --git a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/grpc.py b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/grpc.py index 7d7dc999fd19..54416e8ad6b2 100644 --- a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/grpc.py +++ b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.devtools.containeranalysis_v1.types import containeranalysis @@ -465,12 +465,12 @@ def get_vulnerability_occurrences_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_vulnerability_occurrences_summary" not in self._stubs: - self._stubs[ - "get_vulnerability_occurrences_summary" - ] = self._logged_channel.unary_unary( - "/google.devtools.containeranalysis.v1.ContainerAnalysis/GetVulnerabilityOccurrencesSummary", - request_serializer=containeranalysis.GetVulnerabilityOccurrencesSummaryRequest.serialize, - response_deserializer=containeranalysis.VulnerabilityOccurrencesSummary.deserialize, + self._stubs["get_vulnerability_occurrences_summary"] = ( + self._logged_channel.unary_unary( + "/google.devtools.containeranalysis.v1.ContainerAnalysis/GetVulnerabilityOccurrencesSummary", + request_serializer=containeranalysis.GetVulnerabilityOccurrencesSummaryRequest.serialize, + response_deserializer=containeranalysis.VulnerabilityOccurrencesSummary.deserialize, + ) ) return self._stubs["get_vulnerability_occurrences_summary"] diff --git a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/grpc_asyncio.py b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/grpc_asyncio.py index 5c3743e4099e..a63ab06bf1b0 100644 --- a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/grpc_asyncio.py +++ b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.devtools.containeranalysis_v1.types import containeranalysis @@ -473,12 +473,12 @@ def get_vulnerability_occurrences_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_vulnerability_occurrences_summary" not in self._stubs: - self._stubs[ - "get_vulnerability_occurrences_summary" - ] = self._logged_channel.unary_unary( - "/google.devtools.containeranalysis.v1.ContainerAnalysis/GetVulnerabilityOccurrencesSummary", - request_serializer=containeranalysis.GetVulnerabilityOccurrencesSummaryRequest.serialize, - response_deserializer=containeranalysis.VulnerabilityOccurrencesSummary.deserialize, + self._stubs["get_vulnerability_occurrences_summary"] = ( + self._logged_channel.unary_unary( + "/google.devtools.containeranalysis.v1.ContainerAnalysis/GetVulnerabilityOccurrencesSummary", + request_serializer=containeranalysis.GetVulnerabilityOccurrencesSummaryRequest.serialize, + response_deserializer=containeranalysis.VulnerabilityOccurrencesSummary.deserialize, + ) ) return self._stubs["get_vulnerability_occurrences_summary"] diff --git a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/rest.py b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/rest.py index 245bddfcb73b..5d52cf3b8637 100644 --- a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/rest.py +++ b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -754,9 +754,7 @@ def __call__( """ - http_options = ( - _BaseContainerAnalysisRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseContainerAnalysisRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseContainerAnalysisRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -911,15 +909,12 @@ def __call__( """ - http_options = ( - _BaseContainerAnalysisRestTransport._BaseGetVulnerabilityOccurrencesSummary._get_http_options() - ) + http_options = _BaseContainerAnalysisRestTransport._BaseGetVulnerabilityOccurrencesSummary._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_vulnerability_occurrences_summary( - request, metadata + request, metadata = ( + self._interceptor.pre_get_vulnerability_occurrences_summary( + request, metadata + ) ) transcoded_request = _BaseContainerAnalysisRestTransport._BaseGetVulnerabilityOccurrencesSummary._get_transcoded_request( http_options, request @@ -980,11 +975,10 @@ def __call__( resp = self._interceptor.post_get_vulnerability_occurrences_summary(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_vulnerability_occurrences_summary_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_vulnerability_occurrences_summary_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1143,9 +1137,7 @@ def __call__( """ - http_options = ( - _BaseContainerAnalysisRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseContainerAnalysisRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseContainerAnalysisRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1294,9 +1286,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseContainerAnalysisRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseContainerAnalysisRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1418,7 +1408,9 @@ def get_vulnerability_occurrences_summary( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetVulnerabilityOccurrencesSummary(self._session, self._host, self._interceptor) # type: ignore + return self._GetVulnerabilityOccurrencesSummary( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_iam_policy( diff --git a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/rest_base.py b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/rest_base.py index b34d004c6499..4c888529fa61 100644 --- a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/rest_base.py +++ b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.api_core import gapic_v1, path_template from google.protobuf import json_format from google.cloud.devtools.containeranalysis_v1.types import containeranalysis diff --git a/packages/google-cloud-containeranalysis/mypy.ini b/packages/google-cloud-containeranalysis/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-containeranalysis/mypy.ini +++ b/packages/google-cloud-containeranalysis/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-containeranalysis/noxfile.py b/packages/google-cloud-containeranalysis/noxfile.py index b6748d82348e..32b364910a6a 100644 --- a/packages/google-cloud-containeranalysis/noxfile.py +++ b/packages/google-cloud-containeranalysis/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_get_iam_policy_async.py b/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_get_iam_policy_async.py index 6a60e0e7bf4e..6188c49ff15c 100644 --- a/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_get_iam_policy_async.py +++ b/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-containeranalysis -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START containeranalysis_v1_generated_ContainerAnalysis_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud.devtools import containeranalysis_v1 diff --git a/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_get_iam_policy_sync.py b/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_get_iam_policy_sync.py index 2dcacd605328..2574cc4b21ff 100644 --- a/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_get_iam_policy_sync.py +++ b/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-containeranalysis -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START containeranalysis_v1_generated_ContainerAnalysis_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud.devtools import containeranalysis_v1 diff --git a/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_set_iam_policy_async.py b/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_set_iam_policy_async.py index 422c9eff8d07..bf9f64934e33 100644 --- a/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_set_iam_policy_async.py +++ b/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-containeranalysis -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START containeranalysis_v1_generated_ContainerAnalysis_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud.devtools import containeranalysis_v1 diff --git a/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_set_iam_policy_sync.py b/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_set_iam_policy_sync.py index 488633f8c5ca..3442084cc09d 100644 --- a/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_set_iam_policy_sync.py +++ b/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-containeranalysis -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START containeranalysis_v1_generated_ContainerAnalysis_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud.devtools import containeranalysis_v1 diff --git a/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_test_iam_permissions_async.py b/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_test_iam_permissions_async.py index 9dac7b647332..8f539e299d55 100644 --- a/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_test_iam_permissions_async.py +++ b/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-containeranalysis -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START containeranalysis_v1_generated_ContainerAnalysis_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud.devtools import containeranalysis_v1 diff --git a/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_test_iam_permissions_sync.py b/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_test_iam_permissions_sync.py index 4e86017ca9bf..65d327105ce0 100644 --- a/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_test_iam_permissions_sync.py +++ b/packages/google-cloud-containeranalysis/samples/generated_samples/containeranalysis_v1_generated_container_analysis_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-containeranalysis -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START containeranalysis_v1_generated_ContainerAnalysis_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud.devtools import containeranalysis_v1 diff --git a/packages/google-cloud-containeranalysis/tests/unit/gapic/containeranalysis_v1/test_container_analysis.py b/packages/google-cloud-containeranalysis/tests/unit/gapic/containeranalysis_v1/test_container_analysis.py index 95e1cb1aef5b..08e8c4d9f2f5 100644 --- a/packages/google-cloud-containeranalysis/tests/unit/gapic/containeranalysis_v1/test_container_analysis.py +++ b/packages/google-cloud-containeranalysis/tests/unit/gapic/containeranalysis_v1/test_container_analysis.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.options_pb2 as options_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.devtools.containeranalysis_v1.services.container_analysis import ( ContainerAnalysisAsyncClient, @@ -982,10 +987,9 @@ def test_container_analysis_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1034,9 @@ def test_container_analysis_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1069,10 +1072,9 @@ def test_container_analysis_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1324,9 +1326,7 @@ def test_container_analysis_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2123,9 +2123,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3372,9 +3372,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/__init__.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/__init__.py index 690543b602ed..8f9f775a872d 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/__init__.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.document_link_service import ( DocumentLinkServiceAsyncClient, DocumentLinkServiceClient, diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/async_client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/async_client.py index cd07eab7f9a6..6d694a3e1f37 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/async_client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_link_service import pagers from google.cloud.contentwarehouse_v1.types import document, document_link_service @@ -123,7 +123,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentLinkServiceAsyncClient: The constructed client. """ - return DocumentLinkServiceClient.from_service_account_info.__func__(DocumentLinkServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DocumentLinkServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DocumentLinkServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +142,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentLinkServiceAsyncClient: The constructed client. """ - return DocumentLinkServiceClient.from_service_account_file.__func__(DocumentLinkServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DocumentLinkServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DocumentLinkServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -177,7 +183,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DocumentLinkServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DocumentLinkServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DocumentLinkServiceTransport: diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/client.py index 43b376801bed..425755509bc6 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_link_service import pagers from google.cloud.contentwarehouse_v1.types import document, document_link_service @@ -81,9 +81,7 @@ class DocumentLinkServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentLinkServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentLinkServiceTransport]] _transport_registry["grpc"] = DocumentLinkServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentLinkServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentLinkServiceRestTransport @@ -654,11 +652,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentLinkServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentLinkServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentLinkServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -693,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentLinkServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/pagers.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/pagers.py index c442ead15864..bfcfc9c3cbaf 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/pagers.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/__init__.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/__init__.py index 8085809d4baf..02a3487ae3da 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/__init__.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import DocumentLinkServiceRestInterceptor, DocumentLinkServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DocumentLinkServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DocumentLinkServiceTransport]] _transport_registry["grpc"] = DocumentLinkServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentLinkServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentLinkServiceRestTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/base.py index d012366f0e3d..85020638704d 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.contentwarehouse_v1 import gapic_version as package_version from google.cloud.contentwarehouse_v1.types import document_link_service diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc.py index e22c36b99faf..062d8c50c93c 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.contentwarehouse_v1.types import document_link_service diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc_asyncio.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc_asyncio.py index ca42f230f2b0..3d3d0156853b 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.contentwarehouse_v1.types import document_link_service diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest.py index 9a876a49cf93..91499a2b98e1 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.contentwarehouse_v1.types import document_link_service @@ -452,9 +452,7 @@ def __call__( """ - http_options = ( - _BaseDocumentLinkServiceRestTransport._BaseCreateDocumentLink._get_http_options() - ) + http_options = _BaseDocumentLinkServiceRestTransport._BaseCreateDocumentLink._get_http_options() request, metadata = self._interceptor.pre_create_document_link( request, metadata @@ -606,9 +604,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentLinkServiceRestTransport._BaseDeleteDocumentLink._get_http_options() - ) + http_options = _BaseDocumentLinkServiceRestTransport._BaseDeleteDocumentLink._get_http_options() request, metadata = self._interceptor.pre_delete_document_link( request, metadata @@ -730,9 +726,7 @@ def __call__( """ - http_options = ( - _BaseDocumentLinkServiceRestTransport._BaseListLinkedSources._get_http_options() - ) + http_options = _BaseDocumentLinkServiceRestTransport._BaseListLinkedSources._get_http_options() request, metadata = self._interceptor.pre_list_linked_sources( request, metadata @@ -892,9 +886,7 @@ def __call__( """ - http_options = ( - _BaseDocumentLinkServiceRestTransport._BaseListLinkedTargets._get_http_options() - ) + http_options = _BaseDocumentLinkServiceRestTransport._BaseListLinkedTargets._get_http_options() request, metadata = self._interceptor.pre_list_linked_targets( request, metadata @@ -1094,9 +1086,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDocumentLinkServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDocumentLinkServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDocumentLinkServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest_base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest_base.py index 2ab6d48dd998..e34a64aca40d 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest_base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.contentwarehouse_v1.types import document_link_service diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/async_client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/async_client.py index 1db04bd1ef83..e60bd140dcf1 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/async_client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_schema_service import pagers +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service from .client import DocumentSchemaServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DocumentSchemaServiceTransport @@ -128,7 +130,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentSchemaServiceAsyncClient: The constructed client. """ - return DocumentSchemaServiceClient.from_service_account_info.__func__(DocumentSchemaServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DocumentSchemaServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DocumentSchemaServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +149,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentSchemaServiceAsyncClient: The constructed client. """ - return DocumentSchemaServiceClient.from_service_account_file.__func__(DocumentSchemaServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DocumentSchemaServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DocumentSchemaServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -182,7 +190,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DocumentSchemaServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DocumentSchemaServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DocumentSchemaServiceTransport: diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/client.py index 416553d826a0..706149da6cc6 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_schema_service import pagers +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service from .transports.base import DEFAULT_CLIENT_INFO, DocumentSchemaServiceTransport from .transports.grpc import DocumentSchemaServiceGrpcTransport @@ -85,9 +87,7 @@ class DocumentSchemaServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentSchemaServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentSchemaServiceTransport]] _transport_registry["grpc"] = DocumentSchemaServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentSchemaServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentSchemaServiceRestTransport @@ -650,11 +650,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentSchemaServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentSchemaServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentSchemaServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -689,8 +687,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentSchemaServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/pagers.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/pagers.py index 2c4b85551d75..a313073423dd 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/pagers.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/__init__.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/__init__.py index faba0b94fb1a..46a623ac01d2 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/__init__.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DocumentSchemaServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DocumentSchemaServiceTransport]] _transport_registry["grpc"] = DocumentSchemaServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentSchemaServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentSchemaServiceRestTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/base.py index 61c0eeb402cf..1409b5deed56 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/base.py @@ -17,22 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.contentwarehouse_v1 import gapic_version as package_version +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc.py index edd3b9f4417a..c4b285be66b6 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service from .base import DEFAULT_CLIENT_INFO, DocumentSchemaServiceTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc_asyncio.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc_asyncio.py index 5a97f7619e56..8f555bbf3928 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc_asyncio.py @@ -17,27 +17,29 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service from .base import DEFAULT_CLIENT_INFO, DocumentSchemaServiceTransport from .grpc import DocumentSchemaServiceGrpcTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest.py index 03eec4c2593d..f74c8433b2b3 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest.py @@ -16,25 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDocumentSchemaServiceRestTransport @@ -510,9 +512,7 @@ def __call__( """ - http_options = ( - _BaseDocumentSchemaServiceRestTransport._BaseCreateDocumentSchema._get_http_options() - ) + http_options = _BaseDocumentSchemaServiceRestTransport._BaseCreateDocumentSchema._get_http_options() request, metadata = self._interceptor.pre_create_document_schema( request, metadata @@ -663,9 +663,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentSchemaServiceRestTransport._BaseDeleteDocumentSchema._get_http_options() - ) + http_options = _BaseDocumentSchemaServiceRestTransport._BaseDeleteDocumentSchema._get_http_options() request, metadata = self._interceptor.pre_delete_document_schema( request, metadata @@ -781,9 +779,7 @@ def __call__( """ - http_options = ( - _BaseDocumentSchemaServiceRestTransport._BaseGetDocumentSchema._get_http_options() - ) + http_options = _BaseDocumentSchemaServiceRestTransport._BaseGetDocumentSchema._get_http_options() request, metadata = self._interceptor.pre_get_document_schema( request, metadata @@ -933,9 +929,7 @@ def __call__( """ - http_options = ( - _BaseDocumentSchemaServiceRestTransport._BaseListDocumentSchemas._get_http_options() - ) + http_options = _BaseDocumentSchemaServiceRestTransport._BaseListDocumentSchemas._get_http_options() request, metadata = self._interceptor.pre_list_document_schemas( request, metadata @@ -1090,9 +1084,7 @@ def __call__( """ - http_options = ( - _BaseDocumentSchemaServiceRestTransport._BaseUpdateDocumentSchema._get_http_options() - ) + http_options = _BaseDocumentSchemaServiceRestTransport._BaseUpdateDocumentSchema._get_http_options() request, metadata = self._interceptor.pre_update_document_schema( request, metadata @@ -1303,9 +1295,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDocumentSchemaServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDocumentSchemaServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDocumentSchemaServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest_base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest_base.py index dcd4e37f5597..781632097c25 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest_base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest_base.py @@ -17,16 +17,18 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service from .base import DEFAULT_CLIENT_INFO, DocumentSchemaServiceTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/async_client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/async_client.py index b973c9dd5c8f..797b2c7a0176 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/async_client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -44,19 +44,19 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.documentai_v1.types import document as gcd_document import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.longrunning.operations_pb2 as operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.documentai_v1.types import document as gcd_document +from google.longrunning import operations_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_service import pagers from google.cloud.contentwarehouse_v1.types import ( + common, document_service, document_service_request, rule_engine, ) -from google.cloud.contentwarehouse_v1.types import common from google.cloud.contentwarehouse_v1.types import document as gcc_document from .client import DocumentServiceClient @@ -131,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_info.__func__(DocumentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DocumentServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DocumentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_file.__func__(DocumentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DocumentServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DocumentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/client.py index d4fdcf2ed4be..65ab77fb8633 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -61,19 +61,19 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.documentai_v1.types import document as gcd_document import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.longrunning.operations_pb2 as operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.documentai_v1.types import document as gcd_document +from google.longrunning import operations_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_service import pagers from google.cloud.contentwarehouse_v1.types import ( + common, document_service, document_service_request, rule_engine, ) -from google.cloud.contentwarehouse_v1.types import common from google.cloud.contentwarehouse_v1.types import document as gcc_document from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -90,9 +90,7 @@ class DocumentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] _transport_registry["grpc"] = DocumentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentServiceRestTransport @@ -673,11 +671,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -712,8 +708,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/pagers.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/pagers.py index 691a7e1c7f73..b9ac1a290081 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/pagers.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/base.py index d556d3af66e8..735a27928b7d 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.contentwarehouse_v1 import gapic_version as package_version +from google.cloud.contentwarehouse_v1.types import document as gcc_document from google.cloud.contentwarehouse_v1.types import ( document_service, document_service_request, ) -from google.cloud.contentwarehouse_v1.types import document as gcc_document DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc.py index 6c8c26bae89c..fcd89b2a25f1 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from google.cloud.contentwarehouse_v1.types import document as gcc_document from google.cloud.contentwarehouse_v1.types import ( document_service, document_service_request, ) -from google.cloud.contentwarehouse_v1.types import document as gcc_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc_asyncio.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc_asyncio.py index b895a69ff6b4..4859ac9a2562 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc_asyncio.py @@ -17,27 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.contentwarehouse_v1.types import document as gcc_document from google.cloud.contentwarehouse_v1.types import ( document_service, document_service_request, ) -from google.cloud.contentwarehouse_v1.types import document as gcc_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport from .grpc import DocumentServiceGrpcTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest.py index 08cf5fc3dd28..f592a3b3f934 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest.py @@ -16,25 +16,25 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.contentwarehouse_v1.types import document as gcc_document from google.cloud.contentwarehouse_v1.types import ( document_service, document_service_request, ) -from google.cloud.contentwarehouse_v1.types import document as gcc_document from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDocumentServiceRestTransport @@ -683,9 +683,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() request, metadata = self._interceptor.pre_create_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_transcoded_request( @@ -832,9 +830,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() request, metadata = self._interceptor.pre_delete_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_transcoded_request( @@ -1418,9 +1414,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseSearchDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseSearchDocuments._get_http_options() request, metadata = self._interceptor.pre_search_documents( request, metadata @@ -1732,9 +1726,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() request, metadata = self._interceptor.pre_update_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_transcoded_request( diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest_base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest_base.py index a7b35a6064ba..f13c17d604c3 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest_base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.contentwarehouse_v1.types import document as gcc_document from google.cloud.contentwarehouse_v1.types import ( document_service, document_service_request, ) -from google.cloud.contentwarehouse_v1.types import document as gcc_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/async_client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/async_client.py index ec005492048d..6b5195c82c94 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/async_client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -120,7 +120,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PipelineServiceAsyncClient: The constructed client. """ - return PipelineServiceClient.from_service_account_info.__func__(PipelineServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PipelineServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PipelineServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +139,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PipelineServiceAsyncClient: The constructed client. """ - return PipelineServiceClient.from_service_account_file.__func__(PipelineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PipelineServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PipelineServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/client.py index c2216124ebd5..b766c59cb78c 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class PipelineServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PipelineServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PipelineServiceTransport]] _transport_registry["grpc"] = PipelineServiceGrpcTransport _transport_registry["grpc_asyncio"] = PipelineServiceGrpcAsyncIOTransport _transport_registry["rest"] = PipelineServiceRestTransport @@ -642,11 +640,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PipelineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PipelineServiceClient._read_environment_variables() + ) self._client_cert_source = PipelineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -681,8 +677,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PipelineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/base.py index e3e45db84ade..1fab48ac4a0c 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version from google.cloud.contentwarehouse_v1.types import pipeline_service diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc.py index a09e62326674..fdc362786873 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.contentwarehouse_v1.types import pipeline_service diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc_asyncio.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc_asyncio.py index 309e04181b60..fb31a8e09dcf 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.contentwarehouse_v1.types import pipeline_service diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/rest.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/rest.py index 7401341c7f21..8cf1c3a024d4 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/rest.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/async_client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/async_client.py index e4485b976fd9..2d578774a93d 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/async_client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -119,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RuleSetServiceAsyncClient: The constructed client. """ - return RuleSetServiceClient.from_service_account_info.__func__(RuleSetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + RuleSetServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(RuleSetServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RuleSetServiceAsyncClient: The constructed client. """ - return RuleSetServiceClient.from_service_account_file.__func__(RuleSetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + RuleSetServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(RuleSetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/client.py index 66321f61f2bd..1e3f98b76fbe 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -80,9 +80,7 @@ class RuleSetServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RuleSetServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RuleSetServiceTransport]] _transport_registry["grpc"] = RuleSetServiceGrpcTransport _transport_registry["grpc_asyncio"] = RuleSetServiceGrpcAsyncIOTransport _transport_registry["rest"] = RuleSetServiceRestTransport @@ -661,11 +659,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RuleSetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RuleSetServiceClient._read_environment_variables() + ) self._client_cert_source = RuleSetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -700,8 +696,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RuleSetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/pagers.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/pagers.py index 8206096f76af..bcec4908c73d 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/pagers.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/base.py index dcb86e908495..a1f032810132 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.contentwarehouse_v1 import gapic_version as package_version from google.cloud.contentwarehouse_v1.types import rule_engine, ruleset_service_request diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc.py index c18235d23953..15397de8c191 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.contentwarehouse_v1.types import rule_engine, ruleset_service_request diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc_asyncio.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc_asyncio.py index b4f8e37015f4..3f318a28deab 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.contentwarehouse_v1.types import rule_engine, ruleset_service_request diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest.py index 401aa77f02b8..7389dac1e660 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.contentwarehouse_v1.types import rule_engine, ruleset_service_request diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest_base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest_base.py index aed9560ab858..49445f46a302 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest_base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.contentwarehouse_v1.types import rule_engine, ruleset_service_request diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/async_client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/async_client.py index 8f1131f1cdf6..9be051cafa74 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/async_client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -122,7 +122,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SynonymSetServiceAsyncClient: The constructed client. """ - return SynonymSetServiceClient.from_service_account_info.__func__(SynonymSetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SynonymSetServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SynonymSetServiceAsyncClient, 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: SynonymSetServiceAsyncClient: The constructed client. """ - return SynonymSetServiceClient.from_service_account_file.__func__(SynonymSetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SynonymSetServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SynonymSetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/client.py index 982c42ae5834..37eb13b8c3bd 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -83,9 +83,7 @@ class SynonymSetServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SynonymSetServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SynonymSetServiceTransport]] _transport_registry["grpc"] = SynonymSetServiceGrpcTransport _transport_registry["grpc_asyncio"] = SynonymSetServiceGrpcAsyncIOTransport _transport_registry["rest"] = SynonymSetServiceRestTransport @@ -646,11 +644,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SynonymSetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SynonymSetServiceClient._read_environment_variables() + ) self._client_cert_source = SynonymSetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -685,8 +681,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SynonymSetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/pagers.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/pagers.py index 2b3383c7f1ac..31e089200945 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/pagers.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/base.py index 6588c41f9ba8..0ffa74f0831c 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.contentwarehouse_v1 import gapic_version as package_version from google.cloud.contentwarehouse_v1.types import ( diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc.py index 5183363a7f0f..8d1bb01fb6f0 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.contentwarehouse_v1.types import ( synonymset, diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc_asyncio.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc_asyncio.py index cff574be12d4..9e7068f63034 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.contentwarehouse_v1.types import ( synonymset, diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest.py index 5927919cf4cd..05411c68ca75 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.contentwarehouse_v1.types import ( @@ -512,9 +512,7 @@ def __call__( """ - http_options = ( - _BaseSynonymSetServiceRestTransport._BaseCreateSynonymSet._get_http_options() - ) + http_options = _BaseSynonymSetServiceRestTransport._BaseCreateSynonymSet._get_http_options() request, metadata = self._interceptor.pre_create_synonym_set( request, metadata @@ -661,9 +659,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSynonymSetServiceRestTransport._BaseDeleteSynonymSet._get_http_options() - ) + http_options = _BaseSynonymSetServiceRestTransport._BaseDeleteSynonymSet._get_http_options() request, metadata = self._interceptor.pre_delete_synonym_set( request, metadata @@ -785,9 +781,7 @@ def __call__( """ - http_options = ( - _BaseSynonymSetServiceRestTransport._BaseGetSynonymSet._get_http_options() - ) + http_options = _BaseSynonymSetServiceRestTransport._BaseGetSynonymSet._get_http_options() request, metadata = self._interceptor.pre_get_synonym_set(request, metadata) transcoded_request = _BaseSynonymSetServiceRestTransport._BaseGetSynonymSet._get_transcoded_request( @@ -935,9 +929,7 @@ def __call__( """ - http_options = ( - _BaseSynonymSetServiceRestTransport._BaseListSynonymSets._get_http_options() - ) + http_options = _BaseSynonymSetServiceRestTransport._BaseListSynonymSets._get_http_options() request, metadata = self._interceptor.pre_list_synonym_sets( request, metadata @@ -1100,9 +1092,7 @@ def __call__( """ - http_options = ( - _BaseSynonymSetServiceRestTransport._BaseUpdateSynonymSet._get_http_options() - ) + http_options = _BaseSynonymSetServiceRestTransport._BaseUpdateSynonymSet._get_http_options() request, metadata = self._interceptor.pre_update_synonym_set( request, metadata @@ -1305,9 +1295,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSynonymSetServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSynonymSetServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSynonymSetServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest_base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest_base.py index 1c5fdf929dc5..e921cf8c599f 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest_base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.contentwarehouse_v1.types import ( synonymset, diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/__init__.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/__init__.py index 0dd9c6180b2e..9f2935bb99e0 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/__init__.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/__init__.py @@ -107,7 +107,9 @@ HistogramQueryPropertyNameFilter, HistogramQueryResult, ) -from .pipeline_service import RunPipelineRequest +from .pipeline_service import ( + RunPipelineRequest, +) from .pipelines import ( ExportToCdwPipeline, GcsIngestPipeline, @@ -144,7 +146,9 @@ ListRuleSetsResponse, UpdateRuleSetRequest, ) -from .synonymset import SynonymSet +from .synonymset import ( + SynonymSet, +) from .synonymset_service_request import ( CreateSynonymSetRequest, DeleteSynonymSetRequest, diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/common.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/common.py index c3d4a0acf230..2b8bb64645c9 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/common.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/common.py @@ -61,6 +61,7 @@ class UpdateType(proto.Enum): merge them based on update mask and merge fields options. """ + UPDATE_TYPE_UNSPECIFIED = 0 UPDATE_TYPE_REPLACE = 1 UPDATE_TYPE_MERGE = 2 @@ -82,6 +83,7 @@ class DatabaseType(proto.Enum): DB_CLOUD_SQL_POSTGRES (2): Cloud Sql with a Postgres Sql instance """ + DB_UNKNOWN = 0 DB_INFRA_SPANNER = 1 DB_CLOUD_SQL_POSTGRES = 2 @@ -104,6 +106,7 @@ class AccessControlMode(proto.Enum): Document level access control using Google Cloud Identity. """ + ACL_MODE_UNKNOWN = 0 ACL_MODE_UNIVERSAL_ACCESS = 1 ACL_MODE_DOCUMENT_LEVEL_ACCESS_CONTROL_BYOID = 2 @@ -127,6 +130,7 @@ class DocumentCreatorDefaultRole(proto.Enum): Document Viewer, same as contentwarehouse.googleapis.com/documentViewer. """ + DOCUMENT_CREATOR_DEFAULT_ROLE_UNSPECIFIED = 0 DOCUMENT_ADMIN = 1 DOCUMENT_EDITOR = 2 diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document.py index 85e5a53e6ba2..9a3d4011d711 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.cloud.documentai_v1.types import document as gcd_document import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.type.datetime_pb2 as datetime_pb2 # type: ignore import proto # type: ignore +from google.cloud.documentai_v1.types import document as gcd_document __protobuf__ = proto.module( package="google.cloud.contentwarehouse.v1", @@ -66,6 +66,7 @@ class RawDocumentFileType(proto.Enum): RAW_DOCUMENT_FILE_TYPE_TIFF (6): TIFF or TIF image file format """ + RAW_DOCUMENT_FILE_TYPE_UNSPECIFIED = 0 RAW_DOCUMENT_FILE_TYPE_PDF = 1 RAW_DOCUMENT_FILE_TYPE_DOCX = 2 @@ -89,6 +90,7 @@ class ContentCategory(proto.Enum): CONTENT_CATEGORY_VIDEO (3): Content is of video type. """ + CONTENT_CATEGORY_UNSPECIFIED = 0 CONTENT_CATEGORY_IMAGE = 1 CONTENT_CATEGORY_AUDIO = 2 diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_link_service.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_link_service.py index f11eae0f6d2e..887bad2b2c97 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_link_service.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_link_service.py @@ -205,6 +205,7 @@ class State(proto.Enum): Target document is deleted, and mark the documentlink as soft-deleted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SOFT_DELETED = 2 diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema.py index 68298faef99a..c7725bc9776a 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema.py @@ -201,6 +201,7 @@ class RetrievalImportance(proto.Enum): LOWEST (6): Lowest importance (negative). """ + RETRIEVAL_IMPORTANCE_UNSPECIFIED = 0 HIGHEST = 1 HIGHER = 2 diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema_service.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema_service.py index af1c1f2c867a..583bc8aa587c 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema_service.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema_service.py @@ -169,12 +169,12 @@ class ListDocumentSchemasResponse(proto.Message): def raw_page(self): return self - document_schemas: MutableSequence[ - gcc_document_schema.DocumentSchema - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcc_document_schema.DocumentSchema, + document_schemas: MutableSequence[gcc_document_schema.DocumentSchema] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcc_document_schema.DocumentSchema, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service.py index a43eb5e0d6ab..7f512aff595b 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service.py @@ -21,9 +21,8 @@ import google.longrunning.operations_pb2 as operations_pb2 # type: ignore import proto # type: ignore -from google.cloud.contentwarehouse_v1.types import common +from google.cloud.contentwarehouse_v1.types import common, histogram, rule_engine from google.cloud.contentwarehouse_v1.types import document as gcc_document -from google.cloud.contentwarehouse_v1.types import histogram, rule_engine __protobuf__ = proto.module( package="google.cloud.contentwarehouse.v1", @@ -73,12 +72,12 @@ class CreateDocumentResponse(proto.Message): number=3, message=common.ResponseMetadata, ) - long_running_operations: MutableSequence[ - operations_pb2.Operation - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=operations_pb2.Operation, + long_running_operations: MutableSequence[operations_pb2.Operation] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=operations_pb2.Operation, + ) ) @@ -266,12 +265,12 @@ def raw_page(self): number=4, message=common.ResponseMetadata, ) - histogram_query_results: MutableSequence[ - histogram.HistogramQueryResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=histogram.HistogramQueryResult, + histogram_query_results: MutableSequence[histogram.HistogramQueryResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=histogram.HistogramQueryResult, + ) ) question_answer: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service_request.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service_request.py index 6866bcf6537d..4fcbbfdf43dc 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service_request.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service_request.py @@ -21,9 +21,8 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.contentwarehouse_v1.types import common +from google.cloud.contentwarehouse_v1.types import common, filters, histogram from google.cloud.contentwarehouse_v1.types import document as gcc_document -from google.cloud.contentwarehouse_v1.types import filters, histogram __protobuf__ = proto.module( package="google.cloud.contentwarehouse.v1", @@ -58,12 +57,12 @@ class CloudAIDocumentOption(proto.Message): proto.BOOL, number=1, ) - customized_entities_properties_conversions: MutableMapping[ - str, str - ] = proto.MapField( - proto.STRING, - proto.STRING, - number=2, + customized_entities_properties_conversions: MutableMapping[str, str] = ( + proto.MapField( + proto.STRING, + proto.STRING, + number=2, + ) ) @@ -363,6 +362,7 @@ class TotalResultSize(proto.Enum): It may adversely impact performance. The limit is 1000,000. """ + TOTAL_RESULT_SIZE_UNSPECIFIED = 0 ESTIMATED_SIZE = 1 ACTUAL_SIZE = 2 diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/filters.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/filters.py index 2f884a26ae74..bc0f2c14db8b 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/filters.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/filters.py @@ -261,6 +261,7 @@ class TimeField(proto.Enum): DISPOSITION_TIME (3): Time when document becomes mutable again. """ + TIME_FIELD_UNSPECIFIED = 0 CREATE_TIME = 1 UPDATE_TIME = 2 @@ -370,6 +371,7 @@ class FileType(proto.Enum): ROOT_FOLDER (4): Returns only root folders """ + FILE_TYPE_UNSPECIFIED = 0 ALL = 1 FOLDER = 2 @@ -393,12 +395,12 @@ class CustomWeightsMetadata(proto.Message): relevance boosting. """ - weighted_schema_properties: MutableSequence[ - "WeightedSchemaProperty" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="WeightedSchemaProperty", + weighted_schema_properties: MutableSequence["WeightedSchemaProperty"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="WeightedSchemaProperty", + ) ) diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/histogram.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/histogram.py index 050a84c33719..ae9e63da1473 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/histogram.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/histogram.py @@ -109,6 +109,7 @@ class HistogramYAxis(proto.Enum): HISTOGRAM_YAXIS_PROPERTY (1): Count the properties per property name. """ + HISTOGRAM_YAXIS_DOCUMENT = 0 HISTOGRAM_YAXIS_PROPERTY = 1 diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/pipelines.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/pipelines.py index 175bd1a43f24..55a1d8db7abb 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/pipelines.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/pipelines.py @@ -197,12 +197,12 @@ class IndividualDocumentStatus(proto.Message): message=ProcessWithDocAiPipelineMetadata, ) ) - individual_document_statuses: MutableSequence[ - IndividualDocumentStatus - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=IndividualDocumentStatus, + individual_document_statuses: MutableSequence[IndividualDocumentStatus] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=IndividualDocumentStatus, + ) ) diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/rule_engine.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/rule_engine.py index 1e936ddb19ea..c44e833b9fe8 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/rule_engine.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/rule_engine.py @@ -118,6 +118,7 @@ class TriggerType(proto.Enum): ON_DELETE_LINK (8): Trigger for delete link action. """ + UNKNOWN = 0 ON_CREATE = 1 ON_UPDATE = 4 @@ -271,6 +272,7 @@ class OperationType(proto.Enum): Replaces existing policy bindings with the given policy binding list """ + UNKNOWN = 0 ADD_POLICY_BINDING = 1 REMOVE_POLICY_BINDING = 2 @@ -561,6 +563,7 @@ class State(proto.Enum): ACTION_PENDING (4): State indicating action is pending. """ + UNKNOWN = 0 ACTION_SUCCEEDED = 1 ACTION_FAILED = 2 diff --git a/packages/google-cloud-contentwarehouse/mypy.ini b/packages/google-cloud-contentwarehouse/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-contentwarehouse/mypy.ini +++ b/packages/google-cloud-contentwarehouse/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-contentwarehouse/noxfile.py b/packages/google-cloud-contentwarehouse/noxfile.py index 9e436274e63b..4236c57f4bb2 100644 --- a/packages/google-cloud-contentwarehouse/noxfile.py +++ b/packages/google-cloud-contentwarehouse/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_link_service.py b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_link_service.py index 53ba735a0786..c6af2ce1b655 100644 --- a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_link_service.py +++ b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_link_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_link_service import ( DocumentLinkServiceAsyncClient, @@ -998,10 +1003,9 @@ def test_document_link_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1050,9 @@ def test_document_link_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1088,9 @@ def test_document_link_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1348,9 +1350,7 @@ def test_document_link_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1464,9 +1464,9 @@ def test_list_linked_targets_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_linked_targets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_linked_targets] = ( + mock_rpc + ) request = {} client.list_linked_targets(request) @@ -1808,9 +1808,9 @@ def test_list_linked_sources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_linked_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_linked_sources] = ( + mock_rpc + ) request = {} client.list_linked_sources(request) @@ -2356,9 +2356,9 @@ def test_create_document_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_document_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_document_link] = ( + mock_rpc + ) request = {} client.create_document_link(request) @@ -2709,9 +2709,9 @@ def test_delete_document_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_document_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_document_link] = ( + mock_rpc + ) request = {} client.delete_document_link(request) @@ -2974,9 +2974,9 @@ def test_list_linked_targets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_linked_targets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_linked_targets] = ( + mock_rpc + ) request = {} client.list_linked_targets(request) @@ -3161,9 +3161,9 @@ def test_list_linked_sources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_linked_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_linked_sources] = ( + mock_rpc + ) request = {} client.list_linked_sources(request) @@ -3413,9 +3413,9 @@ def test_create_document_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_document_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_document_link] = ( + mock_rpc + ) request = {} client.create_document_link(request) @@ -3608,9 +3608,9 @@ def test_delete_document_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_document_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_document_link] = ( + mock_rpc + ) request = {} client.delete_document_link(request) diff --git a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_schema_service.py b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_schema_service.py index 7257704f2e35..82e6936aae42 100644 --- a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_schema_service.py +++ b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_schema_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_schema_service import ( DocumentSchemaServiceAsyncClient, @@ -60,11 +65,13 @@ pagers, transports, ) +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1000,10 +1007,9 @@ def test_document_schema_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1048,10 +1054,9 @@ def test_document_schema_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1087,10 +1092,9 @@ def test_document_schema_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1350,9 +1354,7 @@ def test_document_schema_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1472,9 +1474,9 @@ def test_create_document_schema_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_document_schema] = ( + mock_rpc + ) request = {} client.create_document_schema(request) @@ -1837,9 +1839,9 @@ def test_update_document_schema_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_document_schema] = ( + mock_rpc + ) request = {} client.update_document_schema(request) @@ -2201,9 +2203,9 @@ def test_get_document_schema_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_document_schema] = ( + mock_rpc + ) request = {} client.get_document_schema(request) @@ -2547,9 +2549,9 @@ def test_delete_document_schema_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_document_schema] = ( + mock_rpc + ) request = {} client.delete_document_schema(request) @@ -2883,9 +2885,9 @@ def test_list_document_schemas_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_document_schemas - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_document_schemas] = ( + mock_rpc + ) request = {} client.list_document_schemas(request) @@ -3360,9 +3362,9 @@ def test_create_document_schema_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_document_schema] = ( + mock_rpc + ) request = {} client.create_document_schema(request) @@ -3554,9 +3556,9 @@ def test_update_document_schema_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_document_schema] = ( + mock_rpc + ) request = {} client.update_document_schema(request) @@ -3749,9 +3751,9 @@ def test_get_document_schema_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_document_schema] = ( + mock_rpc + ) request = {} client.get_document_schema(request) @@ -3934,9 +3936,9 @@ def test_delete_document_schema_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_document_schema] = ( + mock_rpc + ) request = {} client.delete_document_schema(request) @@ -4114,9 +4116,9 @@ def test_list_document_schemas_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_document_schemas - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_document_schemas] = ( + mock_rpc + ) request = {} client.list_document_schemas(request) diff --git a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_service.py b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_service.py index 170d5da88506..e5c79617c6e6 100644 --- a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_service.py +++ b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,21 +43,9 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.cloud.documentai_v1.types import barcode -from google.cloud.documentai_v1.types import document -from google.cloud.documentai_v1.types import document as gcd_document -from google.cloud.documentai_v1.types import geometry import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.longrunning.operations_pb2 as operations_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.any_pb2 as any_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore @@ -71,6 +59,21 @@ import google.type.interval_pb2 as interval_pb2 # type: ignore import google.type.money_pb2 as money_pb2 # type: ignore import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.cloud.documentai_v1.types import barcode, document, geometry +from google.cloud.documentai_v1.types import document as gcd_document +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account from google.cloud.contentwarehouse_v1.services.document_service import ( DocumentServiceAsyncClient, @@ -79,13 +82,13 @@ transports, ) from google.cloud.contentwarehouse_v1.types import ( + common, document_service, document_service_request, filters, histogram, rule_engine, ) -from google.cloud.contentwarehouse_v1.types import common from google.cloud.contentwarehouse_v1.types import document as gcc_document CRED_INFO_JSON = { @@ -997,10 +1000,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1047,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1084,10 +1085,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1334,9 +1334,7 @@ def test_document_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2811,9 +2809,9 @@ def test_search_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_documents] = ( + mock_rpc + ) request = {} client.search_documents(request) @@ -5047,9 +5045,9 @@ def test_search_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_documents] = ( + mock_rpc + ) request = {} client.search_documents(request) diff --git a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_pipeline_service.py b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_pipeline_service.py index 8498c6e9ca4a..ef56b171ddab 100644 --- a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_pipeline_service.py +++ b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_pipeline_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.pipeline_service import ( PipelineServiceAsyncClient, @@ -980,10 +980,9 @@ def test_pipeline_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1027,9 @@ def test_pipeline_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1067,10 +1065,9 @@ def test_pipeline_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1317,9 +1314,7 @@ def test_pipeline_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_rule_set_service.py b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_rule_set_service.py index e67613ab7305..b64401d96572 100644 --- a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_rule_set_service.py +++ b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_rule_set_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.rule_set_service import ( RuleSetServiceAsyncClient, @@ -952,10 +957,9 @@ def test_rule_set_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1000,10 +1004,9 @@ def test_rule_set_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1042,9 @@ def test_rule_set_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1289,9 +1291,7 @@ def test_rule_set_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_synonym_set_service.py b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_synonym_set_service.py index 879f13df704a..28e0a60f7185 100644 --- a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_synonym_set_service.py +++ b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_synonym_set_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -982,10 +987,9 @@ def test_synonym_set_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1034,9 @@ def test_synonym_set_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1069,10 +1072,9 @@ def test_synonym_set_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1324,9 +1326,7 @@ def test_synonym_set_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1441,9 +1441,9 @@ def test_create_synonym_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_synonym_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_synonym_set] = ( + mock_rpc + ) request = {} client.create_synonym_set(request) @@ -2125,9 +2125,9 @@ def test_update_synonym_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_synonym_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_synonym_set] = ( + mock_rpc + ) request = {} client.update_synonym_set(request) @@ -2476,9 +2476,9 @@ def test_delete_synonym_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_synonym_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_synonym_set] = ( + mock_rpc + ) request = {} client.delete_synonym_set(request) @@ -2809,9 +2809,9 @@ def test_list_synonym_sets_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_synonym_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_synonym_sets] = ( + mock_rpc + ) request = {} client.list_synonym_sets(request) @@ -3285,9 +3285,9 @@ def test_create_synonym_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_synonym_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_synonym_set] = ( + mock_rpc + ) request = {} client.create_synonym_set(request) @@ -3658,9 +3658,9 @@ def test_update_synonym_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_synonym_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_synonym_set] = ( + mock_rpc + ) request = {} client.update_synonym_set(request) @@ -3853,9 +3853,9 @@ def test_delete_synonym_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_synonym_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_synonym_set] = ( + mock_rpc + ) request = {} client.delete_synonym_set(request) @@ -4030,9 +4030,9 @@ def test_list_synonym_sets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_synonym_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_synonym_sets] = ( + mock_rpc + ) request = {} client.list_synonym_sets(request) diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/__init__.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/__init__.py index 2b048c229179..e49e3ed4823b 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/__init__.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_fusion import DataFusionAsyncClient, DataFusionClient from .types.datafusion import ( Accelerator, diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/async_client.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/async_client.py index 74a1b51bf979..92e47c8fa1ae 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/async_client.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.data_fusion_v1 import gapic_version as package_version @@ -118,7 +118,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataFusionAsyncClient: The constructed client. """ - return DataFusionClient.from_service_account_info.__func__(DataFusionAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataFusionClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataFusionAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +137,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataFusionAsyncClient: The constructed client. """ - return DataFusionClient.from_service_account_file.__func__(DataFusionAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataFusionClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataFusionAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/client.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/client.py index 6aaa99a25a30..8add7c61eded 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/client.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.data_fusion_v1 import gapic_version as package_version @@ -651,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataFusionClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataFusionClient._read_environment_variables() + ) self._client_cert_source = DataFusionClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -690,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataFusionTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/pagers.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/pagers.py index 8630f2395c7e..e2039b696673 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/pagers.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/base.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/base.py index b1c3607e7c1b..1fd204cf3e15 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/base.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.data_fusion_v1 import gapic_version as package_version from google.cloud.data_fusion_v1.types import datafusion diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc.py index d37775293fd7..3a281ce3e74d 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.data_fusion_v1.types import datafusion diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc_asyncio.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc_asyncio.py index bca45e95e51c..313603d506ab 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc_asyncio.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.data_fusion_v1.types import datafusion diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/rest.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/rest.py index 8d9ea847efaa..a25aa3df9635 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/rest.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1126,9 +1126,7 @@ def __call__( """ - http_options = ( - _BaseDataFusionRestTransport._BaseListAvailableVersions._get_http_options() - ) + http_options = _BaseDataFusionRestTransport._BaseListAvailableVersions._get_http_options() request, metadata = self._interceptor.pre_list_available_versions( request, metadata diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/types/datafusion.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/types/datafusion.py index 57c353d0a980..f29b334daa5c 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/types/datafusion.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/types/datafusion.py @@ -111,6 +111,7 @@ class Type(proto.Enum): TYPE_GENERAL_AVAILABILITY (2): Version is available for public use """ + TYPE_UNSPECIFIED = 0 TYPE_PREVIEW = 1 TYPE_GENERAL_AVAILABILITY = 2 @@ -164,6 +165,7 @@ class AcceleratorType(proto.Enum): export pipelines custom built to streamline CCAI Insights processing. """ + ACCELERATOR_TYPE_UNSPECIFIED = 0 CDC = 1 HEALTHCARE = 2 @@ -186,6 +188,7 @@ class State(proto.Enum): unknown. Requests for enable, disable could be retried while in this state """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -347,6 +350,7 @@ class Type(proto.Enum): help enterprises design and develop their data ingestion and integration pipelines at low cost. """ + TYPE_UNSPECIFIED = 0 BASIC = 1 ENTERPRISE = 2 @@ -381,6 +385,7 @@ class State(proto.Enum): DISABLED (10): Instance is disabled """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -404,6 +409,7 @@ class DisabledReason(proto.Enum): The KMS key used by the instance is either revoked or denied access to """ + DISABLED_REASON_UNSPECIFIED = 0 KMS_KEY_ISSUE = 1 diff --git a/packages/google-cloud-data-fusion/mypy.ini b/packages/google-cloud-data-fusion/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-data-fusion/mypy.ini +++ b/packages/google-cloud-data-fusion/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-data-fusion/noxfile.py b/packages/google-cloud-data-fusion/noxfile.py index f14d82990c52..9db4f3496c28 100644 --- a/packages/google-cloud-data-fusion/noxfile.py +++ b/packages/google-cloud-data-fusion/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-data-fusion/tests/unit/gapic/data_fusion_v1/test_data_fusion.py b/packages/google-cloud-data-fusion/tests/unit/gapic/data_fusion_v1/test_data_fusion.py index 8dc9cc50b5b2..22b24d264e14 100644 --- a/packages/google-cloud-data-fusion/tests/unit/gapic/data_fusion_v1/test_data_fusion.py +++ b/packages/google-cloud-data-fusion/tests/unit/gapic/data_fusion_v1/test_data_fusion.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.data_fusion_v1.services.data_fusion import ( DataFusionAsyncClient, @@ -931,10 +931,9 @@ def test_data_fusion_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +978,9 @@ def test_data_fusion_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1016,9 @@ def test_data_fusion_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1254,9 +1251,7 @@ def test_data_fusion_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3680,9 +3675,9 @@ def test_restart_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) @@ -5007,9 +5002,9 @@ def test_restart_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/__init__.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/__init__.py index 5da0fd1ededf..c50a1d4b0b19 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/__init__.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.auto_suggestion_service import ( AutoSuggestionServiceAsyncClient, AutoSuggestionServiceClient, diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/async_client.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/async_client.py index 23766b184736..42059b7e257c 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/async_client.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataqna_v1alpha import gapic_version as package_version @@ -183,7 +183,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AutoSuggestionServiceAsyncClient: The constructed client. """ - return AutoSuggestionServiceClient.from_service_account_info.__func__(AutoSuggestionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AutoSuggestionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AutoSuggestionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -199,7 +202,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AutoSuggestionServiceAsyncClient: The constructed client. """ - return AutoSuggestionServiceClient.from_service_account_file.__func__(AutoSuggestionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AutoSuggestionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AutoSuggestionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -237,7 +243,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AutoSuggestionServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AutoSuggestionServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AutoSuggestionServiceTransport: diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py index 011d0d9be8ff..8e4c822fa793 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataqna_v1alpha import gapic_version as package_version @@ -77,9 +77,7 @@ class AutoSuggestionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AutoSuggestionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AutoSuggestionServiceTransport]] _transport_registry["grpc"] = AutoSuggestionServiceGrpcTransport _transport_registry["grpc_asyncio"] = AutoSuggestionServiceGrpcAsyncIOTransport _transport_registry["rest"] = AutoSuggestionServiceRestTransport @@ -677,11 +675,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutoSuggestionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutoSuggestionServiceClient._read_environment_variables() + ) self._client_cert_source = AutoSuggestionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -716,8 +712,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutoSuggestionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/__init__.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/__init__.py index aa1b8a2340cf..1d4f163027e7 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/__init__.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AutoSuggestionServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AutoSuggestionServiceTransport]] _transport_registry["grpc"] = AutoSuggestionServiceGrpcTransport _transport_registry["grpc_asyncio"] = AutoSuggestionServiceGrpcAsyncIOTransport _transport_registry["rest"] = AutoSuggestionServiceRestTransport diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/base.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/base.py index 3384fe0331d9..005668481edb 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/base.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataqna_v1alpha import gapic_version as package_version from google.cloud.dataqna_v1alpha.types import auto_suggestion_service diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc.py index dbf95c540193..1cc0449e7792 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataqna_v1alpha.types import auto_suggestion_service diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc_asyncio.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc_asyncio.py index 173fdc074d9d..2ae7173d3cb9 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataqna_v1alpha.types import auto_suggestion_service diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/rest.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/rest.py index 06eba9e4e933..66e85fa23767 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/rest.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -356,9 +356,7 @@ def __call__( Response to SuggestQueries. """ - http_options = ( - _BaseAutoSuggestionServiceRestTransport._BaseSuggestQueries._get_http_options() - ) + http_options = _BaseAutoSuggestionServiceRestTransport._BaseSuggestQueries._get_http_options() request, metadata = self._interceptor.pre_suggest_queries(request, metadata) transcoded_request = _BaseAutoSuggestionServiceRestTransport._BaseSuggestQueries._get_transcoded_request( diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/async_client.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/async_client.py index ce10e9d06a39..665b6016a2ae 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/async_client.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataqna_v1alpha import gapic_version as package_version @@ -48,11 +48,9 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import question, question_service, user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback from .client import QuestionServiceClient from .transports.base import DEFAULT_CLIENT_INFO, QuestionServiceTransport @@ -141,7 +139,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: QuestionServiceAsyncClient: The constructed client. """ - return QuestionServiceClient.from_service_account_info.__func__(QuestionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + QuestionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(QuestionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +158,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: QuestionServiceAsyncClient: The constructed client. """ - return QuestionServiceClient.from_service_account_file.__func__(QuestionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + QuestionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(QuestionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/client.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/client.py index 4cd3f2d8ab9d..b3ad137f2fda 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/client.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataqna_v1alpha import gapic_version as package_version @@ -65,11 +65,9 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import question, question_service, user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback from .transports.base import DEFAULT_CLIENT_INFO, QuestionServiceTransport from .transports.grpc import QuestionServiceGrpcTransport @@ -85,9 +83,7 @@ class QuestionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[QuestionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[QuestionServiceTransport]] _transport_registry["grpc"] = QuestionServiceGrpcTransport _transport_registry["grpc_asyncio"] = QuestionServiceGrpcAsyncIOTransport _transport_registry["rest"] = QuestionServiceRestTransport @@ -671,11 +667,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = QuestionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + QuestionServiceClient._read_environment_variables() + ) self._client_cert_source = QuestionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -710,8 +704,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(QuestionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/base.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/base.py index c0d09dc2cc2f..6e2bb8e8783d 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/base.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/base.py @@ -17,20 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataqna_v1alpha import gapic_version as package_version -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import question, question_service, user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc.py index a220a5cd65f2..8c40bee0dfb2 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc.py @@ -16,23 +16,21 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import question, question_service, user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback from .base import DEFAULT_CLIENT_INFO, QuestionServiceTransport diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc_asyncio.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc_asyncio.py index 3fae7d0f9c2f..b342353bd45c 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc_asyncio.py @@ -17,25 +17,23 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import question, question_service, user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback from .base import DEFAULT_CLIENT_INFO, QuestionServiceTransport from .grpc import QuestionServiceGrpcTransport diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest.py index a0f7afb46eea..6e15c7087d31 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest.py @@ -16,23 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import question, question_service, user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseQuestionServiceRestTransport @@ -528,9 +526,7 @@ def __call__( """ - http_options = ( - _BaseQuestionServiceRestTransport._BaseCreateQuestion._get_http_options() - ) + http_options = _BaseQuestionServiceRestTransport._BaseCreateQuestion._get_http_options() request, metadata = self._interceptor.pre_create_question(request, metadata) transcoded_request = _BaseQuestionServiceRestTransport._BaseCreateQuestion._get_transcoded_request( @@ -683,9 +679,7 @@ def __call__( """ - http_options = ( - _BaseQuestionServiceRestTransport._BaseExecuteQuestion._get_http_options() - ) + http_options = _BaseQuestionServiceRestTransport._BaseExecuteQuestion._get_http_options() request, metadata = self._interceptor.pre_execute_question( request, metadata @@ -984,9 +978,7 @@ def __call__( Feedback provided by a user. """ - http_options = ( - _BaseQuestionServiceRestTransport._BaseGetUserFeedback._get_http_options() - ) + http_options = _BaseQuestionServiceRestTransport._BaseGetUserFeedback._get_http_options() request, metadata = self._interceptor.pre_get_user_feedback( request, metadata @@ -1132,9 +1124,7 @@ def __call__( Feedback provided by a user. """ - http_options = ( - _BaseQuestionServiceRestTransport._BaseUpdateUserFeedback._get_http_options() - ) + http_options = _BaseQuestionServiceRestTransport._BaseUpdateUserFeedback._get_http_options() request, metadata = self._interceptor.pre_update_user_feedback( request, metadata diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest_base.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest_base.py index d68aff1fb291..1a86301ed8de 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest_base.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest_base.py @@ -20,11 +20,9 @@ from google.api_core import gapic_v1, path_template from google.protobuf import json_format -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import question, question_service, user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback from .base import DEFAULT_CLIENT_INFO, QuestionServiceTransport diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/__init__.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/__init__.py index 09f1e57b9bb0..0aaa6654e0a3 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/__init__.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .annotated_string import AnnotatedString +from .annotated_string import ( + AnnotatedString, +) from .auto_suggestion_service import ( Suggestion, SuggestionInfo, @@ -40,7 +42,9 @@ GetUserFeedbackRequest, UpdateUserFeedbackRequest, ) -from .user_feedback import UserFeedback +from .user_feedback import ( + UserFeedback, +) __all__ = ( "AnnotatedString", diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/annotated_string.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/annotated_string.py index a1299cb37ca0..2d5b0a775ae8 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/annotated_string.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/annotated_string.py @@ -89,6 +89,7 @@ class SemanticMarkupType(proto.Enum): Markup for a substring that contains terms for row. """ + MARKUP_TYPE_UNSPECIFIED = 0 METRIC = 1 DIMENSION = 2 diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/auto_suggestion_service.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/auto_suggestion_service.py index df52385b6699..d5e758844a8b 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/auto_suggestion_service.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/auto_suggestion_service.py @@ -46,6 +46,7 @@ class SuggestionType(proto.Enum): Template suggestion type. Suggestions are for full sentences. """ + SUGGESTION_TYPE_UNSPECIFIED = 0 ENTITY = 1 TEMPLATE = 2 diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question.py index 0b11d7ae240e..a5d2496e3da9 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question.py @@ -52,6 +52,7 @@ class InterpretEntity(proto.Enum): METRIC (2): A metric entity. """ + INTERPRET_ENTITY_UNSPECIFIED = 0 DIMENSION = 1 METRIC = 2 @@ -195,6 +196,7 @@ class InterpretErrorCode(proto.Enum): answer. For example, because a requested operation is not supported. """ + INTERPRET_ERROR_CODE_UNSPECIFIED = 0 INVALID_QUERY = 1 FAILED_TO_UNDERSTAND = 2 @@ -321,6 +323,7 @@ class JobExecutionState(proto.Enum): FAILED (4): The job completed unsuccessfully. """ + JOB_EXECUTION_STATE_UNSPECIFIED = 0 NOT_EXECUTED = 1 RUNNING = 2 @@ -550,6 +553,7 @@ class VisualizationType(proto.Enum): may give a hint to the user that the requested type was not understood. """ + VISUALIZATION_TYPE_UNSPECIFIED = 0 TABLE = 1 BAR_CHART = 2 diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question_service.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question_service.py index 8b6afe93a8e7..2ec8d2148c43 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question_service.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question_service.py @@ -20,8 +20,8 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback __protobuf__ = proto.module( package="google.cloud.dataqna.v1alpha", diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/user_feedback.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/user_feedback.py index 2be397a8c9ff..53499bb90a00 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/user_feedback.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/user_feedback.py @@ -52,6 +52,7 @@ class UserFeedbackRating(proto.Enum): NEGATIVE (2): The user provided negative feedback. """ + USER_FEEDBACK_RATING_UNSPECIFIED = 0 POSITIVE = 1 NEGATIVE = 2 diff --git a/packages/google-cloud-data-qna/mypy.ini b/packages/google-cloud-data-qna/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-data-qna/mypy.ini +++ b/packages/google-cloud-data-qna/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-data-qna/noxfile.py b/packages/google-cloud-data-qna/noxfile.py index 116b3d22e474..065417e6416a 100644 --- a/packages/google-cloud-data-qna/noxfile.py +++ b/packages/google-cloud-data-qna/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py b/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py index 81cd89d4824e..5662670bdc23 100644 --- a/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py +++ b/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -993,10 +998,9 @@ def test_auto_suggestion_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1045,9 @@ def test_auto_suggestion_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1083,9 @@ def test_auto_suggestion_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1343,9 +1345,7 @@ def test_auto_suggestion_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_question_service.py b/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_question_service.py index 76b8834844e1..9e567a45518d 100644 --- a/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_question_service.py +++ b/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_question_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,30 +43,37 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.oauth2 import service_account 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.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.dataqna_v1alpha.services.question_service import ( QuestionServiceAsyncClient, QuestionServiceClient, transports, ) -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import annotated_string -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import ( + annotated_string, + question, + question_service, + user_feedback, +) from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -977,10 +984,9 @@ def test_question_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1031,9 @@ def test_question_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1064,10 +1069,9 @@ def test_question_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1314,9 +1318,7 @@ def test_question_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2115,9 +2117,9 @@ def test_execute_question_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.execute_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.execute_question] = ( + mock_rpc + ) request = {} client.execute_question(request) @@ -2463,9 +2465,9 @@ def test_get_user_feedback_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_user_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_user_feedback] = ( + mock_rpc + ) request = {} client.get_user_feedback(request) @@ -2809,9 +2811,9 @@ def test_update_user_feedback_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_user_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_user_feedback] = ( + mock_rpc + ) request = {} client.update_user_feedback(request) @@ -3466,9 +3468,9 @@ def test_execute_question_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.execute_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.execute_question] = ( + mock_rpc + ) request = {} client.execute_question(request) @@ -3663,9 +3665,9 @@ def test_get_user_feedback_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_user_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_user_feedback] = ( + mock_rpc + ) request = {} client.get_user_feedback(request) @@ -3847,9 +3849,9 @@ def test_update_user_feedback_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_user_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_user_feedback] = ( + mock_rpc + ) request = {} client.update_user_feedback(request) diff --git a/packages/google-cloud-databasecenter/CHANGELOG.md b/packages/google-cloud-databasecenter/CHANGELOG.md index aea783b40a06..69c7a88bb8cf 100644 --- a/packages/google-cloud-databasecenter/CHANGELOG.md +++ b/packages/google-cloud-databasecenter/CHANGELOG.md @@ -4,6 +4,24 @@ [1]: https://pypi.org/project/google-cloud-databasecenter/#history +## [0.5.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-databasecenter-v0.4.0...google-cloud-databasecenter-v0.5.0) (2026-02-12) + + +### Documentation + +* A comment for field `filter` in message `.google.cloud.databasecenter.v1beta.AggregateFleetRequest` is changed ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A comment for field `maintenance_version` in message `.google.cloud.databasecenter.v1beta.MaintenanceInfo` is changed ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A comment for field `order_by` in message `.google.cloud.databasecenter.v1beta.QueryDatabaseResourceGroupsRequest` is changed ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A comment for field `filter` in message `.google.cloud.databasecenter.v1beta.QueryDatabaseResourceGroupsRequest` is changed ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A comment for field `filter` in message `.google.cloud.databasecenter.v1beta.AggregateIssueStatsRequest` is changed ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A comment for message `AggregateFleetResponse` is changed ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A comment for field `order_by` in message `.google.cloud.databasecenter.v1beta.AggregateFleetRequest` is changed ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) + + +### Features + +* Adding Method QueryIssues of Database Center API v1beta ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) + ## [0.4.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-databasecenter-v0.3.0...google-cloud-databasecenter-v0.4.0) (2026-01-22) diff --git a/packages/google-cloud-databasecenter/docs/CHANGELOG.md b/packages/google-cloud-databasecenter/docs/CHANGELOG.md index aea783b40a06..69c7a88bb8cf 100644 --- a/packages/google-cloud-databasecenter/docs/CHANGELOG.md +++ b/packages/google-cloud-databasecenter/docs/CHANGELOG.md @@ -4,6 +4,24 @@ [1]: https://pypi.org/project/google-cloud-databasecenter/#history +## [0.5.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-databasecenter-v0.4.0...google-cloud-databasecenter-v0.5.0) (2026-02-12) + + +### Documentation + +* A comment for field `filter` in message `.google.cloud.databasecenter.v1beta.AggregateFleetRequest` is changed ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A comment for field `maintenance_version` in message `.google.cloud.databasecenter.v1beta.MaintenanceInfo` is changed ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A comment for field `order_by` in message `.google.cloud.databasecenter.v1beta.QueryDatabaseResourceGroupsRequest` is changed ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A comment for field `filter` in message `.google.cloud.databasecenter.v1beta.QueryDatabaseResourceGroupsRequest` is changed ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A comment for field `filter` in message `.google.cloud.databasecenter.v1beta.AggregateIssueStatsRequest` is changed ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A comment for message `AggregateFleetResponse` is changed ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A comment for field `order_by` in message `.google.cloud.databasecenter.v1beta.AggregateFleetRequest` is changed ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) + + +### Features + +* Adding Method QueryIssues of Database Center API v1beta ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) + ## [0.4.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-databasecenter-v0.3.0...google-cloud-databasecenter-v0.4.0) (2026-01-22) diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter/gapic_version.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter/gapic_version.py index fd79d4e761b7..8ac041756ac7 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter/gapic_version.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.4.0" # {x-release-please-version} +__version__ = "0.5.0" # {x-release-please-version} diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/__init__.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/__init__.py index d9215ea96b0c..5c82994384d0 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/__init__.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.database_center import DatabaseCenterAsyncClient, DatabaseCenterClient from .types.machine_config import MachineConfig from .types.maintenance import ( diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/gapic_version.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/gapic_version.py index fd79d4e761b7..8ac041756ac7 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/gapic_version.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.4.0" # {x-release-please-version} +__version__ = "0.5.0" # {x-release-please-version} diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/async_client.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/async_client.py index 8419dd0508f7..3422c999bb6e 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/async_client.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.databasecenter_v1beta import gapic_version as package_version @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DatabaseCenterAsyncClient: The constructed client. """ - return DatabaseCenterClient.from_service_account_info.__func__(DatabaseCenterAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DatabaseCenterClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DatabaseCenterAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DatabaseCenterAsyncClient: The constructed client. """ - return DatabaseCenterClient.from_service_account_file.__func__(DatabaseCenterAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DatabaseCenterClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DatabaseCenterAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/client.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/client.py index d8ad7a597153..c75abee343b1 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/client.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.databasecenter_v1beta import gapic_version as package_version @@ -78,9 +78,7 @@ class DatabaseCenterClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DatabaseCenterTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DatabaseCenterTransport]] _transport_registry["grpc"] = DatabaseCenterGrpcTransport _transport_registry["grpc_asyncio"] = DatabaseCenterGrpcAsyncIOTransport _transport_registry["rest"] = DatabaseCenterRestTransport @@ -600,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DatabaseCenterClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DatabaseCenterClient._read_environment_variables() + ) self._client_cert_source = DatabaseCenterClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -639,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DatabaseCenterTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/pagers.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/pagers.py index b365ab8e80e8..0b0a77ee9a10 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/pagers.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/base.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/base.py index 5e2cc983a83e..9db010c1a324 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/base.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.databasecenter_v1beta import gapic_version as package_version from google.cloud.databasecenter_v1beta.types import service diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc.py index 9dff52cf1988..f1ff89583629 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.databasecenter_v1beta.types import service @@ -399,12 +399,12 @@ def query_database_resource_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_database_resource_groups" not in self._stubs: - self._stubs[ - "query_database_resource_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.databasecenter.v1beta.DatabaseCenter/QueryDatabaseResourceGroups", - request_serializer=service.QueryDatabaseResourceGroupsRequest.serialize, - response_deserializer=service.QueryDatabaseResourceGroupsResponse.deserialize, + self._stubs["query_database_resource_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.databasecenter.v1beta.DatabaseCenter/QueryDatabaseResourceGroups", + request_serializer=service.QueryDatabaseResourceGroupsRequest.serialize, + response_deserializer=service.QueryDatabaseResourceGroupsResponse.deserialize, + ) ) return self._stubs["query_database_resource_groups"] diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc_asyncio.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc_asyncio.py index ff526f668401..279c319655f3 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc_asyncio.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.databasecenter_v1beta.types import service @@ -411,12 +411,12 @@ def query_database_resource_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_database_resource_groups" not in self._stubs: - self._stubs[ - "query_database_resource_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.databasecenter.v1beta.DatabaseCenter/QueryDatabaseResourceGroups", - request_serializer=service.QueryDatabaseResourceGroupsRequest.serialize, - response_deserializer=service.QueryDatabaseResourceGroupsResponse.deserialize, + self._stubs["query_database_resource_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.databasecenter.v1beta.DatabaseCenter/QueryDatabaseResourceGroups", + request_serializer=service.QueryDatabaseResourceGroupsRequest.serialize, + response_deserializer=service.QueryDatabaseResourceGroupsResponse.deserialize, + ) ) return self._stubs["query_database_resource_groups"] diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/rest.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/rest.py index 2345e3da3625..bd143bdeb961 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/rest.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -655,9 +655,7 @@ def __call__( """ - http_options = ( - _BaseDatabaseCenterRestTransport._BaseAggregateIssueStats._get_http_options() - ) + http_options = _BaseDatabaseCenterRestTransport._BaseAggregateIssueStats._get_http_options() request, metadata = self._interceptor.pre_aggregate_issue_stats( request, metadata @@ -816,9 +814,7 @@ def __call__( """ - http_options = ( - _BaseDatabaseCenterRestTransport._BaseQueryDatabaseResourceGroups._get_http_options() - ) + http_options = _BaseDatabaseCenterRestTransport._BaseQueryDatabaseResourceGroups._get_http_options() request, metadata = self._interceptor.pre_query_database_resource_groups( request, metadata @@ -889,11 +885,10 @@ def __call__( resp = self._interceptor.post_query_database_resource_groups(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_database_resource_groups_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_database_resource_groups_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1247,7 +1242,9 @@ def query_database_resource_groups( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._QueryDatabaseResourceGroups(self._session, self._host, self._interceptor) # type: ignore + return self._QueryDatabaseResourceGroups( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_issues( diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/__init__.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/__init__.py index c67f4f58520a..366f0e7d679b 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/__init__.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/__init__.py @@ -13,16 +13,28 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .machine_config import MachineConfig +from .machine_config import ( + MachineConfig, +) from .maintenance import ( MaintenanceInfo, Phase, ResourceMaintenanceDenySchedule, ResourceMaintenanceSchedule, ) -from .metric_data import MetricData, Metrics, TypedValue -from .operation_error_type import OperationErrorType -from .product import Engine, Product, ProductType +from .metric_data import ( + MetricData, + Metrics, + TypedValue, +) +from .operation_error_type import ( + OperationErrorType, +) +from .product import ( + Engine, + Product, + ProductType, +) from .service import ( AggregateFleetRequest, AggregateFleetResponse, @@ -76,7 +88,9 @@ SignalTypeGroup, SubResource, ) -from .suspension_reason import SuspensionReason +from .suspension_reason import ( + SuspensionReason, +) __all__ = ( "MachineConfig", diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/maintenance.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/maintenance.py index 3add6c8b0451..55df658ebef4 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/maintenance.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/maintenance.py @@ -52,6 +52,7 @@ class Phase(proto.Enum): PHASE_ANY (4): Any phase. """ + PHASE_UNSPECIFIED = 0 PHASE_WEEK1 = 1 PHASE_WEEK2 = 2 @@ -153,12 +154,12 @@ class MaintenanceInfo(proto.Message): number=1, message="ResourceMaintenanceSchedule", ) - deny_maintenance_schedules: MutableSequence[ - "ResourceMaintenanceDenySchedule" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ResourceMaintenanceDenySchedule", + deny_maintenance_schedules: MutableSequence["ResourceMaintenanceDenySchedule"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ResourceMaintenanceDenySchedule", + ) ) maintenance_version: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/operation_error_type.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/operation_error_type.py index f09b98c6fb4e..4e51eca75dcf 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/operation_error_type.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/operation_error_type.py @@ -52,6 +52,7 @@ class OperationErrorType(proto.Enum): INTERNAL_ERROR (6): Any other internal error. """ + OPERATION_ERROR_TYPE_UNSPECIFIED = 0 KMS_KEY_ERROR = 1 DATABASE_ERROR = 2 diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/product.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/product.py index 048dc6db8a5e..04c74bb2144d 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/product.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/product.py @@ -68,6 +68,7 @@ class Engine(proto.Enum): engine. This is to be when engine is known, but it is not present in this enum. """ + ENGINE_UNSPECIFIED = 0 ENGINE_MYSQL = 1 ENGINE_POSTGRES = 2 @@ -115,6 +116,7 @@ class ProductType(proto.Enum): This is to be when product type is known, but it is not present in this enum. """ + PRODUCT_TYPE_UNSPECIFIED = 0 PRODUCT_TYPE_CLOUD_SQL = 1 PRODUCT_TYPE_ALLOYDB = 2 diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/service.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/service.py index 5aa50d944942..ae5ac218ff64 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/service.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/service.py @@ -23,9 +23,8 @@ from google.cloud.databasecenter_v1beta.types import ( machine_config as gcd_machine_config, ) -from google.cloud.databasecenter_v1beta.types import maintenance, metric_data +from google.cloud.databasecenter_v1beta.types import maintenance, metric_data, signals from google.cloud.databasecenter_v1beta.types import product as gcd_product -from google.cloud.databasecenter_v1beta.types import signals __protobuf__ = proto.module( package="google.cloud.databasecenter.v1beta", @@ -75,6 +74,7 @@ class ResourceCategory(proto.Enum): DATABASE (3): A resource that is a Database. """ + RESOURCE_CATEGORY_UNSPECIFIED = 0 INSTANCE = 1 CLUSTER = 2 @@ -96,6 +96,7 @@ class Edition(proto.Enum): EDITION_STANDARD (3): Represents the standard edition. """ + EDITION_UNSPECIFIED = 0 EDITION_ENTERPRISE = 1 EDITION_ENTERPRISE_PLUS = 2 @@ -119,6 +120,7 @@ class SubResourceType(proto.Enum): SUB_RESOURCE_TYPE_OTHER (4): For the rest of the categories. """ + SUB_RESOURCE_TYPE_UNSPECIFIED = 0 SUB_RESOURCE_TYPE_PRIMARY = 1 SUB_RESOURCE_TYPE_SECONDARY = 2 @@ -138,6 +140,7 @@ class ManagementType(proto.Enum): MANAGEMENT_TYPE_SELF_MANAGED (2): Self-managed resource. """ + MANAGEMENT_TYPE_UNSPECIFIED = 0 MANAGEMENT_TYPE_GCP_MANAGED = 1 MANAGEMENT_TYPE_SELF_MANAGED = 2 @@ -1352,12 +1355,12 @@ class QueryIssuesRequest(proto.Message): proto.STRING, number=2, ) - signal_products_filters: MutableSequence[ - "SignalProductsFilters" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SignalProductsFilters", + signal_products_filters: MutableSequence["SignalProductsFilters"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SignalProductsFilters", + ) ) order_by: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/signals.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/signals.py index b92de5f27f89..5aae7e8294af 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/signals.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/signals.py @@ -22,14 +22,14 @@ import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore +from google.cloud.databasecenter_v1beta.types import maintenance from google.cloud.databasecenter_v1beta.types import ( operation_error_type as gcd_operation_error_type, ) +from google.cloud.databasecenter_v1beta.types import product as gcd_product from google.cloud.databasecenter_v1beta.types import ( suspension_reason as gcd_suspension_reason, ) -from google.cloud.databasecenter_v1beta.types import maintenance -from google.cloud.databasecenter_v1beta.types import product as gcd_product __protobuf__ = proto.module( package="google.cloud.databasecenter.v1beta", @@ -76,6 +76,7 @@ class SignalStatus(proto.Enum): SIGNAL_STATUS_NOT_ENABLED (4): Signal is not enabled for the resource. """ + SIGNAL_STATUS_UNSPECIFIED = 0 SIGNAL_STATUS_NOT_APPLICABLE = 1 SIGNAL_STATUS_OK = 2 @@ -100,6 +101,7 @@ class SignalSource(proto.Enum): Signal comes from modern observability platform. """ + SIGNAL_SOURCE_UNSPECIFIED = 0 SIGNAL_SOURCE_RESOURCE_METADATA = 1 SIGNAL_SOURCE_SECURITY_FINDINGS = 2 @@ -125,6 +127,7 @@ class IssueSeverity(proto.Enum): Irrelevant severity. This means the issue should not be surfaced at all. """ + ISSUE_SEVERITY_UNSPECIFIED = 0 ISSUE_SEVERITY_LOW = 1 ISSUE_SEVERITY_MEDIUM = 2 @@ -436,6 +439,7 @@ class SignalType(proto.Enum): SIGNAL_TYPE_EXTENDED_SUPPORT (102): Resource version is in extended support. """ + SIGNAL_TYPE_UNSPECIFIED = 0 SIGNAL_TYPE_RESOURCE_FAILOVER_PROTECTED = 1 SIGNAL_TYPE_GROUP_MULTIREGIONAL = 2 @@ -1020,6 +1024,7 @@ class State(proto.Enum): FAILED (2): The backup was unsuccessful. """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/suspension_reason.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/suspension_reason.py index 30bfc76cfa56..ef1be766a62c 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/suspension_reason.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/suspension_reason.py @@ -47,6 +47,7 @@ class SuspensionReason(proto.Enum): Replicated cluster encryption key inaccessible. """ + SUSPENSION_REASON_UNSPECIFIED = 0 WIPEOUT_HIDE_EVENT = 1 WIPEOUT_PURGE_EVENT = 2 diff --git a/packages/google-cloud-databasecenter/mypy.ini b/packages/google-cloud-databasecenter/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-databasecenter/mypy.ini +++ b/packages/google-cloud-databasecenter/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-databasecenter/noxfile.py b/packages/google-cloud-databasecenter/noxfile.py index 1f83e324e9dd..538fa8d95699 100644 --- a/packages/google-cloud-databasecenter/noxfile.py +++ b/packages/google-cloud-databasecenter/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-databasecenter/samples/generated_samples/snippet_metadata_google.cloud.databasecenter.v1beta.json b/packages/google-cloud-databasecenter/samples/generated_samples/snippet_metadata_google.cloud.databasecenter.v1beta.json index 39fd925d2700..5af5f419f55f 100644 --- a/packages/google-cloud-databasecenter/samples/generated_samples/snippet_metadata_google.cloud.databasecenter.v1beta.json +++ b/packages/google-cloud-databasecenter/samples/generated_samples/snippet_metadata_google.cloud.databasecenter.v1beta.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-databasecenter", - "version": "0.4.0" + "version": "0.5.0" }, "snippets": [ { diff --git a/packages/google-cloud-databasecenter/tests/unit/gapic/databasecenter_v1beta/test_database_center.py b/packages/google-cloud-databasecenter/tests/unit/gapic/databasecenter_v1beta/test_database_center.py index 146e051cdd6c..6188a26dc3c8 100644 --- a/packages/google-cloud-databasecenter/tests/unit/gapic/databasecenter_v1beta/test_database_center.py +++ b/packages/google-cloud-databasecenter/tests/unit/gapic/databasecenter_v1beta/test_database_center.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.type.date_pb2 as date_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.databasecenter_v1beta.services.database_center import ( DatabaseCenterAsyncClient, @@ -946,10 +951,9 @@ def test_database_center_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +998,9 @@ def test_database_center_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1036,9 @@ def test_database_center_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1283,9 +1285,7 @@ def test_database_center_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2576,9 +2576,9 @@ def test_aggregate_issue_stats_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.aggregate_issue_stats - ] = mock_rpc + client._transport._wrapped_methods[client._transport.aggregate_issue_stats] = ( + mock_rpc + ) request = {} client.aggregate_issue_stats(request) @@ -3779,9 +3779,9 @@ def test_aggregate_issue_stats_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.aggregate_issue_stats - ] = mock_rpc + client._transport._wrapped_methods[client._transport.aggregate_issue_stats] = ( + mock_rpc + ) request = {} client.aggregate_issue_stats(request) diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/__init__.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/__init__.py index d38c332dd341..d805d31185ab 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/__init__.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.lineage import LineageAsyncClient, LineageClient from .types.lineage import ( BatchSearchLinkProcessesRequest, diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/async_client.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/async_client.py index 588fde72f12d..1ae0a7f007ee 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/async_client.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_lineage_v1 import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_lineage_v1.services.lineage import pagers from google.cloud.datacatalog_lineage_v1.types import lineage @@ -122,7 +122,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: LineageAsyncClient: The constructed client. """ - return LineageClient.from_service_account_info.__func__(LineageAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + LineageClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(LineageAsyncClient, 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: LineageAsyncClient: The constructed client. """ - return LineageClient.from_service_account_file.__func__(LineageAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + LineageClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(LineageAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/client.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/client.py index f7fc420db56e..501eafd2add4 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/client.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_lineage_v1 import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_lineage_v1.services.lineage import pagers from google.cloud.datacatalog_lineage_v1.types import lineage @@ -681,11 +681,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LineageClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LineageClient._read_environment_variables() + ) self._client_cert_source = LineageClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -720,8 +718,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LineageTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/pagers.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/pagers.py index 54320fbc2b96..ad88d0c761ce 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/pagers.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/base.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/base.py index 758414ae2217..a04716fdf230 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/base.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.datacatalog_lineage_v1 import gapic_version as package_version from google.cloud.datacatalog_lineage_v1.types import lineage @@ -439,13 +439,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc.py index 06bd76318de5..7600bd83a57b 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.datacatalog_lineage_v1.types import lineage @@ -371,12 +371,12 @@ def process_open_lineage_run_event( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "process_open_lineage_run_event" not in self._stubs: - self._stubs[ - "process_open_lineage_run_event" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.lineage.v1.Lineage/ProcessOpenLineageRunEvent", - request_serializer=lineage.ProcessOpenLineageRunEventRequest.serialize, - response_deserializer=lineage.ProcessOpenLineageRunEventResponse.deserialize, + self._stubs["process_open_lineage_run_event"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.lineage.v1.Lineage/ProcessOpenLineageRunEvent", + request_serializer=lineage.ProcessOpenLineageRunEventRequest.serialize, + response_deserializer=lineage.ProcessOpenLineageRunEventResponse.deserialize, + ) ) return self._stubs["process_open_lineage_run_event"] @@ -810,12 +810,12 @@ def batch_search_link_processes( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_search_link_processes" not in self._stubs: - self._stubs[ - "batch_search_link_processes" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.lineage.v1.Lineage/BatchSearchLinkProcesses", - request_serializer=lineage.BatchSearchLinkProcessesRequest.serialize, - response_deserializer=lineage.BatchSearchLinkProcessesResponse.deserialize, + self._stubs["batch_search_link_processes"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.lineage.v1.Lineage/BatchSearchLinkProcesses", + request_serializer=lineage.BatchSearchLinkProcessesRequest.serialize, + response_deserializer=lineage.BatchSearchLinkProcessesResponse.deserialize, + ) ) return self._stubs["batch_search_link_processes"] diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc_asyncio.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc_asyncio.py index 0073b946d7e8..fd1890014625 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc_asyncio.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datacatalog_lineage_v1.types import lineage @@ -379,12 +379,12 @@ def process_open_lineage_run_event( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "process_open_lineage_run_event" not in self._stubs: - self._stubs[ - "process_open_lineage_run_event" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.lineage.v1.Lineage/ProcessOpenLineageRunEvent", - request_serializer=lineage.ProcessOpenLineageRunEventRequest.serialize, - response_deserializer=lineage.ProcessOpenLineageRunEventResponse.deserialize, + self._stubs["process_open_lineage_run_event"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.lineage.v1.Lineage/ProcessOpenLineageRunEvent", + request_serializer=lineage.ProcessOpenLineageRunEventRequest.serialize, + response_deserializer=lineage.ProcessOpenLineageRunEventResponse.deserialize, + ) ) return self._stubs["process_open_lineage_run_event"] @@ -826,12 +826,12 @@ def batch_search_link_processes( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_search_link_processes" not in self._stubs: - self._stubs[ - "batch_search_link_processes" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.lineage.v1.Lineage/BatchSearchLinkProcesses", - request_serializer=lineage.BatchSearchLinkProcessesRequest.serialize, - response_deserializer=lineage.BatchSearchLinkProcessesResponse.deserialize, + self._stubs["batch_search_link_processes"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.lineage.v1.Lineage/BatchSearchLinkProcesses", + request_serializer=lineage.BatchSearchLinkProcessesRequest.serialize, + response_deserializer=lineage.BatchSearchLinkProcessesResponse.deserialize, + ) ) return self._stubs["batch_search_link_processes"] diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest.py index 97816233fe15..6e6127f4810e 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.datacatalog_lineage_v1.types import lineage @@ -1262,9 +1262,7 @@ def __call__( """ - http_options = ( - _BaseLineageRestTransport._BaseBatchSearchLinkProcesses._get_http_options() - ) + http_options = _BaseLineageRestTransport._BaseBatchSearchLinkProcesses._get_http_options() request, metadata = self._interceptor.pre_batch_search_link_processes( request, metadata @@ -3188,9 +3186,7 @@ def __call__( """ - http_options = ( - _BaseLineageRestTransport._BaseProcessOpenLineageRunEvent._get_http_options() - ) + http_options = _BaseLineageRestTransport._BaseProcessOpenLineageRunEvent._get_http_options() request, metadata = self._interceptor.pre_process_open_lineage_run_event( request, metadata @@ -3259,11 +3255,10 @@ def __call__( resp = self._interceptor.post_process_open_lineage_run_event(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_process_open_lineage_run_event_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_process_open_lineage_run_event_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3763,7 +3758,9 @@ def batch_search_link_processes( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchSearchLinkProcesses(self._session, self._host, self._interceptor) # type: ignore + return self._BatchSearchLinkProcesses( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_lineage_event( @@ -3866,7 +3863,9 @@ def process_open_lineage_run_event( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ProcessOpenLineageRunEvent(self._session, self._host, self._interceptor) # type: ignore + return self._ProcessOpenLineageRunEvent( + self._session, self._host, self._interceptor + ) # type: ignore @property def search_links( diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest_base.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest_base.py index ddc776520479..28b53b72c942 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest_base.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.datacatalog_lineage_v1.types import lineage diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/types/lineage.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/types/lineage.py index b57c0f890564..11267870ac60 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/types/lineage.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/types/lineage.py @@ -161,6 +161,7 @@ class State(proto.Enum): ABORTED (4): The run aborted. """ + UNKNOWN = 0 STARTED = 1 COMPLETED = 2 @@ -329,6 +330,7 @@ class State(proto.Enum): The operation is no longer running and did not succeed. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 @@ -346,6 +348,7 @@ class Type(proto.Enum): CREATE (2): The resource creation operation. """ + TYPE_UNSPECIFIED = 0 DELETE = 1 CREATE = 2 @@ -1253,6 +1256,7 @@ class SourceType(proto.Enum): DATAPROC (6): Dataproc """ + SOURCE_TYPE_UNSPECIFIED = 0 CUSTOM = 1 BIGQUERY = 2 diff --git a/packages/google-cloud-datacatalog-lineage/mypy.ini b/packages/google-cloud-datacatalog-lineage/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-datacatalog-lineage/mypy.ini +++ b/packages/google-cloud-datacatalog-lineage/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-datacatalog-lineage/noxfile.py b/packages/google-cloud-datacatalog-lineage/noxfile.py index f66ad44f1c5d..14c09c6ce271 100644 --- a/packages/google-cloud-datacatalog-lineage/noxfile.py +++ b/packages/google-cloud-datacatalog-lineage/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-datacatalog-lineage/tests/unit/gapic/datacatalog_lineage_v1/test_lineage.py b/packages/google-cloud-datacatalog-lineage/tests/unit/gapic/datacatalog_lineage_v1/test_lineage.py index 358a83f07013..67b3d95537fb 100644 --- a/packages/google-cloud-datacatalog-lineage/tests/unit/gapic/datacatalog_lineage_v1/test_lineage.py +++ b/packages/google-cloud-datacatalog-lineage/tests/unit/gapic/datacatalog_lineage_v1/test_lineage.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 from google.cloud.datacatalog_lineage_v1.services.lineage import ( LineageAsyncClient, @@ -910,10 +910,9 @@ def test_lineage_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +957,9 @@ def test_lineage_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +995,9 @@ def test_lineage_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1229,9 +1226,7 @@ def test_lineage_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5413,9 +5408,9 @@ def test_create_lineage_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_lineage_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_lineage_event] = ( + mock_rpc + ) request = {} client.create_lineage_event(request) @@ -5762,9 +5757,9 @@ def test_get_lineage_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_lineage_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_lineage_event] = ( + mock_rpc + ) request = {} client.get_lineage_event(request) @@ -6105,9 +6100,9 @@ def test_list_lineage_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_lineage_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_lineage_events] = ( + mock_rpc + ) request = {} client.list_lineage_events(request) @@ -6645,9 +6640,9 @@ def test_delete_lineage_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_lineage_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_lineage_event] = ( + mock_rpc + ) request = {} client.delete_lineage_event(request) @@ -10001,9 +9996,9 @@ def test_create_lineage_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_lineage_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_lineage_event] = ( + mock_rpc + ) request = {} client.create_lineage_event(request) @@ -10196,9 +10191,9 @@ def test_get_lineage_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_lineage_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_lineage_event] = ( + mock_rpc + ) request = {} client.get_lineage_event(request) @@ -10380,9 +10375,9 @@ def test_list_lineage_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_lineage_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_lineage_events] = ( + mock_rpc + ) request = {} client.list_lineage_events(request) @@ -10642,9 +10637,9 @@ def test_delete_lineage_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_lineage_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_lineage_event] = ( + mock_rpc + ) request = {} client.delete_lineage_event(request) diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/__init__.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/__init__.py index dd312ae20a13..b5c27a187a54 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/__init__.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_catalog import DataCatalogAsyncClient, DataCatalogClient from .services.policy_tag_manager import ( PolicyTagManagerAsyncClient, diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/async_client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/async_client.py index 54fe5962da0f..881e6516df72 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/async_client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1 import gapic_version as package_version @@ -47,13 +47,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_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 google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1.services.data_catalog import pagers from google.cloud.datacatalog_v1.types import ( @@ -151,7 +153,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataCatalogAsyncClient: The constructed client. """ - return DataCatalogClient.from_service_account_info.__func__(DataCatalogAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataCatalogClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataCatalogAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -167,7 +172,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataCatalogAsyncClient: The constructed client. """ - return DataCatalogClient.from_service_account_file.__func__(DataCatalogAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataCatalogClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataCatalogAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/client.py index 0ec0c1e60d65..095a1bb96a2d 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1 import gapic_version as package_version @@ -63,13 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_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 google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1.services.data_catalog import pagers from google.cloud.datacatalog_v1.types import ( @@ -765,11 +767,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataCatalogClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataCatalogClient._read_environment_variables() + ) self._client_cert_source = DataCatalogClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -804,8 +804,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataCatalogTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/pagers.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/pagers.py index ab446b376d94..665d47030b37 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/pagers.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py index a07203fc5b1c..c89b2e2e8911 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py @@ -17,19 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.datacatalog_v1 import gapic_version as package_version from google.cloud.datacatalog_v1.types import datacatalog, tags @@ -729,13 +731,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc.py index ad2b14b8402d..c12a1d3be238 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.datacatalog_v1.types import datacatalog, tags @@ -1052,12 +1054,12 @@ def rename_tag_template_field_enum_value( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rename_tag_template_field_enum_value" not in self._stubs: - self._stubs[ - "rename_tag_template_field_enum_value" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.v1.DataCatalog/RenameTagTemplateFieldEnumValue", - request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, - response_deserializer=tags.TagTemplateField.deserialize, + self._stubs["rename_tag_template_field_enum_value"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.v1.DataCatalog/RenameTagTemplateFieldEnumValue", + request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, + response_deserializer=tags.TagTemplateField.deserialize, + ) ) return self._stubs["rename_tag_template_field_enum_value"] diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc_asyncio.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc_asyncio.py index 1e998c6fc125..8ec5238a8ae3 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc_asyncio.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc_asyncio.py @@ -17,25 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1.types import datacatalog, tags @@ -1082,12 +1084,12 @@ def rename_tag_template_field_enum_value( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rename_tag_template_field_enum_value" not in self._stubs: - self._stubs[ - "rename_tag_template_field_enum_value" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.v1.DataCatalog/RenameTagTemplateFieldEnumValue", - request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, - response_deserializer=tags.TagTemplateField.deserialize, + self._stubs["rename_tag_template_field_enum_value"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.v1.DataCatalog/RenameTagTemplateFieldEnumValue", + request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, + response_deserializer=tags.TagTemplateField.deserialize, + ) ) return self._stubs["rename_tag_template_field_enum_value"] diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/async_client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/async_client.py index 5598ab446d29..74ebf6617281 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/async_client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1 import gapic_version as package_version @@ -44,10 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1.services.policy_tag_manager import pagers @@ -127,7 +129,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PolicyTagManagerAsyncClient: The constructed client. """ - return PolicyTagManagerClient.from_service_account_info.__func__(PolicyTagManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PolicyTagManagerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PolicyTagManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +148,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PolicyTagManagerAsyncClient: The constructed client. """ - return PolicyTagManagerClient.from_service_account_file.__func__(PolicyTagManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PolicyTagManagerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PolicyTagManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/client.py index 68765b923235..0758554089f8 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1 import gapic_version as package_version @@ -61,10 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1.services.policy_tag_manager import pagers @@ -83,9 +85,7 @@ class PolicyTagManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PolicyTagManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PolicyTagManagerTransport]] _transport_registry["grpc"] = PolicyTagManagerGrpcTransport _transport_registry["grpc_asyncio"] = PolicyTagManagerGrpcAsyncIOTransport @@ -656,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PolicyTagManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PolicyTagManagerClient._read_environment_variables() + ) self._client_cert_source = PolicyTagManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -695,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PolicyTagManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/pagers.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/pagers.py index 4ad804e6132d..07fcd7d97010 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/pagers.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py index 673ea6f367e8..f1b35581b45c 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py @@ -17,19 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.datacatalog_v1 import gapic_version as package_version from google.cloud.datacatalog_v1.types import policytagmanager @@ -388,13 +390,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc.py index e73b6026d9bf..602cc85730cf 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.datacatalog_v1.types import policytagmanager diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc_asyncio.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc_asyncio.py index c59cec21d021..bc6d031113e9 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc_asyncio.py @@ -17,25 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1.types import policytagmanager diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/async_client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/async_client.py index 50cdebdd8057..65e9dc957d00 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/async_client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1 import gapic_version as package_version @@ -44,8 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1.types import ( @@ -135,7 +137,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PolicyTagManagerSerializationAsyncClient: The constructed client. """ - return PolicyTagManagerSerializationClient.from_service_account_info.__func__(PolicyTagManagerSerializationAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PolicyTagManagerSerializationClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + PolicyTagManagerSerializationAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -151,7 +158,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PolicyTagManagerSerializationAsyncClient: The constructed client. """ - return PolicyTagManagerSerializationClient.from_service_account_file.__func__(PolicyTagManagerSerializationAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PolicyTagManagerSerializationClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + PolicyTagManagerSerializationAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -189,7 +201,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return PolicyTagManagerSerializationClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return PolicyTagManagerSerializationClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> PolicyTagManagerSerializationTransport: diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/client.py index 44c84ef64d3d..9fcee8849987 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1 import gapic_version as package_version @@ -61,8 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1.types import ( @@ -84,13 +86,11 @@ class PolicyTagManagerSerializationClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] _transport_registry["grpc"] = PolicyTagManagerSerializationGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = PolicyTagManagerSerializationGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + PolicyTagManagerSerializationGrpcAsyncIOTransport + ) def get_transport_class( cls, @@ -644,11 +644,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PolicyTagManagerSerializationClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PolicyTagManagerSerializationClient._read_environment_variables() + ) self._client_cert_source = ( PolicyTagManagerSerializationClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -689,8 +687,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PolicyTagManagerSerializationTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/__init__.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/__init__.py index 587c2d663ee0..92ec2d92667d 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/__init__.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import PolicyTagManagerSerializationGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] _transport_registry["grpc"] = PolicyTagManagerSerializationGrpcTransport _transport_registry["grpc_asyncio"] = PolicyTagManagerSerializationGrpcAsyncIOTransport diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py index 35c8d1db6b56..ec541df1d5a0 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py @@ -17,16 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1 import gapic_version as package_version from google.cloud.datacatalog_v1.types import ( @@ -245,13 +247,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc.py index 4778dff54f76..959b09df4ed8 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc.py @@ -16,20 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1.types import ( policytagmanager, diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py index da011a72edbb..296ccbe05df3 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py @@ -17,22 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1.types import ( policytagmanager, diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/__init__.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/__init__.py index 756f1454c91d..5e02cec14e54 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/__init__.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/__init__.py @@ -18,8 +18,15 @@ BigQueryRoutineSpec, CloudSqlBigQueryConnectionSpec, ) -from .common import IntegratedSystem, ManagingSystem, PersonalDetails -from .data_source import DataSource, StorageProperties +from .common import ( + IntegratedSystem, + ManagingSystem, + PersonalDetails, +) +from .data_source import ( + DataSource, + StorageProperties, +) from .datacatalog import ( BusinessContext, CatalogUIExperience, @@ -97,9 +104,17 @@ DataplexSpec, DataplexTableSpec, ) -from .dump_content import DumpItem, TaggedEntry -from .gcs_fileset_spec import GcsFilesetSpec, GcsFileSpec -from .physical_schema import PhysicalSchema +from .dump_content import ( + DumpItem, + TaggedEntry, +) +from .gcs_fileset_spec import ( + GcsFilesetSpec, + GcsFileSpec, +) +from .physical_schema import ( + PhysicalSchema, +) from .policytagmanager import ( CreatePolicyTagRequest, CreateTaxonomyRequest, @@ -127,8 +142,14 @@ SerializedPolicyTag, SerializedTaxonomy, ) -from .schema import ColumnSchema, Schema -from .search import SearchCatalogResult, SearchResultType +from .schema import ( + ColumnSchema, + Schema, +) +from .search import ( + SearchCatalogResult, + SearchResultType, +) from .table_spec import ( BigQueryDateShardedSpec, BigQueryTableSpec, @@ -136,9 +157,21 @@ TableSpec, ViewSpec, ) -from .tags import FieldType, Tag, TagField, TagTemplate, TagTemplateField -from .timestamps import SystemTimestamps -from .usage import CommonUsageStats, UsageSignal, UsageStats +from .tags import ( + FieldType, + Tag, + TagField, + TagTemplate, + TagTemplateField, +) +from .timestamps import ( + SystemTimestamps, +) +from .usage import ( + CommonUsageStats, + UsageSignal, + UsageStats, +) __all__ = ( "BigQueryConnectionSpec", diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/bigquery.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/bigquery.py index bdd4d5987a2f..6094dccc06ba 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/bigquery.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/bigquery.py @@ -56,6 +56,7 @@ class ConnectionType(proto.Enum): CLOUD_SQL (1): Cloud SQL connection. """ + CONNECTION_TYPE_UNSPECIFIED = 0 CLOUD_SQL = 1 @@ -101,6 +102,7 @@ class DatabaseType(proto.Enum): MYSQL (2): Cloud SQL for MySQL. """ + DATABASE_TYPE_UNSPECIFIED = 0 POSTGRES = 1 MYSQL = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/common.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/common.py index 22aedd813eb2..240ee7e7345f 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/common.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/common.py @@ -56,6 +56,7 @@ class IntegratedSystem(proto.Enum): VERTEX_AI (10): Vertex AI """ + INTEGRATED_SYSTEM_UNSPECIFIED = 0 BIGQUERY = 1 CLOUD_PUBSUB = 2 @@ -80,6 +81,7 @@ class ManagingSystem(proto.Enum): MANAGING_SYSTEM_OTHER (2): Other """ + MANAGING_SYSTEM_UNSPECIFIED = 0 MANAGING_SYSTEM_DATAPLEX = 1 MANAGING_SYSTEM_OTHER = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/data_source.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/data_source.py index 472907524d8f..762407176a8b 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/data_source.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/data_source.py @@ -62,6 +62,7 @@ class Service(proto.Enum): BIGQUERY (2): BigQuery service. """ + SERVICE_UNSPECIFIED = 0 CLOUD_STORAGE = 1 BIGQUERY = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/datacatalog.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/datacatalog.py index 819671b472ec..500568dc07f8 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/datacatalog.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/datacatalog.py @@ -22,14 +22,19 @@ import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore -from google.cloud.datacatalog_v1.types import gcs_fileset_spec as gcd_gcs_fileset_spec -from google.cloud.datacatalog_v1.types import bigquery, common +from google.cloud.datacatalog_v1.types import ( + bigquery, + common, + dataplex_spec, + search, + table_spec, + timestamps, + usage, +) from google.cloud.datacatalog_v1.types import data_source as gcd_data_source -from google.cloud.datacatalog_v1.types import dataplex_spec +from google.cloud.datacatalog_v1.types import gcs_fileset_spec as gcd_gcs_fileset_spec from google.cloud.datacatalog_v1.types import schema as gcd_schema -from google.cloud.datacatalog_v1.types import search, table_spec from google.cloud.datacatalog_v1.types import tags as gcd_tags -from google.cloud.datacatalog_v1.types import timestamps, usage __protobuf__ = proto.module( package="google.cloud.datacatalog.v1", @@ -180,6 +185,7 @@ class EntryType(proto.Enum): Feature Group resource in Vertex AI Feature Store. """ + ENTRY_TYPE_UNSPECIFIED = 0 TABLE = 2 MODEL = 5 @@ -216,6 +222,7 @@ class TagTemplateMigration(proto.Enum): Migration of Tag Templates from Data Catalog to Dataplex is disabled. """ + TAG_TEMPLATE_MIGRATION_UNSPECIFIED = 0 TAG_TEMPLATE_MIGRATION_ENABLED = 1 TAG_TEMPLATE_MIGRATION_DISABLED = 2 @@ -233,6 +240,7 @@ class CatalogUIExperience(proto.Enum): CATALOG_UI_EXPERIENCE_DISABLED (2): The UI is Data Catalog. """ + CATALOG_UI_EXPERIENCE_UNSPECIFIED = 0 CATALOG_UI_EXPERIENCE_ENABLED = 1 CATALOG_UI_EXPERIENCE_DISABLED = 2 @@ -1254,6 +1262,7 @@ class TableType(proto.Enum): EXTERNAL (2): External table. """ + TABLE_TYPE_UNSPECIFIED = 0 NATIVE = 1 EXTERNAL = 2 @@ -1293,6 +1302,7 @@ class ViewType(proto.Enum): MATERIALIZED_VIEW (2): Materialized view. """ + VIEW_TYPE_UNSPECIFIED = 0 STANDARD_VIEW = 1 MATERIALIZED_VIEW = 2 @@ -1406,6 +1416,7 @@ class RoutineType(proto.Enum): PROCEDURE (2): Stored procedure. """ + ROUTINE_TYPE_UNSPECIFIED = 0 SCALAR_FUNCTION = 1 PROCEDURE = 2 @@ -1438,6 +1449,7 @@ class Mode(proto.Enum): INOUT (3): The argument is both an input and an output. """ + MODE_UNSPECIFIED = 0 IN = 1 OUT = 2 @@ -1651,12 +1663,12 @@ class CloudBigtableClusterSpec(proto.Message): number=4, ) - cloud_bigtable_cluster_specs: MutableSequence[ - CloudBigtableClusterSpec - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=CloudBigtableClusterSpec, + cloud_bigtable_cluster_specs: MutableSequence[CloudBigtableClusterSpec] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=CloudBigtableClusterSpec, + ) ) @@ -1722,6 +1734,7 @@ class ModelSourceType(proto.Enum): MARKETPLACE (7): The Model is saved or tuned from Marketplace. """ + MODEL_SOURCE_TYPE_UNSPECIFIED = 0 AUTOML = 1 CUSTOM = 2 @@ -1838,6 +1851,7 @@ class DataType(proto.Enum): Text prompt dataset which supports Large Language Models. """ + DATA_TYPE_UNSPECIFIED = 0 TABLE = 1 IMAGE = 2 @@ -1907,6 +1921,7 @@ class StorageType(proto.Enum): Underlying is optimized online server (Lightning). """ + STORAGE_TYPE_UNSPECIFIED = 0 BIGTABLE = 1 OPTIMIZED = 2 @@ -2549,6 +2564,7 @@ class ReconciliationState(proto.Enum): RECONCILIATION_DONE (3): The reconciliation has been finished. """ + RECONCILIATION_STATE_UNSPECIFIED = 0 RECONCILIATION_QUEUED = 1 RECONCILIATION_IN_PROGRESS = 2 @@ -2789,6 +2805,7 @@ class ImportState(proto.Enum): The import of entries has been abandoned in favor of a newer request. """ + IMPORT_STATE_UNSPECIFIED = 0 IMPORT_QUEUED = 1 IMPORT_IN_PROGRESS = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanager.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanager.py index c33bee9d0a6a..f30f710e9621 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanager.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanager.py @@ -119,6 +119,7 @@ class PolicyType(proto.Enum): Fine-grained access control policy that enables access control on tagged sub-resources. """ + POLICY_TYPE_UNSPECIFIED = 0 FINE_GRAINED_ACCESS_CONTROL = 1 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanagerserialization.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanagerserialization.py index 4d9607923f75..aee739649624 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanagerserialization.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanagerserialization.py @@ -71,12 +71,12 @@ class SerializedTaxonomy(proto.Message): number=3, message="SerializedPolicyTag", ) - activated_policy_types: MutableSequence[ - policytagmanager.Taxonomy.PolicyType - ] = proto.RepeatedField( - proto.ENUM, - number=4, - enum=policytagmanager.Taxonomy.PolicyType, + activated_policy_types: MutableSequence[policytagmanager.Taxonomy.PolicyType] = ( + proto.RepeatedField( + proto.ENUM, + number=4, + enum=policytagmanager.Taxonomy.PolicyType, + ) ) diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/schema.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/schema.py index f413df73d198..44716e4a956a 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/schema.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/schema.py @@ -121,6 +121,7 @@ class IndexingType(proto.Enum): INDEXING_TYPE_PRIMARY_KEY (4): Column part of the primary key. """ + INDEXING_TYPE_UNSPECIFIED = 0 INDEXING_TYPE_NONE = 1 INDEXING_TYPE_NON_UNIQUE = 2 @@ -152,6 +153,7 @@ class LookerColumnType(proto.Enum): PARAMETER (5): Parameter. """ + LOOKER_COLUMN_TYPE_UNSPECIFIED = 0 DIMENSION = 1 DIMENSION_GROUP = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/search.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/search.py index 5163d6de645b..35fd8ac3f381 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/search.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/search.py @@ -44,6 +44,7 @@ class SearchResultType(proto.Enum): ENTRY_GROUP (3): An [EntryGroup][google.cloud.datacatalog.v1.EntryGroup]. """ + SEARCH_RESULT_TYPE_UNSPECIFIED = 0 ENTRY = 1 TAG_TEMPLATE = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/table_spec.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/table_spec.py index a79c8dbe3d5d..c25a35b0fcda 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/table_spec.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/table_spec.py @@ -44,6 +44,7 @@ class TableSourceType(proto.Enum): BIGQUERY_MATERIALIZED_VIEW (7): BigQuery materialized view. """ + TABLE_SOURCE_TYPE_UNSPECIFIED = 0 BIGQUERY_VIEW = 2 BIGQUERY_TABLE = 5 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/tags.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/tags.py index 403db70845a0..8ca4021262c6 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/tags.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/tags.py @@ -302,6 +302,7 @@ class DataplexTransferStatus(proto.Enum): Dataplex service. Visible in both services. Editable in Dataplex, read-only in DataCatalog. """ + DATAPLEX_TRANSFER_STATUS_UNSPECIFIED = 0 MIGRATED = 1 TRANSFERRED = 2 @@ -440,6 +441,7 @@ class PrimitiveType(proto.Enum): RICHTEXT (5): A Richtext description. """ + PRIMITIVE_TYPE_UNSPECIFIED = 0 DOUBLE = 1 STRING = 2 @@ -483,12 +485,12 @@ class EnumValue(proto.Message): number=1, ) - allowed_values: MutableSequence[ - "FieldType.EnumType.EnumValue" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="FieldType.EnumType.EnumValue", + allowed_values: MutableSequence["FieldType.EnumType.EnumValue"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="FieldType.EnumType.EnumValue", + ) ) primitive_type: PrimitiveType = proto.Field( diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/usage.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/usage.py index 8d00369cf548..a23eefd18b01 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/usage.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/usage.py @@ -138,13 +138,13 @@ class UsageSignal(proto.Message): number=2, message="UsageStats", ) - common_usage_within_time_range: MutableMapping[ - str, "CommonUsageStats" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=3, - message="CommonUsageStats", + common_usage_within_time_range: MutableMapping[str, "CommonUsageStats"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=3, + message="CommonUsageStats", + ) ) favorite_count: int = proto.Field( proto.INT64, diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/__init__.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/__init__.py index f2999ce74684..4a398cd35844 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/__init__.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_catalog import DataCatalogAsyncClient, DataCatalogClient from .services.policy_tag_manager import ( PolicyTagManagerAsyncClient, diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/async_client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/async_client.py index 423343fed6bd..0c46f093ad7f 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/async_client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1beta1 import gapic_version as package_version @@ -45,12 +45,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1beta1.services.data_catalog import pagers from google.cloud.datacatalog_v1beta1.types import ( @@ -147,7 +149,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataCatalogAsyncClient: The constructed client. """ - return DataCatalogClient.from_service_account_info.__func__(DataCatalogAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataCatalogClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataCatalogAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -163,7 +168,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataCatalogAsyncClient: The constructed client. """ - return DataCatalogClient.from_service_account_file.__func__(DataCatalogAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataCatalogClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataCatalogAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/client.py index ef3eed0eb22d..8b403441e329 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1beta1 import gapic_version as package_version @@ -61,12 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1beta1.services.data_catalog import pagers from google.cloud.datacatalog_v1beta1.types import ( @@ -761,11 +763,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataCatalogClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataCatalogClient._read_environment_variables() + ) self._client_cert_source = DataCatalogClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -800,8 +800,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataCatalogTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/pagers.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/pagers.py index 498659e6e696..742522ba86dc 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/pagers.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py index 080efa31d594..cb9b02489621 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py @@ -17,19 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.datacatalog_v1beta1 import gapic_version as package_version from google.cloud.datacatalog_v1beta1.types import datacatalog, tags diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc.py index 4b6fc023f792..c36c6aff036f 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.datacatalog_v1beta1.types import datacatalog, tags @@ -934,12 +936,12 @@ def rename_tag_template_field_enum_value( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rename_tag_template_field_enum_value" not in self._stubs: - self._stubs[ - "rename_tag_template_field_enum_value" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.v1beta1.DataCatalog/RenameTagTemplateFieldEnumValue", - request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, - response_deserializer=tags.TagTemplateField.deserialize, + self._stubs["rename_tag_template_field_enum_value"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.v1beta1.DataCatalog/RenameTagTemplateFieldEnumValue", + request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, + response_deserializer=tags.TagTemplateField.deserialize, + ) ) return self._stubs["rename_tag_template_field_enum_value"] diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc_asyncio.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc_asyncio.py index 1d622484a120..1c2802909238 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc_asyncio.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc_asyncio.py @@ -17,25 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1beta1.types import datacatalog, tags @@ -960,12 +962,12 @@ def rename_tag_template_field_enum_value( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rename_tag_template_field_enum_value" not in self._stubs: - self._stubs[ - "rename_tag_template_field_enum_value" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.v1beta1.DataCatalog/RenameTagTemplateFieldEnumValue", - request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, - response_deserializer=tags.TagTemplateField.deserialize, + self._stubs["rename_tag_template_field_enum_value"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.v1beta1.DataCatalog/RenameTagTemplateFieldEnumValue", + request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, + response_deserializer=tags.TagTemplateField.deserialize, + ) ) return self._stubs["rename_tag_template_field_enum_value"] diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/async_client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/async_client.py index e15e164301cf..8f564d9e1862 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/async_client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1beta1 import gapic_version as package_version @@ -44,10 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1beta1.services.policy_tag_manager import pagers @@ -123,7 +125,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PolicyTagManagerAsyncClient: The constructed client. """ - return PolicyTagManagerClient.from_service_account_info.__func__(PolicyTagManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PolicyTagManagerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PolicyTagManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +144,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PolicyTagManagerAsyncClient: The constructed client. """ - return PolicyTagManagerClient.from_service_account_file.__func__(PolicyTagManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PolicyTagManagerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PolicyTagManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/client.py index 2d212c22f45d..37c508d440d2 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1beta1 import gapic_version as package_version @@ -61,10 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1beta1.services.policy_tag_manager import pagers @@ -83,9 +85,7 @@ class PolicyTagManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PolicyTagManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PolicyTagManagerTransport]] _transport_registry["grpc"] = PolicyTagManagerGrpcTransport _transport_registry["grpc_asyncio"] = PolicyTagManagerGrpcAsyncIOTransport @@ -652,11 +652,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PolicyTagManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PolicyTagManagerClient._read_environment_variables() + ) self._client_cert_source = PolicyTagManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -691,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PolicyTagManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/pagers.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/pagers.py index 113421ba5493..f7c919bb8d2f 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/pagers.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py index fea478f1fb23..2f2230bbecf3 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py @@ -17,19 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.datacatalog_v1beta1 import gapic_version as package_version from google.cloud.datacatalog_v1beta1.types import policytagmanager diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc.py index adbba4f358fd..7ab021ce03a9 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.datacatalog_v1beta1.types import policytagmanager diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc_asyncio.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc_asyncio.py index 3fe5412c1748..ad875c05b72b 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc_asyncio.py @@ -17,25 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1beta1.types import policytagmanager diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/async_client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/async_client.py index 804c12a478cd..df3bf1c86a2f 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/async_client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1beta1 import gapic_version as package_version @@ -44,8 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1beta1.types import ( @@ -132,7 +134,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PolicyTagManagerSerializationAsyncClient: The constructed client. """ - return PolicyTagManagerSerializationClient.from_service_account_info.__func__(PolicyTagManagerSerializationAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PolicyTagManagerSerializationClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + PolicyTagManagerSerializationAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +155,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PolicyTagManagerSerializationAsyncClient: The constructed client. """ - return PolicyTagManagerSerializationClient.from_service_account_file.__func__(PolicyTagManagerSerializationAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PolicyTagManagerSerializationClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + PolicyTagManagerSerializationAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -186,7 +198,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return PolicyTagManagerSerializationClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return PolicyTagManagerSerializationClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> PolicyTagManagerSerializationTransport: diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/client.py index 1151df269d39..c5aefb9f07fa 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1beta1 import gapic_version as package_version @@ -61,8 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1beta1.types import ( @@ -83,13 +85,11 @@ class PolicyTagManagerSerializationClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] _transport_registry["grpc"] = PolicyTagManagerSerializationGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = PolicyTagManagerSerializationGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + PolicyTagManagerSerializationGrpcAsyncIOTransport + ) def get_transport_class( cls, @@ -641,11 +641,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PolicyTagManagerSerializationClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PolicyTagManagerSerializationClient._read_environment_variables() + ) self._client_cert_source = ( PolicyTagManagerSerializationClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -686,8 +684,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PolicyTagManagerSerializationTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/__init__.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/__init__.py index 587c2d663ee0..92ec2d92667d 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/__init__.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import PolicyTagManagerSerializationGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] _transport_registry["grpc"] = PolicyTagManagerSerializationGrpcTransport _transport_registry["grpc_asyncio"] = PolicyTagManagerSerializationGrpcAsyncIOTransport diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py index ee6ab1b0a76a..e715a6a4dde9 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py @@ -17,16 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1beta1 import gapic_version as package_version from google.cloud.datacatalog_v1beta1.types import policytagmanagerserialization diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc.py index 37fb905af2c3..90c5ddcaa3a4 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc.py @@ -16,20 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1beta1.types import policytagmanagerserialization diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py index a677d3bdd22e..73de14a40b1c 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py @@ -17,22 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1beta1.types import policytagmanagerserialization diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/__init__.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/__init__.py index 1a2919ac33a6..42a932a8399a 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/__init__.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .common import IntegratedSystem, ManagingSystem +from .common import ( + IntegratedSystem, + ManagingSystem, +) from .datacatalog import ( CreateEntryGroupRequest, CreateEntryRequest, @@ -48,7 +51,10 @@ UpdateTagTemplateFieldRequest, UpdateTagTemplateRequest, ) -from .gcs_fileset_spec import GcsFilesetSpec, GcsFileSpec +from .gcs_fileset_spec import ( + GcsFilesetSpec, + GcsFileSpec, +) from .policytagmanager import ( CreatePolicyTagRequest, CreateTaxonomyRequest, @@ -74,8 +80,14 @@ SerializedPolicyTag, SerializedTaxonomy, ) -from .schema import ColumnSchema, Schema -from .search import SearchCatalogResult, SearchResultType +from .schema import ( + ColumnSchema, + Schema, +) +from .search import ( + SearchCatalogResult, + SearchResultType, +) from .table_spec import ( BigQueryDateShardedSpec, BigQueryTableSpec, @@ -83,9 +95,20 @@ TableSpec, ViewSpec, ) -from .tags import FieldType, Tag, TagField, TagTemplate, TagTemplateField -from .timestamps import SystemTimestamps -from .usage import UsageSignal, UsageStats +from .tags import ( + FieldType, + Tag, + TagField, + TagTemplate, + TagTemplateField, +) +from .timestamps import ( + SystemTimestamps, +) +from .usage import ( + UsageSignal, + UsageStats, +) __all__ = ( "IntegratedSystem", diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/common.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/common.py index 4176d8ec60a5..d2df7c5c3f91 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/common.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/common.py @@ -40,6 +40,7 @@ class IntegratedSystem(proto.Enum): CLOUD_PUBSUB (2): Cloud Pub/Sub. """ + INTEGRATED_SYSTEM_UNSPECIFIED = 0 BIGQUERY = 1 CLOUD_PUBSUB = 2 @@ -57,6 +58,7 @@ class ManagingSystem(proto.Enum): MANAGING_SYSTEM_OTHER (2): Other """ + MANAGING_SYSTEM_UNSPECIFIED = 0 MANAGING_SYSTEM_DATAPLEX = 1 MANAGING_SYSTEM_OTHER = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/datacatalog.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/datacatalog.py index 72c9aee57738..fe3c18e2c03e 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/datacatalog.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/datacatalog.py @@ -20,14 +20,18 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore +from google.cloud.datacatalog_v1beta1.types import ( + common, + search, + table_spec, + timestamps, + usage, +) from google.cloud.datacatalog_v1beta1.types import ( gcs_fileset_spec as gcd_gcs_fileset_spec, ) -from google.cloud.datacatalog_v1beta1.types import common from google.cloud.datacatalog_v1beta1.types import schema as gcd_schema -from google.cloud.datacatalog_v1beta1.types import search, table_spec from google.cloud.datacatalog_v1beta1.types import tags as gcd_tags -from google.cloud.datacatalog_v1beta1.types import timestamps, usage __protobuf__ = proto.module( package="google.cloud.datacatalog.v1beta1", @@ -89,6 +93,7 @@ class EntryType(proto.Enum): An entry type which is a set of files or objects. Example: Cloud Storage fileset. """ + ENTRY_TYPE_UNSPECIFIED = 0 TABLE = 2 MODEL = 5 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanager.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanager.py index 27017c66c7be..fd892707ec34 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanager.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanager.py @@ -97,6 +97,7 @@ class PolicyType(proto.Enum): Fine grained access control policy, which enables access control on tagged resources. """ + POLICY_TYPE_UNSPECIFIED = 0 FINE_GRAINED_ACCESS_CONTROL = 1 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanagerserialization.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanagerserialization.py index c166d56a320f..0fbb1096f710 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanagerserialization.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanagerserialization.py @@ -69,12 +69,12 @@ class SerializedTaxonomy(proto.Message): number=3, message="SerializedPolicyTag", ) - activated_policy_types: MutableSequence[ - policytagmanager.Taxonomy.PolicyType - ] = proto.RepeatedField( - proto.ENUM, - number=4, - enum=policytagmanager.Taxonomy.PolicyType, + activated_policy_types: MutableSequence[policytagmanager.Taxonomy.PolicyType] = ( + proto.RepeatedField( + proto.ENUM, + number=4, + enum=policytagmanager.Taxonomy.PolicyType, + ) ) diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/search.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/search.py index 1ce37e749b78..10c8c1d33851 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/search.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/search.py @@ -45,6 +45,7 @@ class SearchResultType(proto.Enum): An [EntryGroup][google.cloud.datacatalog.v1beta1.EntryGroup]. """ + SEARCH_RESULT_TYPE_UNSPECIFIED = 0 ENTRY = 1 TAG_TEMPLATE = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/table_spec.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/table_spec.py index ebbfb6e03be2..fa7f58118f0f 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/table_spec.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/table_spec.py @@ -44,6 +44,7 @@ class TableSourceType(proto.Enum): BIGQUERY_MATERIALIZED_VIEW (7): BigQuery materialized view. """ + TABLE_SOURCE_TYPE_UNSPECIFIED = 0 BIGQUERY_VIEW = 2 BIGQUERY_TABLE = 5 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/tags.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/tags.py index b093279f6c11..750f744c90bd 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/tags.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/tags.py @@ -262,6 +262,7 @@ class DataplexTransferStatus(proto.Enum): deprecated in favor of organization or project wide TagTemplate migration opt-in. """ + DATAPLEX_TRANSFER_STATUS_UNSPECIFIED = 0 MIGRATED = 1 @@ -383,6 +384,7 @@ class PrimitiveType(proto.Enum): TIMESTAMP (4): A timestamp. """ + PRIMITIVE_TYPE_UNSPECIFIED = 0 DOUBLE = 1 STRING = 2 @@ -411,12 +413,12 @@ class EnumValue(proto.Message): number=1, ) - allowed_values: MutableSequence[ - "FieldType.EnumType.EnumValue" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="FieldType.EnumType.EnumValue", + allowed_values: MutableSequence["FieldType.EnumType.EnumValue"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="FieldType.EnumType.EnumValue", + ) ) primitive_type: PrimitiveType = proto.Field( diff --git a/packages/google-cloud-datacatalog/mypy.ini b/packages/google-cloud-datacatalog/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-datacatalog/mypy.ini +++ b/packages/google-cloud-datacatalog/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-datacatalog/noxfile.py b/packages/google-cloud-datacatalog/noxfile.py index cacbb9c028b7..41c385183356 100644 --- a/packages/google-cloud-datacatalog/noxfile.py +++ b/packages/google-cloud-datacatalog/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_async.py index ec861289e2ae..1731be276961 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_DataCatalog_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_sync.py index ff56cc6122b3..bc38d3b842a9 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_DataCatalog_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_async.py index ba3e8b9c5ca7..522f7e4f026c 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_DataCatalog_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_sync.py index e6852ef9a149..bd84f21fd501 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_DataCatalog_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_async.py index 2a29470f35b4..8051262fa841 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_DataCatalog_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_sync.py index c0abd21c2480..649e1ab8b7b2 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_DataCatalog_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_async.py index 526a44e3759d..c74bc957a039 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_PolicyTagManager_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_sync.py index f5f33fe0f224..791841661695 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_PolicyTagManager_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_async.py index a44943516155..a704ec81c502 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_PolicyTagManager_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_sync.py index 356a3b757d7d..de1936617c55 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_PolicyTagManager_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_async.py index 4c98f8ad918d..5eb4824cb2fe 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_PolicyTagManager_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_sync.py index ad8f0586ac9c..45880225cb03 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_PolicyTagManager_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_async.py index 5770d231ccd5..38b7cbe332b6 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_DataCatalog_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_sync.py index 5ebeca077c38..24601dcfacc0 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_DataCatalog_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_async.py index 51f88002531a..82847d688f90 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_DataCatalog_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_sync.py index 89802b0b8cdc..69c15c0f5721 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_DataCatalog_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_async.py index da3ca356d201..357042ade4a4 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_DataCatalog_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_sync.py index f030704203d9..1bc9c3aab662 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_DataCatalog_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_async.py index bdf1a33de136..03f37a3151c5 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_PolicyTagManager_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_sync.py index 3469226d2b37..7b4b85c5817f 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_PolicyTagManager_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_async.py index a1d811614cd4..886c71281410 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_PolicyTagManager_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_sync.py index c0ce6272837f..f6cece9e3f9c 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_PolicyTagManager_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_async.py index 58a6ce7222de..aa5fc217f4b9 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_PolicyTagManager_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_sync.py index dd0fd4d55bde..5a749a71a2c7 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_PolicyTagManager_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_data_catalog.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_data_catalog.py index 8432186d521f..fdc3104f3afd 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_data_catalog.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_data_catalog.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +40,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_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 google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,24 +58,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.options_pb2 as options_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.datacatalog_v1.services.data_catalog import ( DataCatalogAsyncClient, @@ -936,10 +939,9 @@ def test_data_catalog_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +986,9 @@ def test_data_catalog_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1024,9 @@ def test_data_catalog_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1257,9 +1257,7 @@ def test_data_catalog_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1867,9 +1865,9 @@ def test_create_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_group] = ( + mock_rpc + ) request = {} client.create_entry_group(request) @@ -2581,9 +2579,9 @@ def test_update_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entry_group] = ( + mock_rpc + ) request = {} client.update_entry_group(request) @@ -2935,9 +2933,9 @@ def test_delete_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_group] = ( + mock_rpc + ) request = {} client.delete_entry_group(request) @@ -3267,9 +3265,9 @@ def test_list_entry_groups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entry_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entry_groups] = ( + mock_rpc + ) request = {} client.list_entry_groups(request) @@ -5884,9 +5882,9 @@ def test_modify_entry_overview_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.modify_entry_overview - ] = mock_rpc + client._transport._wrapped_methods[client._transport.modify_entry_overview] = ( + mock_rpc + ) request = {} client.modify_entry_overview(request) @@ -6137,9 +6135,9 @@ def test_modify_entry_contacts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.modify_entry_contacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.modify_entry_contacts] = ( + mock_rpc + ) request = {} client.modify_entry_contacts(request) @@ -6400,9 +6398,9 @@ def test_create_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tag_template] = ( + mock_rpc + ) request = {} client.create_tag_template(request) @@ -6769,9 +6767,9 @@ def test_get_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tag_template] = ( + mock_rpc + ) request = {} client.get_tag_template(request) @@ -7110,9 +7108,9 @@ def test_update_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tag_template] = ( + mock_rpc + ) request = {} client.update_tag_template(request) @@ -7463,9 +7461,9 @@ def test_delete_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tag_template] = ( + mock_rpc + ) request = {} client.delete_tag_template(request) @@ -12722,9 +12720,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py index d727f451e91d..ff79aa03702a 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,24 +40,31 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.options_pb2 as options_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account from google.cloud.datacatalog_v1.services.policy_tag_manager import ( PolicyTagManagerAsyncClient, @@ -951,10 +959,9 @@ def test_policy_tag_manager_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +1006,9 @@ def test_policy_tag_manager_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1038,10 +1044,9 @@ def test_policy_tag_manager_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1286,9 +1291,7 @@ def test_policy_tag_manager_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3286,9 +3289,9 @@ def test_create_policy_tag_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_policy_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_policy_tag] = ( + mock_rpc + ) request = {} client.create_policy_tag(request) @@ -3641,9 +3644,9 @@ def test_delete_policy_tag_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_policy_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_policy_tag] = ( + mock_rpc + ) request = {} client.delete_policy_tag(request) @@ -3976,9 +3979,9 @@ def test_update_policy_tag_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_policy_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_policy_tag] = ( + mock_rpc + ) request = {} client.update_policy_tag(request) @@ -4322,9 +4325,9 @@ def test_list_policy_tags_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_policy_tags - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_policy_tags] = ( + mock_rpc + ) request = {} client.list_policy_tags(request) @@ -5707,9 +5710,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py index b2e3fd6eb01a..37f19612c440 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,16 +40,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -1019,10 +1027,9 @@ def test_policy_tag_manager_serialization_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1067,10 +1074,9 @@ def test_policy_tag_manager_serialization_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1106,10 +1112,9 @@ def test_policy_tag_manager_serialization_client_get_mtls_endpoint_and_cert_sour "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1363,9 +1368,7 @@ def test_policy_tag_manager_serialization_client_create_channel_credentials_file google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1484,9 +1487,9 @@ def test_replace_taxonomy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.replace_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.replace_taxonomy] = ( + mock_rpc + ) request = {} client.replace_taxonomy(request) @@ -1741,9 +1744,9 @@ def test_import_taxonomies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_taxonomies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_taxonomies] = ( + mock_rpc + ) request = {} client.import_taxonomies(request) @@ -1989,9 +1992,9 @@ def test_export_taxonomies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_taxonomies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_taxonomies] = ( + mock_rpc + ) request = {} client.export_taxonomies(request) diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py index 70e91fccd50e..aa8451b783a1 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,24 +40,31 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.options_pb2 as options_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account from google.cloud.datacatalog_v1beta1.services.data_catalog import ( DataCatalogAsyncClient, @@ -923,10 +931,9 @@ def test_data_catalog_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +978,9 @@ def test_data_catalog_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1016,9 @@ def test_data_catalog_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1244,9 +1249,7 @@ def test_data_catalog_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1852,9 +1855,9 @@ def test_create_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_group] = ( + mock_rpc + ) request = {} client.create_entry_group(request) @@ -2217,9 +2220,9 @@ def test_update_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entry_group] = ( + mock_rpc + ) request = {} client.update_entry_group(request) @@ -2910,9 +2913,9 @@ def test_delete_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_group] = ( + mock_rpc + ) request = {} client.delete_entry_group(request) @@ -3242,9 +3245,9 @@ def test_list_entry_groups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entry_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entry_groups] = ( + mock_rpc + ) request = {} client.list_entry_groups(request) @@ -5845,9 +5848,9 @@ def test_create_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tag_template] = ( + mock_rpc + ) request = {} client.create_tag_template(request) @@ -6210,9 +6213,9 @@ def test_get_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tag_template] = ( + mock_rpc + ) request = {} client.get_tag_template(request) @@ -6547,9 +6550,9 @@ def test_update_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tag_template] = ( + mock_rpc + ) request = {} client.update_tag_template(request) @@ -6898,9 +6901,9 @@ def test_delete_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tag_template] = ( + mock_rpc + ) request = {} client.delete_tag_template(request) @@ -11258,9 +11261,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py index 65286c348782..746e284643ce 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,24 +40,31 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.options_pb2 as options_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account from google.cloud.datacatalog_v1beta1.services.policy_tag_manager import ( PolicyTagManagerAsyncClient, @@ -951,10 +959,9 @@ def test_policy_tag_manager_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +1006,9 @@ def test_policy_tag_manager_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1038,10 +1044,9 @@ def test_policy_tag_manager_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1286,9 +1291,7 @@ def test_policy_tag_manager_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3286,9 +3289,9 @@ def test_create_policy_tag_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_policy_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_policy_tag] = ( + mock_rpc + ) request = {} client.create_policy_tag(request) @@ -3641,9 +3644,9 @@ def test_delete_policy_tag_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_policy_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_policy_tag] = ( + mock_rpc + ) request = {} client.delete_policy_tag(request) @@ -3976,9 +3979,9 @@ def test_update_policy_tag_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_policy_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_policy_tag] = ( + mock_rpc + ) request = {} client.update_policy_tag(request) @@ -4322,9 +4325,9 @@ def test_list_policy_tags_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_policy_tags - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_policy_tags] = ( + mock_rpc + ) request = {} client.list_policy_tags(request) @@ -5707,9 +5710,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py index 5d61d60abf52..6de0b099daf3 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,16 +40,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -1018,10 +1026,9 @@ def test_policy_tag_manager_serialization_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1066,10 +1073,9 @@ def test_policy_tag_manager_serialization_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1105,10 +1111,9 @@ def test_policy_tag_manager_serialization_client_get_mtls_endpoint_and_cert_sour "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1362,9 +1367,7 @@ def test_policy_tag_manager_serialization_client_create_channel_credentials_file google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1472,9 +1475,9 @@ def test_import_taxonomies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_taxonomies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_taxonomies] = ( + mock_rpc + ) request = {} client.import_taxonomies(request) @@ -1720,9 +1723,9 @@ def test_export_taxonomies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_taxonomies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_taxonomies] = ( + mock_rpc + ) request = {} client.export_taxonomies(request) diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/__init__.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/__init__.py index 7f5cf5e9bdfc..9158fce77d99 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/__init__.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.flex_templates_service import ( FlexTemplatesServiceAsyncClient, FlexTemplatesServiceClient, diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/async_client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/async_client.py index 959ab0ff0428..21c083e974b2 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/async_client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -110,7 +110,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FlexTemplatesServiceAsyncClient: The constructed client. """ - return FlexTemplatesServiceClient.from_service_account_info.__func__(FlexTemplatesServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + FlexTemplatesServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(FlexTemplatesServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -126,7 +129,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FlexTemplatesServiceAsyncClient: The constructed client. """ - return FlexTemplatesServiceClient.from_service_account_file.__func__(FlexTemplatesServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + FlexTemplatesServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(FlexTemplatesServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -164,7 +170,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return FlexTemplatesServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return FlexTemplatesServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> FlexTemplatesServiceTransport: diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/client.py index 983aaccc11d5..aad5ad945f49 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -77,9 +77,7 @@ class FlexTemplatesServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[FlexTemplatesServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[FlexTemplatesServiceTransport]] _transport_registry["grpc"] = FlexTemplatesServiceGrpcTransport _transport_registry["grpc_asyncio"] = FlexTemplatesServiceGrpcAsyncIOTransport _transport_registry["rest"] = FlexTemplatesServiceRestTransport @@ -601,11 +599,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FlexTemplatesServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FlexTemplatesServiceClient._read_environment_variables() + ) self._client_cert_source = FlexTemplatesServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +636,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FlexTemplatesServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/__init__.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/__init__.py index 3c7f952eac00..c99d112b0631 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/__init__.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import FlexTemplatesServiceRestInterceptor, FlexTemplatesServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[FlexTemplatesServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[FlexTemplatesServiceTransport]] _transport_registry["grpc"] = FlexTemplatesServiceGrpcTransport _transport_registry["grpc_asyncio"] = FlexTemplatesServiceGrpcAsyncIOTransport _transport_registry["rest"] = FlexTemplatesServiceRestTransport diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/base.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/base.py index a56baff4d6e2..05dc6b65a854 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/base.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version from google.cloud.dataflow_v1beta3.types import templates diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc.py index d189e3e015f6..964262e87d16 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataflow_v1beta3.types import templates diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc_asyncio.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc_asyncio.py index e402dd050ee2..91b3405f61f5 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataflow_v1beta3.types import templates diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/rest.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/rest.py index 47b5d4a2f687..2d7f5a28f3a6 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/rest.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -283,9 +283,7 @@ def __call__( """ - http_options = ( - _BaseFlexTemplatesServiceRestTransport._BaseLaunchFlexTemplate._get_http_options() - ) + http_options = _BaseFlexTemplatesServiceRestTransport._BaseLaunchFlexTemplate._get_http_options() request, metadata = self._interceptor.pre_launch_flex_template( request, metadata diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/async_client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/async_client.py index 42fcfdaa4b6a..b3337d87f608 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/async_client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: JobsV1Beta3AsyncClient: The constructed client. """ - return JobsV1Beta3Client.from_service_account_info.__func__(JobsV1Beta3AsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + JobsV1Beta3Client.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(JobsV1Beta3AsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: JobsV1Beta3AsyncClient: The constructed client. """ - return JobsV1Beta3Client.from_service_account_file.__func__(JobsV1Beta3AsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + JobsV1Beta3Client.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(JobsV1Beta3AsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/client.py index 2c05ae45ab35..214322989b64 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -602,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = JobsV1Beta3Client._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + JobsV1Beta3Client._read_environment_variables() + ) self._client_cert_source = JobsV1Beta3Client._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(JobsV1Beta3Transport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/pagers.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/pagers.py index 2fd1593865ce..a05a3176a748 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/pagers.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/base.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/base.py index e6538359be61..4449ab7f7843 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/base.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version from google.cloud.dataflow_v1beta3.types import jobs, snapshots diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc.py index 95e231e1948f..fa050c3ef497 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataflow_v1beta3.types import jobs, snapshots diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc_asyncio.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc_asyncio.py index 38a382935974..882f96e637ff 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataflow_v1beta3.types import jobs, snapshots diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/rest.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/rest.py index a534a58b5e2f..3182dc290dbd 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/rest.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -546,9 +546,7 @@ def __call__( """ - http_options = ( - _BaseJobsV1Beta3RestTransport._BaseAggregatedListJobs._get_http_options() - ) + http_options = _BaseJobsV1Beta3RestTransport._BaseAggregatedListJobs._get_http_options() request, metadata = self._interceptor.pre_aggregated_list_jobs( request, metadata diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/async_client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/async_client.py index a6d080d5677a..cfdca28e67be 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/async_client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MessagesV1Beta3AsyncClient: The constructed client. """ - return MessagesV1Beta3Client.from_service_account_info.__func__(MessagesV1Beta3AsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + MessagesV1Beta3Client.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(MessagesV1Beta3AsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MessagesV1Beta3AsyncClient: The constructed client. """ - return MessagesV1Beta3Client.from_service_account_file.__func__(MessagesV1Beta3AsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + MessagesV1Beta3Client.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(MessagesV1Beta3AsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/client.py index 01d11666c952..9ac1e76c719c 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -78,9 +78,7 @@ class MessagesV1Beta3ClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MessagesV1Beta3Transport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MessagesV1Beta3Transport]] _transport_registry["grpc"] = MessagesV1Beta3GrpcTransport _transport_registry["grpc_asyncio"] = MessagesV1Beta3GrpcAsyncIOTransport _transport_registry["rest"] = MessagesV1Beta3RestTransport @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MessagesV1Beta3Client._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MessagesV1Beta3Client._read_environment_variables() + ) self._client_cert_source = MessagesV1Beta3Client._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MessagesV1Beta3Transport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/pagers.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/pagers.py index 87c522025ea8..8e92eaef222e 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/pagers.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/base.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/base.py index bcc3f5be8216..80b51f5ad61a 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/base.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version from google.cloud.dataflow_v1beta3.types import messages diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc.py index 49ad5420e626..88e8dc1fdcd6 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataflow_v1beta3.types import messages diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc_asyncio.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc_asyncio.py index 1f1b7553b715..4bcd35c209a4 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataflow_v1beta3.types import messages diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/rest.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/rest.py index e59038f9b41e..3c4f5546456b 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/rest.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -285,9 +285,7 @@ def __call__( """ - http_options = ( - _BaseMessagesV1Beta3RestTransport._BaseListJobMessages._get_http_options() - ) + http_options = _BaseMessagesV1Beta3RestTransport._BaseListJobMessages._get_http_options() request, metadata = self._interceptor.pre_list_job_messages( request, metadata diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/async_client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/async_client.py index c87bb82f7352..e27246eb9f20 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/async_client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -115,7 +115,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MetricsV1Beta3AsyncClient: The constructed client. """ - return MetricsV1Beta3Client.from_service_account_info.__func__(MetricsV1Beta3AsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + MetricsV1Beta3Client.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(MetricsV1Beta3AsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +134,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MetricsV1Beta3AsyncClient: The constructed client. """ - return MetricsV1Beta3Client.from_service_account_file.__func__(MetricsV1Beta3AsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + MetricsV1Beta3Client.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(MetricsV1Beta3AsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/client.py index e4dd56685f27..543841a1cf18 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -80,9 +80,7 @@ class MetricsV1Beta3ClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MetricsV1Beta3Transport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MetricsV1Beta3Transport]] _transport_registry["grpc"] = MetricsV1Beta3GrpcTransport _transport_registry["grpc_asyncio"] = MetricsV1Beta3GrpcAsyncIOTransport _transport_registry["rest"] = MetricsV1Beta3RestTransport @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MetricsV1Beta3Client._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MetricsV1Beta3Client._read_environment_variables() + ) self._client_cert_source = MetricsV1Beta3Client._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MetricsV1Beta3Transport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/pagers.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/pagers.py index 035b794fa369..43dd870add82 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/pagers.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/base.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/base.py index 5af7c26dd637..888af0a02fa9 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/base.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version from google.cloud.dataflow_v1beta3.types import metrics diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc.py index 7575d35d4599..90f8f3c174c6 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataflow_v1beta3.types import metrics @@ -410,12 +410,12 @@ def get_stage_execution_details( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_stage_execution_details" not in self._stubs: - self._stubs[ - "get_stage_execution_details" - ] = self._logged_channel.unary_unary( - "/google.dataflow.v1beta3.MetricsV1Beta3/GetStageExecutionDetails", - request_serializer=metrics.GetStageExecutionDetailsRequest.serialize, - response_deserializer=metrics.StageExecutionDetails.deserialize, + self._stubs["get_stage_execution_details"] = ( + self._logged_channel.unary_unary( + "/google.dataflow.v1beta3.MetricsV1Beta3/GetStageExecutionDetails", + request_serializer=metrics.GetStageExecutionDetailsRequest.serialize, + response_deserializer=metrics.StageExecutionDetails.deserialize, + ) ) return self._stubs["get_stage_execution_details"] diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc_asyncio.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc_asyncio.py index 592eb889b2ff..3b46b73fe2b7 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataflow_v1beta3.types import metrics @@ -421,12 +421,12 @@ def get_stage_execution_details( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_stage_execution_details" not in self._stubs: - self._stubs[ - "get_stage_execution_details" - ] = self._logged_channel.unary_unary( - "/google.dataflow.v1beta3.MetricsV1Beta3/GetStageExecutionDetails", - request_serializer=metrics.GetStageExecutionDetailsRequest.serialize, - response_deserializer=metrics.StageExecutionDetails.deserialize, + self._stubs["get_stage_execution_details"] = ( + self._logged_channel.unary_unary( + "/google.dataflow.v1beta3.MetricsV1Beta3/GetStageExecutionDetails", + request_serializer=metrics.GetStageExecutionDetailsRequest.serialize, + response_deserializer=metrics.StageExecutionDetails.deserialize, + ) ) return self._stubs["get_stage_execution_details"] diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/rest.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/rest.py index efd83ded4721..3bfa5024d694 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/rest.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -388,9 +388,7 @@ def __call__( """ - http_options = ( - _BaseMetricsV1Beta3RestTransport._BaseGetJobExecutionDetails._get_http_options() - ) + http_options = _BaseMetricsV1Beta3RestTransport._BaseGetJobExecutionDetails._get_http_options() request, metadata = self._interceptor.pre_get_job_execution_details( request, metadata @@ -696,9 +694,7 @@ def __call__( """ - http_options = ( - _BaseMetricsV1Beta3RestTransport._BaseGetStageExecutionDetails._get_http_options() - ) + http_options = _BaseMetricsV1Beta3RestTransport._BaseGetStageExecutionDetails._get_http_options() request, metadata = self._interceptor.pre_get_stage_execution_details( request, metadata @@ -796,7 +792,9 @@ def get_job_execution_details( ) -> Callable[[metrics.GetJobExecutionDetailsRequest], metrics.JobExecutionDetails]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetJobExecutionDetails(self._session, self._host, self._interceptor) # type: ignore + return self._GetJobExecutionDetails( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_job_metrics( @@ -814,7 +812,9 @@ def get_stage_execution_details( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetStageExecutionDetails(self._session, self._host, self._interceptor) # type: ignore + return self._GetStageExecutionDetails( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/async_client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/async_client.py index 2547a017ac8d..ce9668041e3f 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/async_client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -115,7 +115,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SnapshotsV1Beta3AsyncClient: The constructed client. """ - return SnapshotsV1Beta3Client.from_service_account_info.__func__(SnapshotsV1Beta3AsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SnapshotsV1Beta3Client.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SnapshotsV1Beta3AsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +134,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SnapshotsV1Beta3AsyncClient: The constructed client. """ - return SnapshotsV1Beta3Client.from_service_account_file.__func__(SnapshotsV1Beta3AsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SnapshotsV1Beta3Client.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SnapshotsV1Beta3AsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/client.py index 0ef2018e5138..fcf145e9b87b 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -80,9 +80,7 @@ class SnapshotsV1Beta3ClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SnapshotsV1Beta3Transport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SnapshotsV1Beta3Transport]] _transport_registry["grpc"] = SnapshotsV1Beta3GrpcTransport _transport_registry["grpc_asyncio"] = SnapshotsV1Beta3GrpcAsyncIOTransport _transport_registry["rest"] = SnapshotsV1Beta3RestTransport @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SnapshotsV1Beta3Client._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SnapshotsV1Beta3Client._read_environment_variables() + ) self._client_cert_source = SnapshotsV1Beta3Client._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SnapshotsV1Beta3Transport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/base.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/base.py index 2d1c1b0a4595..40f69af51e3b 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/base.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version from google.cloud.dataflow_v1beta3.types import snapshots diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc.py index 4c605bebe5ed..00db0d39d253 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataflow_v1beta3.types import snapshots diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc_asyncio.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc_asyncio.py index d71e78d515a7..73a03df1194e 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataflow_v1beta3.types import snapshots diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/rest.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/rest.py index 9eea7447278d..25d1a8036d97 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/rest.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -387,9 +387,7 @@ def __call__( Response from deleting a snapshot. """ - http_options = ( - _BaseSnapshotsV1Beta3RestTransport._BaseDeleteSnapshot._get_http_options() - ) + http_options = _BaseSnapshotsV1Beta3RestTransport._BaseDeleteSnapshot._get_http_options() request, metadata = self._interceptor.pre_delete_snapshot(request, metadata) transcoded_request = _BaseSnapshotsV1Beta3RestTransport._BaseDeleteSnapshot._get_transcoded_request( @@ -678,9 +676,7 @@ def __call__( List of snapshots. """ - http_options = ( - _BaseSnapshotsV1Beta3RestTransport._BaseListSnapshots._get_http_options() - ) + http_options = _BaseSnapshotsV1Beta3RestTransport._BaseListSnapshots._get_http_options() request, metadata = self._interceptor.pre_list_snapshots(request, metadata) transcoded_request = _BaseSnapshotsV1Beta3RestTransport._BaseListSnapshots._get_transcoded_request( diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/async_client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/async_client.py index 76b36be2c580..6fa111477a2a 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/async_client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -115,7 +115,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TemplatesServiceAsyncClient: The constructed client. """ - return TemplatesServiceClient.from_service_account_info.__func__(TemplatesServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + TemplatesServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(TemplatesServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +134,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TemplatesServiceAsyncClient: The constructed client. """ - return TemplatesServiceClient.from_service_account_file.__func__(TemplatesServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + TemplatesServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(TemplatesServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/client.py index 1fcec4af95a8..3d2bbc592c8e 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -80,9 +80,7 @@ class TemplatesServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TemplatesServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TemplatesServiceTransport]] _transport_registry["grpc"] = TemplatesServiceGrpcTransport _transport_registry["grpc_asyncio"] = TemplatesServiceGrpcAsyncIOTransport _transport_registry["rest"] = TemplatesServiceRestTransport @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TemplatesServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TemplatesServiceClient._read_environment_variables() + ) self._client_cert_source = TemplatesServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TemplatesServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/base.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/base.py index 251090cd8dbf..1a810c00bac4 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/base.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version from google.cloud.dataflow_v1beta3.types import jobs, templates diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc.py index b92611e4913f..22e00007b60f 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataflow_v1beta3.types import jobs, templates diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc_asyncio.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc_asyncio.py index aceb0708e4d9..f20e0578890a 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataflow_v1beta3.types import jobs, templates diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/rest.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/rest.py index 7bb6d73ec9da..2ef723df7729 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/rest.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -392,9 +392,7 @@ def __call__( """ - http_options = ( - _BaseTemplatesServiceRestTransport._BaseCreateJobFromTemplate._get_http_options() - ) + http_options = _BaseTemplatesServiceRestTransport._BaseCreateJobFromTemplate._get_http_options() request, metadata = self._interceptor.pre_create_job_from_template( request, metadata @@ -695,9 +693,7 @@ def __call__( """ - http_options = ( - _BaseTemplatesServiceRestTransport._BaseLaunchTemplate._get_http_options() - ) + http_options = _BaseTemplatesServiceRestTransport._BaseLaunchTemplate._get_http_options() request, metadata = self._interceptor.pre_launch_template(request, metadata) transcoded_request = _BaseTemplatesServiceRestTransport._BaseLaunchTemplate._get_transcoded_request( diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/environment.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/environment.py index 094611ea025a..cf92a64a8371 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/environment.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/environment.py @@ -65,6 +65,7 @@ class JobType(proto.Enum): data is read, processed, and written continuously. """ + JOB_TYPE_UNKNOWN = 0 JOB_TYPE_BATCH = 1 JOB_TYPE_STREAMING = 2 @@ -82,6 +83,7 @@ class FlexResourceSchedulingGoal(proto.Enum): FLEXRS_COST_OPTIMIZED (2): Optimize for lower cost. """ + FLEXRS_UNSPECIFIED = 0 FLEXRS_SPEED_OPTIMIZED = 1 FLEXRS_COST_OPTIMIZED = 2 @@ -105,6 +107,7 @@ class TeardownPolicy(proto.Enum): Never teardown the resource. This is useful for debugging and development. """ + TEARDOWN_POLICY_UNKNOWN = 0 TEARDOWN_ALWAYS = 1 TEARDOWN_ON_SUCCESS = 2 @@ -130,6 +133,7 @@ class DefaultPackageSet(proto.Enum): Stage packages typically useful to workers written in Python. """ + DEFAULT_PACKAGE_SET_UNKNOWN = 0 DEFAULT_PACKAGE_SET_NONE = 1 DEFAULT_PACKAGE_SET_JAVA = 2 @@ -151,6 +155,7 @@ class AutoscalingAlgorithm(proto.Enum): Increase worker count over time to reduce job execution time. """ + AUTOSCALING_ALGORITHM_UNKNOWN = 0 AUTOSCALING_ALGORITHM_NONE = 1 AUTOSCALING_ALGORITHM_BASIC = 2 @@ -170,6 +175,7 @@ class WorkerIPAddressConfiguration(proto.Enum): WORKER_IP_PRIVATE (2): Workers should have private IP addresses. """ + WORKER_IP_UNSPECIFIED = 0 WORKER_IP_PUBLIC = 1 WORKER_IP_PRIVATE = 2 @@ -189,6 +195,7 @@ class ShuffleMode(proto.Enum): SERVICE_BASED (2): Shuffle is done on the service side. """ + SHUFFLE_MODE_UNSPECIFIED = 0 VM_BASED = 1 SERVICE_BASED = 2 @@ -218,6 +225,7 @@ class StreamingMode(proto.Enum): Setting this value also enables Streaming Engine and Streaming Engine resource-based billing. """ + STREAMING_MODE_UNSPECIFIED = 0 STREAMING_MODE_EXACTLY_ONCE = 1 STREAMING_MODE_AT_LEAST_ONCE = 2 @@ -999,12 +1007,12 @@ class WorkerPool(proto.Message): number=21, enum="WorkerIPAddressConfiguration", ) - sdk_harness_container_images: MutableSequence[ - "SdkHarnessContainerImage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=22, - message="SdkHarnessContainerImage", + sdk_harness_container_images: MutableSequence["SdkHarnessContainerImage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=22, + message="SdkHarnessContainerImage", + ) ) @@ -1043,6 +1051,7 @@ class DataSamplingBehavior(proto.Enum): When given, enables sampling input elements when a user-defined DoFn causes an exception. """ + DATA_SAMPLING_BEHAVIOR_UNSPECIFIED = 0 DISABLED = 1 ALWAYS_ON = 2 diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/jobs.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/jobs.py index 12cf3e38a1ad..5f7852425c25 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/jobs.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/jobs.py @@ -89,6 +89,7 @@ class KindType(proto.Enum): Opening or closing a shuffle session, often as part of a GroupByKey. """ + UNKNOWN_KIND = 0 PAR_DO_KIND = 1 GROUP_BY_KEY_KIND = 2 @@ -177,6 +178,7 @@ class JobState(proto.Enum): feature, please reach out to Cloud support team if you are interested. """ + JOB_STATE_UNKNOWN = 0 JOB_STATE_STOPPED = 1 JOB_STATE_RUNNING = 2 @@ -219,6 +221,7 @@ class JobView(proto.Enum): description data for steps, labels and environment. """ + JOB_VIEW_UNKNOWN = 0 JOB_VIEW_SUMMARY = 1 JOB_VIEW_ALL = 2 @@ -777,6 +780,7 @@ class SdkSupportStatus(proto.Enum): Support for this SDK version has ended and it should no longer be used. """ + UNKNOWN = 0 SUPPORTED = 1 STALE = 2 @@ -834,6 +838,7 @@ class Type(proto.Enum): Using this version of the SDK may cause data loss. """ + TYPE_UNSPECIFIED = 0 GENERAL = 1 PERFORMANCE = 2 @@ -860,6 +865,7 @@ class Severity(proto.Enum): severely degraded, and data loss may be very likely. """ + SEVERITY_UNSPECIFIED = 0 NOTICE = 1 WARNING = 2 @@ -1004,19 +1010,19 @@ class PipelineDescription(proto.Message): portable graph step names if exists. """ - original_pipeline_transform: MutableSequence[ - "TransformSummary" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="TransformSummary", + original_pipeline_transform: MutableSequence["TransformSummary"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="TransformSummary", + ) ) - execution_pipeline_stage: MutableSequence[ - "ExecutionStageSummary" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ExecutionStageSummary", + execution_pipeline_stage: MutableSequence["ExecutionStageSummary"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ExecutionStageSummary", + ) ) display_data: MutableSequence["DisplayData"] = proto.RepeatedField( proto.MESSAGE, @@ -1656,6 +1662,7 @@ class Filter(proto.Enum): Filters the jobs that are running ordered on the creation timestamp. """ + UNKNOWN = 0 ALL = 1 TERMINATED = 2 diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/messages.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/messages.py index 108b7d9c007e..fb3515c1d3d1 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/messages.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/messages.py @@ -77,6 +77,7 @@ class JobMessageImportance(proto.Enum): default, and these messages are displayed by default in the Dataflow monitoring UI. """ + JOB_MESSAGE_IMPORTANCE_UNKNOWN = 0 JOB_MESSAGE_DEBUG = 1 JOB_MESSAGE_DETAILED = 2 @@ -224,6 +225,7 @@ class AutoscalingEventType(proto.Enum): specify both target_num_workers, current_num_workers and a decision_message. """ + TYPE_UNKNOWN = 0 TARGET_NUM_WORKERS_CHANGED = 1 CURRENT_NUM_WORKERS_CHANGED = 2 diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/metrics.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/metrics.py index afe6576f2334..e6e60f3495c8 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/metrics.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/metrics.py @@ -65,6 +65,7 @@ class ExecutionState(proto.Enum): EXECUTION_STATE_CANCELLED (5): Execution of the component was cancelled. """ + EXECUTION_STATE_UNKNOWN = 0 EXECUTION_STATE_NOT_STARTED = 1 EXECUTION_STATE_RUNNING = 2 diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/snapshots.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/snapshots.py index 33ee1d4de2e6..5a37000d664b 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/snapshots.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/snapshots.py @@ -55,6 +55,7 @@ class SnapshotState(proto.Enum): DELETED (5): Snapshot has been deleted. """ + UNKNOWN_SNAPSHOT_STATE = 0 PENDING = 1 RUNNING = 2 diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/streaming.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/streaming.py index 64dd2224b92e..6b03d216d820 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/streaming.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/streaming.py @@ -477,12 +477,12 @@ class StreamingComputationRanges(proto.Message): proto.STRING, number=1, ) - range_assignments: MutableSequence[ - "KeyRangeDataDiskAssignment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="KeyRangeDataDiskAssignment", + range_assignments: MutableSequence["KeyRangeDataDiskAssignment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="KeyRangeDataDiskAssignment", + ) ) diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/templates.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/templates.py index b8b6c8a77a78..009f0b23cf83 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/templates.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/templates.py @@ -118,6 +118,7 @@ class ParameterType(proto.Enum): for a new Google Managed Kafka topic, or an existing non-managed Kafka topic. """ + DEFAULT = 0 TEXT = 1 GCS_READ_BUCKET = 2 @@ -969,6 +970,7 @@ class Language(proto.Enum): GO (3): Go. """ + UNKNOWN = 0 JAVA = 1 PYTHON = 2 @@ -1096,6 +1098,7 @@ class TemplateView(proto.Enum): Template view that retrieves only the metadata associated with the template. """ + METADATA_ONLY = 0 project_id: str = proto.Field( @@ -1146,6 +1149,7 @@ class TemplateType(proto.Enum): FLEX (2): Flex Template. """ + UNKNOWN = 0 LEGACY = 1 FLEX = 2 diff --git a/packages/google-cloud-dataflow-client/mypy.ini b/packages/google-cloud-dataflow-client/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-dataflow-client/mypy.ini +++ b/packages/google-cloud-dataflow-client/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-dataflow-client/noxfile.py b/packages/google-cloud-dataflow-client/noxfile.py index f824a783abed..268181135f3e 100644 --- a/packages/google-cloud-dataflow-client/noxfile.py +++ b/packages/google-cloud-dataflow-client/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_flex_templates_service.py b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_flex_templates_service.py index b649df51988e..062fdbb5a686 100644 --- a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_flex_templates_service.py +++ b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_flex_templates_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -991,10 +996,9 @@ def test_flex_templates_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1043,9 @@ def test_flex_templates_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1078,10 +1081,9 @@ def test_flex_templates_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1341,9 +1343,7 @@ def test_flex_templates_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1458,9 +1458,9 @@ def test_launch_flex_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.launch_flex_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.launch_flex_template] = ( + mock_rpc + ) request = {} client.launch_flex_template(request) @@ -1644,9 +1644,9 @@ def test_launch_flex_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.launch_flex_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.launch_flex_template] = ( + mock_rpc + ) request = {} client.launch_flex_template(request) diff --git a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_jobs_v1_beta3.py b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_jobs_v1_beta3.py index 8c22c3e19c7f..6abe4d7b3ced 100644 --- a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_jobs_v1_beta3.py +++ b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_jobs_v1_beta3.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.oauth2 import service_account import google.protobuf.any_pb2 as any_pb2 # type: ignore 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.struct_pb2 as struct_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.dataflow_v1beta3.services.jobs_v1_beta3 import ( JobsV1Beta3AsyncClient, @@ -927,10 +932,9 @@ def test_jobs_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +979,9 @@ def test_jobs_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1017,9 @@ def test_jobs_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1250,9 +1252,7 @@ def test_jobs_v1_beta3_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2721,9 +2721,9 @@ def test_aggregated_list_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.aggregated_list_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.aggregated_list_jobs] = ( + mock_rpc + ) request = {} client.aggregated_list_jobs(request) @@ -3176,9 +3176,9 @@ def test_check_active_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.check_active_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.check_active_jobs] = ( + mock_rpc + ) request = {} client.check_active_jobs(request) @@ -3776,9 +3776,9 @@ def test_aggregated_list_jobs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.aggregated_list_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.aggregated_list_jobs] = ( + mock_rpc + ) request = {} client.aggregated_list_jobs(request) diff --git a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_messages_v1_beta3.py b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_messages_v1_beta3.py index 57158321f653..a54f9497257d 100644 --- a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_messages_v1_beta3.py +++ b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_messages_v1_beta3.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataflow_v1beta3.services.messages_v1_beta3 import ( MessagesV1Beta3AsyncClient, @@ -970,10 +975,9 @@ def test_messages_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1022,9 @@ def test_messages_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1060,9 @@ def test_messages_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1307,9 +1309,7 @@ def test_messages_v1_beta3_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1429,9 +1429,9 @@ def test_list_job_messages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_job_messages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_job_messages] = ( + mock_rpc + ) request = {} client.list_job_messages(request) @@ -1826,9 +1826,9 @@ def test_list_job_messages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_job_messages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_job_messages] = ( + mock_rpc + ) request = {} client.list_job_messages(request) diff --git a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_metrics_v1_beta3.py b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_metrics_v1_beta3.py index ad8b3c65bc5d..d91c7d97ba10 100644 --- a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_metrics_v1_beta3.py +++ b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_metrics_v1_beta3.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataflow_v1beta3.services.metrics_v1_beta3 import ( MetricsV1Beta3AsyncClient, @@ -950,10 +955,9 @@ def test_metrics_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +1002,9 @@ def test_metrics_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1040,9 @@ def test_metrics_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1287,9 +1289,7 @@ def test_metrics_v1_beta3_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_snapshots_v1_beta3.py b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_snapshots_v1_beta3.py index 6d4cbc20a1ff..47fc295b8243 100644 --- a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_snapshots_v1_beta3.py +++ b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_snapshots_v1_beta3.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataflow_v1beta3.services.snapshots_v1_beta3 import ( SnapshotsV1Beta3AsyncClient, @@ -971,10 +976,9 @@ def test_snapshots_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1023,9 @@ def test_snapshots_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1061,9 @@ def test_snapshots_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1313,9 +1315,7 @@ def test_snapshots_v1_beta3_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_templates_service.py b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_templates_service.py index 8d640dbe1d9e..f2d8c7870151 100644 --- a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_templates_service.py +++ b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_templates_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.dataflow_v1beta3.services.templates_service import ( TemplatesServiceAsyncClient, @@ -971,10 +976,9 @@ def test_templates_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1023,9 @@ def test_templates_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1061,9 @@ def test_templates_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1313,9 +1315,7 @@ def test_templates_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dataform/CHANGELOG.md b/packages/google-cloud-dataform/CHANGELOG.md index 2a4c0e5a6b4f..49f4eaace594 100644 --- a/packages/google-cloud-dataform/CHANGELOG.md +++ b/packages/google-cloud-dataform/CHANGELOG.md @@ -4,6 +4,18 @@ [1]: https://pypi.org/project/google-cloud-dataform/#history +## [0.9.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-dataform-v0.8.0...google-cloud-dataform-v0.9.0) (2026-02-12) + + +### Documentation + +* A comment for field `force` in message `.google.cloud.dataform.v1beta1.DeleteRepositoryRequest` is changed PiperOrigin-RevId: 868182714 ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) + + +### Features + +* Update GCP Client Libraries in v1beta1 to support Folders, TeamFolders, and other relevant APIs The v1beta1 API now includes support for Folders and TeamFolders, allowing users to organize repositories and files hierarchically and manage access controls. New Features: - Added TeamFolder resource and methods: CreateTeamFolder, GetTeamFolder, UpdateTeamFolder, DeleteTeamFolder QueryTeamFolderContents to list folder contents. SearchTeamFolders to search for TeamFolders. - Added Folder resource and methods: CreateFolder, GetFolder, UpdateFolder, DeleteFolder QueryFolderContents to list folder contents. Added MoveFolder to move Folders between TeamFolders, other Folders, or the user root folder. - Added MoveRepository to move Repositories between TeamFolders, Folders, or the user root folder. - Added QueryUserRootContents to list contents of a user's root folder. Repository resource now includes containing_folder and team_folder_name fields to indicate its location within the folder hierarchy. - IAM methods (GetIamPolicy, SetIamPolicy, TestIamPermissions) now support Folder and TeamFolder resources for access control management ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) + ## [0.8.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-dataform-v0.7.0...google-cloud-dataform-v0.8.0) (2026-01-08) diff --git a/packages/google-cloud-dataform/google/cloud/dataform/gapic_version.py b/packages/google-cloud-dataform/google/cloud/dataform/gapic_version.py index 9fcfa2a067f6..e0e81c108443 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform/gapic_version.py +++ b/packages/google-cloud-dataform/google/cloud/dataform/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.8.0" # {x-release-please-version} +__version__ = "0.9.0" # {x-release-please-version} diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/__init__.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/__init__.py index a926547681f6..313e6fe3f536 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/__init__.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dataform import DataformAsyncClient, DataformClient from .types.dataform import ( CancelWorkflowInvocationRequest, diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/gapic_version.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/gapic_version.py index 9fcfa2a067f6..e0e81c108443 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/gapic_version.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.8.0" # {x-release-please-version} +__version__ = "0.9.0" # {x-release-please-version} diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/async_client.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/async_client.py index ae4bcaf5eecf..481f31533f56 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/async_client.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataform_v1 import gapic_version as package_version @@ -44,12 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_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 google.type.interval_pb2 as interval_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.cloud.dataform_v1.services.dataform import pagers from google.cloud.dataform_v1.types import dataform @@ -144,7 +146,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataformAsyncClient: The constructed client. """ - return DataformClient.from_service_account_info.__func__(DataformAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataformClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataformAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -160,7 +165,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataformAsyncClient: The constructed client. """ - return DataformClient.from_service_account_file.__func__(DataformAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataformClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataformAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/client.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/client.py index 5703100af1fd..9a5e9bb987bd 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/client.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataform_v1 import gapic_version as package_version @@ -61,12 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_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 google.type.interval_pb2 as interval_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.cloud.dataform_v1.services.dataform import pagers from google.cloud.dataform_v1.types import dataform @@ -862,11 +864,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataformClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataformClient._read_environment_variables() + ) self._client_cert_source = DataformClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -901,8 +901,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataformTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/pagers.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/pagers.py index 7954f11a3dd0..5d4f2afec369 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/pagers.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -459,7 +459,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -539,7 +539,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -615,7 +615,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -695,7 +695,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -771,7 +771,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -851,7 +851,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -927,7 +927,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1007,7 +1007,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1083,7 +1083,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1163,7 +1163,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1239,7 +1239,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1319,7 +1319,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1397,7 +1397,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1479,7 +1479,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1555,7 +1555,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1635,7 +1635,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1711,7 +1711,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1791,7 +1791,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1869,7 +1869,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/base.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/base.py index 20703125c0d4..5cdc9fdfb8cb 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/base.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataform_v1 import gapic_version as package_version from google.cloud.dataform_v1.types import dataform diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc.py index 6b6b934ff16a..76f83464d7cc 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.protobuf.json_format import MessageToJson from google.cloud.dataform_v1.types import dataform @@ -554,12 +556,12 @@ def query_repository_directory_contents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_repository_directory_contents" not in self._stubs: - self._stubs[ - "query_repository_directory_contents" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/QueryRepositoryDirectoryContents", - request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, - response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + self._stubs["query_repository_directory_contents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/QueryRepositoryDirectoryContents", + request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, + response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + ) ) return self._stubs["query_repository_directory_contents"] @@ -616,12 +618,12 @@ def compute_repository_access_token_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "compute_repository_access_token_status" not in self._stubs: - self._stubs[ - "compute_repository_access_token_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/ComputeRepositoryAccessTokenStatus", - request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, - response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + self._stubs["compute_repository_access_token_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/ComputeRepositoryAccessTokenStatus", + request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, + response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + ) ) return self._stubs["compute_repository_access_token_status"] @@ -1468,12 +1470,12 @@ def query_compilation_result_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_compilation_result_actions" not in self._stubs: - self._stubs[ - "query_compilation_result_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/QueryCompilationResultActions", - request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, - response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + self._stubs["query_compilation_result_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/QueryCompilationResultActions", + request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, + response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + ) ) return self._stubs["query_compilation_result_actions"] @@ -1692,12 +1694,12 @@ def create_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_workflow_invocation" not in self._stubs: - self._stubs[ - "create_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/CreateWorkflowInvocation", - request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, - response_deserializer=dataform.WorkflowInvocation.deserialize, + self._stubs["create_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/CreateWorkflowInvocation", + request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, + response_deserializer=dataform.WorkflowInvocation.deserialize, + ) ) return self._stubs["create_workflow_invocation"] @@ -1720,12 +1722,12 @@ def delete_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_workflow_invocation" not in self._stubs: - self._stubs[ - "delete_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/DeleteWorkflowInvocation", - request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/DeleteWorkflowInvocation", + request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_workflow_invocation"] @@ -1752,12 +1754,12 @@ def cancel_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_workflow_invocation" not in self._stubs: - self._stubs[ - "cancel_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/CancelWorkflowInvocation", - request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, - response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + self._stubs["cancel_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/CancelWorkflowInvocation", + request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, + response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + ) ) return self._stubs["cancel_workflow_invocation"] @@ -1785,12 +1787,12 @@ def query_workflow_invocation_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_workflow_invocation_actions" not in self._stubs: - self._stubs[ - "query_workflow_invocation_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/QueryWorkflowInvocationActions", - request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, - response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + self._stubs["query_workflow_invocation_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/QueryWorkflowInvocationActions", + request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, + response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + ) ) return self._stubs["query_workflow_invocation_actions"] diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc_asyncio.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc_asyncio.py index 5b5ef0ca316b..ce738b857c31 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataform_v1.types import dataform @@ -563,12 +565,12 @@ def query_repository_directory_contents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_repository_directory_contents" not in self._stubs: - self._stubs[ - "query_repository_directory_contents" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/QueryRepositoryDirectoryContents", - request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, - response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + self._stubs["query_repository_directory_contents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/QueryRepositoryDirectoryContents", + request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, + response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + ) ) return self._stubs["query_repository_directory_contents"] @@ -625,12 +627,12 @@ def compute_repository_access_token_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "compute_repository_access_token_status" not in self._stubs: - self._stubs[ - "compute_repository_access_token_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/ComputeRepositoryAccessTokenStatus", - request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, - response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + self._stubs["compute_repository_access_token_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/ComputeRepositoryAccessTokenStatus", + request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, + response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + ) ) return self._stubs["compute_repository_access_token_status"] @@ -1507,12 +1509,12 @@ def query_compilation_result_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_compilation_result_actions" not in self._stubs: - self._stubs[ - "query_compilation_result_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/QueryCompilationResultActions", - request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, - response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + self._stubs["query_compilation_result_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/QueryCompilationResultActions", + request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, + response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + ) ) return self._stubs["query_compilation_result_actions"] @@ -1741,12 +1743,12 @@ def create_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_workflow_invocation" not in self._stubs: - self._stubs[ - "create_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/CreateWorkflowInvocation", - request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, - response_deserializer=dataform.WorkflowInvocation.deserialize, + self._stubs["create_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/CreateWorkflowInvocation", + request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, + response_deserializer=dataform.WorkflowInvocation.deserialize, + ) ) return self._stubs["create_workflow_invocation"] @@ -1771,12 +1773,12 @@ def delete_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_workflow_invocation" not in self._stubs: - self._stubs[ - "delete_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/DeleteWorkflowInvocation", - request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/DeleteWorkflowInvocation", + request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_workflow_invocation"] @@ -1803,12 +1805,12 @@ def cancel_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_workflow_invocation" not in self._stubs: - self._stubs[ - "cancel_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/CancelWorkflowInvocation", - request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, - response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + self._stubs["cancel_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/CancelWorkflowInvocation", + request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, + response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + ) ) return self._stubs["cancel_workflow_invocation"] @@ -1836,12 +1838,12 @@ def query_workflow_invocation_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_workflow_invocation_actions" not in self._stubs: - self._stubs[ - "query_workflow_invocation_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/QueryWorkflowInvocationActions", - request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, - response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + self._stubs["query_workflow_invocation_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/QueryWorkflowInvocationActions", + request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, + response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + ) ) return self._stubs["query_workflow_invocation_actions"] diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest.py index 42693ccaaacd..977d3222d30c 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.protobuf +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_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 google.cloud.dataform_v1.types import dataform @@ -3205,9 +3207,7 @@ def __call__( ``CancelWorkflowInvocation`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseCancelWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCancelWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_cancel_workflow_invocation( request, metadata @@ -3359,9 +3359,7 @@ def __call__( ``CommitRepositoryChanges`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseCommitRepositoryChanges._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCommitRepositoryChanges._get_http_options() request, metadata = self._interceptor.pre_commit_repository_changes( request, metadata @@ -3513,9 +3511,7 @@ def __call__( ``CommitWorkspaceChanges`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseCommitWorkspaceChanges._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCommitWorkspaceChanges._get_http_options() request, metadata = self._interceptor.pre_commit_workspace_changes( request, metadata @@ -3668,15 +3664,12 @@ def __call__( ``ComputeRepositoryAccessTokenStatus`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseComputeRepositoryAccessTokenStatus._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseComputeRepositoryAccessTokenStatus._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_compute_repository_access_token_status( - request, metadata + request, metadata = ( + self._interceptor.pre_compute_repository_access_token_status( + request, metadata + ) ) transcoded_request = _BaseDataformRestTransport._BaseComputeRepositoryAccessTokenStatus._get_transcoded_request( http_options, request @@ -3739,11 +3732,10 @@ def __call__( resp = self._interceptor.post_compute_repository_access_token_status(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_compute_repository_access_token_status_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_compute_repository_access_token_status_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3829,9 +3821,7 @@ def __call__( """ - http_options = ( - _BaseDataformRestTransport._BaseCreateCompilationResult._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCreateCompilationResult._get_http_options() request, metadata = self._interceptor.pre_create_compilation_result( request, metadata @@ -4448,9 +4438,7 @@ def __call__( """ - http_options = ( - _BaseDataformRestTransport._BaseCreateWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCreateWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_create_workflow_invocation( request, metadata @@ -5080,9 +5068,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataformRestTransport._BaseDeleteWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseDeleteWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_delete_workflow_invocation( request, metadata @@ -5896,9 +5882,7 @@ def __call__( ``FetchRepositoryHistory`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseFetchRepositoryHistory._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseFetchRepositoryHistory._get_http_options() request, metadata = self._interceptor.pre_fetch_repository_history( request, metadata @@ -6786,9 +6770,7 @@ def __call__( """ - http_options = ( - _BaseDataformRestTransport._BaseGetWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseGetWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_get_workflow_invocation( request, metadata @@ -7232,9 +7214,7 @@ def __call__( ``ListCompilationResults`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseListCompilationResults._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseListCompilationResults._get_http_options() request, metadata = self._interceptor.pre_list_compilation_results( request, metadata @@ -7826,9 +7806,7 @@ def __call__( ``ListWorkflowInvocations`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseListWorkflowInvocations._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseListWorkflowInvocations._get_http_options() request, metadata = self._interceptor.pre_list_workflow_invocations( request, metadata @@ -8897,9 +8875,7 @@ def __call__( ``QueryCompilationResultActions`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryCompilationResultActions._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryCompilationResultActions._get_http_options() request, metadata = self._interceptor.pre_query_compilation_result_actions( request, metadata @@ -8965,11 +8941,10 @@ def __call__( resp = self._interceptor.post_query_compilation_result_actions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_compilation_result_actions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_compilation_result_actions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -9050,9 +9025,7 @@ def __call__( ``QueryDirectoryContents`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryDirectoryContents._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryDirectoryContents._get_http_options() request, metadata = self._interceptor.pre_query_directory_contents( request, metadata @@ -9200,15 +9173,12 @@ def __call__( ``QueryRepositoryDirectoryContents`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryRepositoryDirectoryContents._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryRepositoryDirectoryContents._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_query_repository_directory_contents( - request, metadata + request, metadata = ( + self._interceptor.pre_query_repository_directory_contents( + request, metadata + ) ) transcoded_request = _BaseDataformRestTransport._BaseQueryRepositoryDirectoryContents._get_transcoded_request( http_options, request @@ -9271,11 +9241,10 @@ def __call__( resp = self._interceptor.post_query_repository_directory_contents(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_repository_directory_contents_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_repository_directory_contents_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -9359,9 +9328,7 @@ def __call__( ``QueryWorkflowInvocationActions`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryWorkflowInvocationActions._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryWorkflowInvocationActions._get_http_options() request, metadata = self._interceptor.pre_query_workflow_invocation_actions( request, metadata @@ -9427,11 +9394,10 @@ def __call__( resp = self._interceptor.post_query_workflow_invocation_actions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_workflow_invocation_actions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_workflow_invocation_actions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -10119,9 +10085,7 @@ def __call__( ``ResetWorkspaceChanges`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseResetWorkspaceChanges._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseResetWorkspaceChanges._get_http_options() request, metadata = self._interceptor.pre_reset_workspace_changes( request, metadata @@ -11144,7 +11108,9 @@ def cancel_workflow_invocation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CancelWorkflowInvocation(self._session, self._host, self._interceptor) # type: ignore + return self._CancelWorkflowInvocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def commit_repository_changes( @@ -11155,7 +11121,9 @@ def commit_repository_changes( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CommitRepositoryChanges(self._session, self._host, self._interceptor) # type: ignore + return self._CommitRepositoryChanges( + self._session, self._host, self._interceptor + ) # type: ignore @property def commit_workspace_changes( @@ -11166,7 +11134,9 @@ def commit_workspace_changes( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CommitWorkspaceChanges(self._session, self._host, self._interceptor) # type: ignore + return self._CommitWorkspaceChanges( + self._session, self._host, self._interceptor + ) # type: ignore @property def compute_repository_access_token_status( @@ -11177,7 +11147,9 @@ def compute_repository_access_token_status( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ComputeRepositoryAccessTokenStatus(self._session, self._host, self._interceptor) # type: ignore + return self._ComputeRepositoryAccessTokenStatus( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_compilation_result( @@ -11187,7 +11159,9 @@ def create_compilation_result( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateCompilationResult(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCompilationResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_release_config( @@ -11221,7 +11195,9 @@ def create_workflow_invocation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateWorkflowInvocation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateWorkflowInvocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_workspace( @@ -11261,7 +11237,9 @@ def delete_workflow_invocation( ) -> Callable[[dataform.DeleteWorkflowInvocationRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteWorkflowInvocation(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteWorkflowInvocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_workspace( @@ -11318,7 +11296,9 @@ def fetch_repository_history( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchRepositoryHistory(self._session, self._host, self._interceptor) # type: ignore + return self._FetchRepositoryHistory( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_compilation_result( @@ -11393,7 +11373,9 @@ def list_compilation_results( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListCompilationResults(self._session, self._host, self._interceptor) # type: ignore + return self._ListCompilationResults( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_release_configs( @@ -11434,7 +11416,9 @@ def list_workflow_invocations( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListWorkflowInvocations(self._session, self._host, self._interceptor) # type: ignore + return self._ListWorkflowInvocations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_workspaces( @@ -11493,7 +11477,9 @@ def query_compilation_result_actions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._QueryCompilationResultActions(self._session, self._host, self._interceptor) # type: ignore + return self._QueryCompilationResultActions( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_directory_contents( @@ -11504,7 +11490,9 @@ def query_directory_contents( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._QueryDirectoryContents(self._session, self._host, self._interceptor) # type: ignore + return self._QueryDirectoryContents( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_repository_directory_contents( @@ -11515,7 +11503,9 @@ def query_repository_directory_contents( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._QueryRepositoryDirectoryContents(self._session, self._host, self._interceptor) # type: ignore + return self._QueryRepositoryDirectoryContents( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_workflow_invocation_actions( @@ -11526,7 +11516,9 @@ def query_workflow_invocation_actions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._QueryWorkflowInvocationActions(self._session, self._host, self._interceptor) # type: ignore + return self._QueryWorkflowInvocationActions( + self._session, self._host, self._interceptor + ) # type: ignore @property def read_file( diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest_base.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest_base.py index dfdbc0334c97..c10203759c0b 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest_base.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataform_v1.types import dataform diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/types/dataform.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/types/dataform.py index 169b0bee0a5b..c93c5bec1625 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/types/dataform.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/types/dataform.py @@ -251,6 +251,7 @@ class TokenStatus(proto.Enum): The token was used successfully to authenticate against the Git remote. """ + TOKEN_STATUS_UNSPECIFIED = 0 NOT_FOUND = 1 INVALID = 2 @@ -951,6 +952,7 @@ class TokenStatus(proto.Enum): The token was used successfully to authenticate against the Git remote. """ + TOKEN_STATUS_UNSPECIFIED = 0 NOT_FOUND = 1 INVALID = 2 @@ -1313,6 +1315,7 @@ class State(proto.Enum): HAS_CONFLICTS (4): The file contains merge conflicts. """ + STATE_UNSPECIFIED = 0 ADDED = 1 DELETED = 2 @@ -1329,12 +1332,12 @@ class State(proto.Enum): enum="FetchFileGitStatusesResponse.UncommittedFileChange.State", ) - uncommitted_file_changes: MutableSequence[ - UncommittedFileChange - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=UncommittedFileChange, + uncommitted_file_changes: MutableSequence[UncommittedFileChange] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=UncommittedFileChange, + ) ) @@ -2084,12 +2087,12 @@ class ScheduledReleaseRecord(proto.Message): proto.STRING, number=7, ) - recent_scheduled_release_records: MutableSequence[ - ScheduledReleaseRecord - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=ScheduledReleaseRecord, + recent_scheduled_release_records: MutableSequence[ScheduledReleaseRecord] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=ScheduledReleaseRecord, + ) ) release_compilation_result: str = proto.Field( proto.STRING, @@ -2858,6 +2861,7 @@ class RelationType(proto.Enum): MATERIALIZED_VIEW (4): The relation is a materialized view. """ + RELATION_TYPE_UNSPECIFIED = 0 TABLE = 1 VIEW = 2 @@ -3435,12 +3439,12 @@ class QueryCompilationResultActionsResponse(proto.Message): def raw_page(self): return self - compilation_result_actions: MutableSequence[ - "CompilationResultAction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CompilationResultAction", + compilation_result_actions: MutableSequence["CompilationResultAction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CompilationResultAction", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -3563,12 +3567,12 @@ class ScheduledExecutionRecord(proto.Message): proto.STRING, number=7, ) - recent_scheduled_execution_records: MutableSequence[ - ScheduledExecutionRecord - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=ScheduledExecutionRecord, + recent_scheduled_execution_records: MutableSequence[ScheduledExecutionRecord] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=ScheduledExecutionRecord, + ) ) disabled: bool = proto.Field( proto.BOOL, @@ -3869,6 +3873,7 @@ class State(proto.Enum): The workflow invocation is being cancelled, but some actions are still running. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -4157,6 +4162,7 @@ class State(proto.Enum): FAILED (6): The action failed. A terminal state. """ + PENDING = 0 RUNNING = 1 SKIPPED = 2 @@ -4489,12 +4495,12 @@ class QueryWorkflowInvocationActionsResponse(proto.Message): def raw_page(self): return self - workflow_invocation_actions: MutableSequence[ - "WorkflowInvocationAction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="WorkflowInvocationAction", + workflow_invocation_actions: MutableSequence["WorkflowInvocationAction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="WorkflowInvocationAction", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/__init__.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/__init__.py index be42b815916c..5affa244c348 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/__init__.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dataform import DataformAsyncClient, DataformClient from .types.dataform import ( CancelWorkflowInvocationRequest, diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/gapic_version.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/gapic_version.py index 9fcfa2a067f6..e0e81c108443 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/gapic_version.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.8.0" # {x-release-please-version} +__version__ = "0.9.0" # {x-release-please-version} diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/async_client.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/async_client.py index 6d6dca7508e9..b20c950fe3de 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/async_client.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataform_v1beta1 import gapic_version as package_version @@ -46,16 +46,18 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.type.interval_pb2 as interval_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataform_v1beta1.services.dataform import pagers from google.cloud.dataform_v1beta1.types import dataform @@ -154,7 +156,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataformAsyncClient: The constructed client. """ - return DataformClient.from_service_account_info.__func__(DataformAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataformClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataformAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -170,7 +175,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataformAsyncClient: The constructed client. """ - return DataformClient.from_service_account_file.__func__(DataformAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataformClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataformAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/client.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/client.py index 6b04467f39a9..3159cd594bf4 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/client.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataform_v1beta1 import gapic_version as package_version @@ -63,16 +63,18 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.type.interval_pb2 as interval_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataform_v1beta1.services.dataform import pagers from google.cloud.dataform_v1beta1.types import dataform @@ -914,11 +916,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataformClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataformClient._read_environment_variables() + ) self._client_cert_source = DataformClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -953,8 +953,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataformTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/pagers.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/pagers.py index c40c8f4c2190..79709e6d459a 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/pagers.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -307,7 +307,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -389,7 +389,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -467,7 +467,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -549,7 +549,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -627,7 +627,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -709,7 +709,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -785,7 +785,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -865,7 +865,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -943,7 +943,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1025,7 +1025,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1101,7 +1101,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1181,7 +1181,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1257,7 +1257,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1337,7 +1337,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1413,7 +1413,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1493,7 +1493,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1569,7 +1569,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1649,7 +1649,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1725,7 +1725,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1805,7 +1805,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1881,7 +1881,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1961,7 +1961,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2039,7 +2039,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2121,7 +2121,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2197,7 +2197,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2277,7 +2277,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2353,7 +2353,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2433,7 +2433,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2511,7 +2511,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/base.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/base.py index 946b35f4ed53..9ec9faa5efc5 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/base.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/base.py @@ -17,20 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataform_v1beta1 import gapic_version as package_version from google.cloud.dataform_v1beta1.types import dataform @@ -1298,13 +1300,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc.py index 9e1008915b68..90d69f342d3a 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc.py @@ -16,24 +16,26 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataform_v1beta1.types import dataform @@ -473,12 +475,12 @@ def query_team_folder_contents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_team_folder_contents" not in self._stubs: - self._stubs[ - "query_team_folder_contents" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/QueryTeamFolderContents", - request_serializer=dataform.QueryTeamFolderContentsRequest.serialize, - response_deserializer=dataform.QueryTeamFolderContentsResponse.deserialize, + self._stubs["query_team_folder_contents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/QueryTeamFolderContents", + request_serializer=dataform.QueryTeamFolderContentsRequest.serialize, + response_deserializer=dataform.QueryTeamFolderContentsResponse.deserialize, + ) ) return self._stubs["query_team_folder_contents"] @@ -953,12 +955,12 @@ def query_repository_directory_contents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_repository_directory_contents" not in self._stubs: - self._stubs[ - "query_repository_directory_contents" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/QueryRepositoryDirectoryContents", - request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, - response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + self._stubs["query_repository_directory_contents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/QueryRepositoryDirectoryContents", + request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, + response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + ) ) return self._stubs["query_repository_directory_contents"] @@ -1015,12 +1017,12 @@ def compute_repository_access_token_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "compute_repository_access_token_status" not in self._stubs: - self._stubs[ - "compute_repository_access_token_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/ComputeRepositoryAccessTokenStatus", - request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, - response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + self._stubs["compute_repository_access_token_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/ComputeRepositoryAccessTokenStatus", + request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, + response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + ) ) return self._stubs["compute_repository_access_token_status"] @@ -1867,12 +1869,12 @@ def query_compilation_result_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_compilation_result_actions" not in self._stubs: - self._stubs[ - "query_compilation_result_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/QueryCompilationResultActions", - request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, - response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + self._stubs["query_compilation_result_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/QueryCompilationResultActions", + request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, + response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + ) ) return self._stubs["query_compilation_result_actions"] @@ -2091,12 +2093,12 @@ def create_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_workflow_invocation" not in self._stubs: - self._stubs[ - "create_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/CreateWorkflowInvocation", - request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, - response_deserializer=dataform.WorkflowInvocation.deserialize, + self._stubs["create_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/CreateWorkflowInvocation", + request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, + response_deserializer=dataform.WorkflowInvocation.deserialize, + ) ) return self._stubs["create_workflow_invocation"] @@ -2119,12 +2121,12 @@ def delete_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_workflow_invocation" not in self._stubs: - self._stubs[ - "delete_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/DeleteWorkflowInvocation", - request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/DeleteWorkflowInvocation", + request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_workflow_invocation"] @@ -2151,12 +2153,12 @@ def cancel_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_workflow_invocation" not in self._stubs: - self._stubs[ - "cancel_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/CancelWorkflowInvocation", - request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, - response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + self._stubs["cancel_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/CancelWorkflowInvocation", + request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, + response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + ) ) return self._stubs["cancel_workflow_invocation"] @@ -2184,12 +2186,12 @@ def query_workflow_invocation_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_workflow_invocation_actions" not in self._stubs: - self._stubs[ - "query_workflow_invocation_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/QueryWorkflowInvocationActions", - request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, - response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + self._stubs["query_workflow_invocation_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/QueryWorkflowInvocationActions", + request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, + response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + ) ) return self._stubs["query_workflow_invocation_actions"] diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc_asyncio.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc_asyncio.py index 481a15d8d5c0..4a47e3f04cda 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc_asyncio.py @@ -17,26 +17,28 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataform_v1beta1.types import dataform @@ -481,12 +483,12 @@ def query_team_folder_contents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_team_folder_contents" not in self._stubs: - self._stubs[ - "query_team_folder_contents" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/QueryTeamFolderContents", - request_serializer=dataform.QueryTeamFolderContentsRequest.serialize, - response_deserializer=dataform.QueryTeamFolderContentsResponse.deserialize, + self._stubs["query_team_folder_contents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/QueryTeamFolderContents", + request_serializer=dataform.QueryTeamFolderContentsRequest.serialize, + response_deserializer=dataform.QueryTeamFolderContentsResponse.deserialize, + ) ) return self._stubs["query_team_folder_contents"] @@ -969,12 +971,12 @@ def query_repository_directory_contents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_repository_directory_contents" not in self._stubs: - self._stubs[ - "query_repository_directory_contents" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/QueryRepositoryDirectoryContents", - request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, - response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + self._stubs["query_repository_directory_contents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/QueryRepositoryDirectoryContents", + request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, + response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + ) ) return self._stubs["query_repository_directory_contents"] @@ -1031,12 +1033,12 @@ def compute_repository_access_token_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "compute_repository_access_token_status" not in self._stubs: - self._stubs[ - "compute_repository_access_token_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/ComputeRepositoryAccessTokenStatus", - request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, - response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + self._stubs["compute_repository_access_token_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/ComputeRepositoryAccessTokenStatus", + request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, + response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + ) ) return self._stubs["compute_repository_access_token_status"] @@ -1913,12 +1915,12 @@ def query_compilation_result_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_compilation_result_actions" not in self._stubs: - self._stubs[ - "query_compilation_result_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/QueryCompilationResultActions", - request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, - response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + self._stubs["query_compilation_result_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/QueryCompilationResultActions", + request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, + response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + ) ) return self._stubs["query_compilation_result_actions"] @@ -2147,12 +2149,12 @@ def create_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_workflow_invocation" not in self._stubs: - self._stubs[ - "create_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/CreateWorkflowInvocation", - request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, - response_deserializer=dataform.WorkflowInvocation.deserialize, + self._stubs["create_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/CreateWorkflowInvocation", + request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, + response_deserializer=dataform.WorkflowInvocation.deserialize, + ) ) return self._stubs["create_workflow_invocation"] @@ -2177,12 +2179,12 @@ def delete_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_workflow_invocation" not in self._stubs: - self._stubs[ - "delete_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/DeleteWorkflowInvocation", - request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/DeleteWorkflowInvocation", + request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_workflow_invocation"] @@ -2209,12 +2211,12 @@ def cancel_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_workflow_invocation" not in self._stubs: - self._stubs[ - "cancel_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/CancelWorkflowInvocation", - request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, - response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + self._stubs["cancel_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/CancelWorkflowInvocation", + request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, + response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + ) ) return self._stubs["cancel_workflow_invocation"] @@ -2242,12 +2244,12 @@ def query_workflow_invocation_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_workflow_invocation_actions" not in self._stubs: - self._stubs[ - "query_workflow_invocation_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/QueryWorkflowInvocationActions", - request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, - response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + self._stubs["query_workflow_invocation_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/QueryWorkflowInvocationActions", + request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, + response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + ) ) return self._stubs["query_workflow_invocation_actions"] diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest.py index 812670b46cd2..05d9c361f7f8 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest.py @@ -16,23 +16,25 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dataform_v1beta1.types import dataform @@ -4151,9 +4153,7 @@ def __call__( ``CancelWorkflowInvocation`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseCancelWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCancelWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_cancel_workflow_invocation( request, metadata @@ -4305,9 +4305,7 @@ def __call__( ``CommitRepositoryChanges`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseCommitRepositoryChanges._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCommitRepositoryChanges._get_http_options() request, metadata = self._interceptor.pre_commit_repository_changes( request, metadata @@ -4459,9 +4457,7 @@ def __call__( ``CommitWorkspaceChanges`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseCommitWorkspaceChanges._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCommitWorkspaceChanges._get_http_options() request, metadata = self._interceptor.pre_commit_workspace_changes( request, metadata @@ -4614,15 +4610,12 @@ def __call__( ``ComputeRepositoryAccessTokenStatus`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseComputeRepositoryAccessTokenStatus._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseComputeRepositoryAccessTokenStatus._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_compute_repository_access_token_status( - request, metadata + request, metadata = ( + self._interceptor.pre_compute_repository_access_token_status( + request, metadata + ) ) transcoded_request = _BaseDataformRestTransport._BaseComputeRepositoryAccessTokenStatus._get_transcoded_request( http_options, request @@ -4685,11 +4678,10 @@ def __call__( resp = self._interceptor.post_compute_repository_access_token_status(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_compute_repository_access_token_status_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_compute_repository_access_token_status_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4775,9 +4767,7 @@ def __call__( """ - http_options = ( - _BaseDataformRestTransport._BaseCreateCompilationResult._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCreateCompilationResult._get_http_options() request, metadata = self._interceptor.pre_create_compilation_result( request, metadata @@ -5713,9 +5703,7 @@ def __call__( """ - http_options = ( - _BaseDataformRestTransport._BaseCreateWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCreateWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_create_workflow_invocation( request, metadata @@ -6563,9 +6551,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataformRestTransport._BaseDeleteWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseDeleteWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_delete_workflow_invocation( request, metadata @@ -7379,9 +7365,7 @@ def __call__( ``FetchRepositoryHistory`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseFetchRepositoryHistory._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseFetchRepositoryHistory._get_http_options() request, metadata = self._interceptor.pre_fetch_repository_history( request, metadata @@ -8793,9 +8777,7 @@ def __call__( """ - http_options = ( - _BaseDataformRestTransport._BaseGetWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseGetWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_get_workflow_invocation( request, metadata @@ -9239,9 +9221,7 @@ def __call__( ``ListCompilationResults`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseListCompilationResults._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseListCompilationResults._get_http_options() request, metadata = self._interceptor.pre_list_compilation_results( request, metadata @@ -9833,9 +9813,7 @@ def __call__( ``ListWorkflowInvocations`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseListWorkflowInvocations._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseListWorkflowInvocations._get_http_options() request, metadata = self._interceptor.pre_list_workflow_invocations( request, metadata @@ -11214,9 +11192,7 @@ def __call__( ``QueryCompilationResultActions`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryCompilationResultActions._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryCompilationResultActions._get_http_options() request, metadata = self._interceptor.pre_query_compilation_result_actions( request, metadata @@ -11282,11 +11258,10 @@ def __call__( resp = self._interceptor.post_query_compilation_result_actions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_compilation_result_actions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_compilation_result_actions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -11367,9 +11342,7 @@ def __call__( ``QueryDirectoryContents`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryDirectoryContents._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryDirectoryContents._get_http_options() request, metadata = self._interceptor.pre_query_directory_contents( request, metadata @@ -11665,15 +11638,12 @@ def __call__( ``QueryRepositoryDirectoryContents`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryRepositoryDirectoryContents._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryRepositoryDirectoryContents._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_query_repository_directory_contents( - request, metadata + request, metadata = ( + self._interceptor.pre_query_repository_directory_contents( + request, metadata + ) ) transcoded_request = _BaseDataformRestTransport._BaseQueryRepositoryDirectoryContents._get_transcoded_request( http_options, request @@ -11736,11 +11706,10 @@ def __call__( resp = self._interceptor.post_query_repository_directory_contents(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_repository_directory_contents_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_repository_directory_contents_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -11824,9 +11793,7 @@ def __call__( ``QueryTeamFolderContents`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryTeamFolderContents._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryTeamFolderContents._get_http_options() request, metadata = self._interceptor.pre_query_team_folder_contents( request, metadata @@ -11972,9 +11939,7 @@ def __call__( ``QueryUserRootContents`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryUserRootContents._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryUserRootContents._get_http_options() request, metadata = self._interceptor.pre_query_user_root_contents( request, metadata @@ -12121,9 +12086,7 @@ def __call__( ``QueryWorkflowInvocationActions`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryWorkflowInvocationActions._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryWorkflowInvocationActions._get_http_options() request, metadata = self._interceptor.pre_query_workflow_invocation_actions( request, metadata @@ -12189,11 +12152,10 @@ def __call__( resp = self._interceptor.post_query_workflow_invocation_actions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_workflow_invocation_actions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_workflow_invocation_actions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -12881,9 +12843,7 @@ def __call__( ``ResetWorkspaceChanges`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseResetWorkspaceChanges._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseResetWorkspaceChanges._get_http_options() request, metadata = self._interceptor.pre_reset_workspace_changes( request, metadata @@ -14752,7 +14712,9 @@ def cancel_workflow_invocation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CancelWorkflowInvocation(self._session, self._host, self._interceptor) # type: ignore + return self._CancelWorkflowInvocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def commit_repository_changes( @@ -14763,7 +14725,9 @@ def commit_repository_changes( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CommitRepositoryChanges(self._session, self._host, self._interceptor) # type: ignore + return self._CommitRepositoryChanges( + self._session, self._host, self._interceptor + ) # type: ignore @property def commit_workspace_changes( @@ -14774,7 +14738,9 @@ def commit_workspace_changes( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CommitWorkspaceChanges(self._session, self._host, self._interceptor) # type: ignore + return self._CommitWorkspaceChanges( + self._session, self._host, self._interceptor + ) # type: ignore @property def compute_repository_access_token_status( @@ -14785,7 +14751,9 @@ def compute_repository_access_token_status( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ComputeRepositoryAccessTokenStatus(self._session, self._host, self._interceptor) # type: ignore + return self._ComputeRepositoryAccessTokenStatus( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_compilation_result( @@ -14795,7 +14763,9 @@ def create_compilation_result( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateCompilationResult(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCompilationResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_folder( @@ -14845,7 +14815,9 @@ def create_workflow_invocation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateWorkflowInvocation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateWorkflowInvocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_workspace( @@ -14901,7 +14873,9 @@ def delete_workflow_invocation( ) -> Callable[[dataform.DeleteWorkflowInvocationRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteWorkflowInvocation(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteWorkflowInvocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_workspace( @@ -14958,7 +14932,9 @@ def fetch_repository_history( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchRepositoryHistory(self._session, self._host, self._interceptor) # type: ignore + return self._FetchRepositoryHistory( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_compilation_result( @@ -15055,7 +15031,9 @@ def list_compilation_results( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListCompilationResults(self._session, self._host, self._interceptor) # type: ignore + return self._ListCompilationResults( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_release_configs( @@ -15096,7 +15074,9 @@ def list_workflow_invocations( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListWorkflowInvocations(self._session, self._host, self._interceptor) # type: ignore + return self._ListWorkflowInvocations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_workspaces( @@ -15171,7 +15151,9 @@ def query_compilation_result_actions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._QueryCompilationResultActions(self._session, self._host, self._interceptor) # type: ignore + return self._QueryCompilationResultActions( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_directory_contents( @@ -15182,7 +15164,9 @@ def query_directory_contents( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._QueryDirectoryContents(self._session, self._host, self._interceptor) # type: ignore + return self._QueryDirectoryContents( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_folder_contents( @@ -15203,7 +15187,9 @@ def query_repository_directory_contents( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._QueryRepositoryDirectoryContents(self._session, self._host, self._interceptor) # type: ignore + return self._QueryRepositoryDirectoryContents( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_team_folder_contents( @@ -15214,7 +15200,9 @@ def query_team_folder_contents( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._QueryTeamFolderContents(self._session, self._host, self._interceptor) # type: ignore + return self._QueryTeamFolderContents( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_user_root_contents( @@ -15235,7 +15223,9 @@ def query_workflow_invocation_actions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._QueryWorkflowInvocationActions(self._session, self._host, self._interceptor) # type: ignore + return self._QueryWorkflowInvocationActions( + self._session, self._host, self._interceptor + ) # type: ignore @property def read_file( diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest_base.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest_base.py index 21939bfb4e01..7629e1351b6e 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest_base.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest_base.py @@ -17,15 +17,17 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import gapic_v1, path_template +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataform_v1beta1.types import dataform diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/types/dataform.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/types/dataform.py index 272ac6f869ac..ff3b493e98b1 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/types/dataform.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/types/dataform.py @@ -296,6 +296,7 @@ class TokenStatus(proto.Enum): The token was used successfully to authenticate against the Git remote. """ + TOKEN_STATUS_UNSPECIFIED = 0 NOT_FOUND = 1 INVALID = 2 @@ -1064,6 +1065,7 @@ class TokenStatus(proto.Enum): The token was used successfully to authenticate against the Git remote. """ + TOKEN_STATUS_UNSPECIFIED = 0 NOT_FOUND = 1 INVALID = 2 @@ -1446,6 +1448,7 @@ class State(proto.Enum): HAS_CONFLICTS (4): The file contains merge conflicts. """ + STATE_UNSPECIFIED = 0 ADDED = 1 DELETED = 2 @@ -1462,12 +1465,12 @@ class State(proto.Enum): enum="FetchFileGitStatusesResponse.UncommittedFileChange.State", ) - uncommitted_file_changes: MutableSequence[ - UncommittedFileChange - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=UncommittedFileChange, + uncommitted_file_changes: MutableSequence[UncommittedFileChange] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=UncommittedFileChange, + ) ) @@ -2217,12 +2220,12 @@ class ScheduledReleaseRecord(proto.Message): proto.STRING, number=7, ) - recent_scheduled_release_records: MutableSequence[ - ScheduledReleaseRecord - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=ScheduledReleaseRecord, + recent_scheduled_release_records: MutableSequence[ScheduledReleaseRecord] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=ScheduledReleaseRecord, + ) ) release_compilation_result: str = proto.Field( proto.STRING, @@ -3017,6 +3020,7 @@ class RelationType(proto.Enum): MATERIALIZED_VIEW (4): The relation is a materialized view. """ + RELATION_TYPE_UNSPECIFIED = 0 TABLE = 1 VIEW = 2 @@ -3032,6 +3036,7 @@ class TableFormat(proto.Enum): ICEBERG (1): Apache Iceberg format. """ + TABLE_FORMAT_UNSPECIFIED = 0 ICEBERG = 1 @@ -3044,6 +3049,7 @@ class FileFormat(proto.Enum): PARQUET (1): Apache Parquet format. """ + FILE_FORMAT_UNSPECIFIED = 0 PARQUET = 1 @@ -3636,12 +3642,12 @@ class QueryCompilationResultActionsResponse(proto.Message): def raw_page(self): return self - compilation_result_actions: MutableSequence[ - "CompilationResultAction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CompilationResultAction", + compilation_result_actions: MutableSequence["CompilationResultAction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CompilationResultAction", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -3764,12 +3770,12 @@ class ScheduledExecutionRecord(proto.Message): proto.STRING, number=7, ) - recent_scheduled_execution_records: MutableSequence[ - ScheduledExecutionRecord - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=ScheduledExecutionRecord, + recent_scheduled_execution_records: MutableSequence[ScheduledExecutionRecord] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=ScheduledExecutionRecord, + ) ) disabled: bool = proto.Field( proto.BOOL, @@ -3844,6 +3850,7 @@ class QueryPriority(proto.Enum): priority. More information can be found at https://cloud.google.com/bigquery/docs/running-queries#batchqueries. """ + QUERY_PRIORITY_UNSPECIFIED = 0 INTERACTIVE = 1 BATCH = 2 @@ -4111,6 +4118,7 @@ class State(proto.Enum): The workflow invocation is being cancelled, but some actions are still running. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -4404,6 +4412,7 @@ class State(proto.Enum): FAILED (6): The action failed. A terminal state. """ + PENDING = 0 RUNNING = 1 SKIPPED = 2 @@ -4736,12 +4745,12 @@ class QueryWorkflowInvocationActionsResponse(proto.Message): def raw_page(self): return self - workflow_invocation_actions: MutableSequence[ - "WorkflowInvocationAction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="WorkflowInvocationAction", + workflow_invocation_actions: MutableSequence["WorkflowInvocationAction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="WorkflowInvocationAction", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -5679,6 +5688,7 @@ class State(proto.Enum): FAILED (4): The move has failed. """ + STATE_UNSPECIFIED = 0 INITIALIZED = 1 IN_PROGRESS = 2 @@ -5746,6 +5756,7 @@ class State(proto.Enum): FAILED (4): The move has failed. """ + STATE_UNSPECIFIED = 0 INITIALIZED = 1 IN_PROGRESS = 2 diff --git a/packages/google-cloud-dataform/mypy.ini b/packages/google-cloud-dataform/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-dataform/mypy.ini +++ b/packages/google-cloud-dataform/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-dataform/noxfile.py b/packages/google-cloud-dataform/noxfile.py index 93139dee1aec..478c53b2a02b 100644 --- a/packages/google-cloud-dataform/noxfile.py +++ b/packages/google-cloud-dataform/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_get_iam_policy_async.py b/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_get_iam_policy_async.py index e37f64e71ab4..a99fc29cab33 100644 --- a/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_get_iam_policy_async.py +++ b/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataform -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START dataform_v1beta1_generated_Dataform_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataform_v1beta1 diff --git a/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_get_iam_policy_sync.py b/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_get_iam_policy_sync.py index 39b8acb5dbcd..25cf896dd87f 100644 --- a/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_get_iam_policy_sync.py +++ b/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataform -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START dataform_v1beta1_generated_Dataform_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataform_v1beta1 diff --git a/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_set_iam_policy_async.py b/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_set_iam_policy_async.py index 5bc6b3a25d3f..b76963094e7f 100644 --- a/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_set_iam_policy_async.py +++ b/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataform -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START dataform_v1beta1_generated_Dataform_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataform_v1beta1 diff --git a/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_set_iam_policy_sync.py b/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_set_iam_policy_sync.py index c7f24e1a1ca2..00c7490531ed 100644 --- a/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_set_iam_policy_sync.py +++ b/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataform -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START dataform_v1beta1_generated_Dataform_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataform_v1beta1 diff --git a/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_test_iam_permissions_async.py b/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_test_iam_permissions_async.py index 42224f655dc1..9e49b160f58f 100644 --- a/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_test_iam_permissions_async.py +++ b/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataform -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START dataform_v1beta1_generated_Dataform_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataform_v1beta1 diff --git a/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_test_iam_permissions_sync.py b/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_test_iam_permissions_sync.py index 4d9daaf5191c..de385b6ee314 100644 --- a/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_test_iam_permissions_sync.py +++ b/packages/google-cloud-dataform/samples/generated_samples/dataform_v1beta1_generated_dataform_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataform -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START dataform_v1beta1_generated_Dataform_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataform_v1beta1 diff --git a/packages/google-cloud-dataform/samples/generated_samples/snippet_metadata_google.cloud.dataform.v1.json b/packages/google-cloud-dataform/samples/generated_samples/snippet_metadata_google.cloud.dataform.v1.json index 87b39dd07c55..3e0007fe1326 100644 --- a/packages/google-cloud-dataform/samples/generated_samples/snippet_metadata_google.cloud.dataform.v1.json +++ b/packages/google-cloud-dataform/samples/generated_samples/snippet_metadata_google.cloud.dataform.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-dataform", - "version": "0.8.0" + "version": "0.9.0" }, "snippets": [ { diff --git a/packages/google-cloud-dataform/samples/generated_samples/snippet_metadata_google.cloud.dataform.v1beta1.json b/packages/google-cloud-dataform/samples/generated_samples/snippet_metadata_google.cloud.dataform.v1beta1.json index 572c003b9af1..613228fda94d 100644 --- a/packages/google-cloud-dataform/samples/generated_samples/snippet_metadata_google.cloud.dataform.v1beta1.json +++ b/packages/google-cloud-dataform/samples/generated_samples/snippet_metadata_google.cloud.dataform.v1beta1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-dataform", - "version": "0.8.0" + "version": "0.9.0" }, "snippets": [ { diff --git a/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1/test_dataform.py b/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1/test_dataform.py index 5769dcbc2d22..bedb5070066e 100644 --- a/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1/test_dataform.py +++ b/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1/test_dataform.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,23 +43,30 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.oauth2 import service_account 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.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore import google.type.interval_pb2 as interval_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.cloud.location import locations_pb2 +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.oauth2 import service_account from google.cloud.dataform_v1.services.dataform import ( DataformAsyncClient, @@ -916,10 +923,9 @@ def test_dataform_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +970,9 @@ def test_dataform_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1008,9 @@ def test_dataform_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1235,9 +1239,7 @@ def test_dataform_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1359,9 +1361,9 @@ def test_list_repositories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -2268,9 +2270,9 @@ def test_create_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -2649,9 +2651,9 @@ def test_update_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -3006,9 +3008,9 @@ def test_delete_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -3601,9 +3603,9 @@ def test_read_repository_file_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.read_repository_file - ] = mock_rpc + client._transport._wrapped_methods[client._transport.read_repository_file] = ( + mock_rpc + ) request = {} client.read_repository_file(request) @@ -5049,9 +5051,9 @@ def test_fetch_remote_branches_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_remote_branches - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_remote_branches] = ( + mock_rpc + ) request = {} client.fetch_remote_branches(request) @@ -6152,9 +6154,9 @@ def test_create_workspace_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workspace] = ( + mock_rpc + ) request = {} client.create_workspace(request) @@ -6492,9 +6494,9 @@ def test_delete_workspace_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workspace] = ( + mock_rpc + ) request = {} client.delete_workspace(request) @@ -6811,9 +6813,9 @@ def test_install_npm_packages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.install_npm_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.install_npm_packages] = ( + mock_rpc + ) request = {} client.install_npm_packages(request) @@ -7056,9 +7058,9 @@ def test_pull_git_commits_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.pull_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.pull_git_commits] = ( + mock_rpc + ) request = {} client.pull_git_commits(request) @@ -7295,9 +7297,9 @@ def test_push_git_commits_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.push_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.push_git_commits] = ( + mock_rpc + ) request = {} client.push_git_commits(request) @@ -7796,9 +7798,9 @@ def test_fetch_git_ahead_behind_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_git_ahead_behind - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_git_ahead_behind] = ( + mock_rpc + ) request = {} client.fetch_git_ahead_behind(request) @@ -9931,9 +9933,9 @@ def test_remove_directory_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_directory - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_directory] = ( + mock_rpc + ) request = {} client.remove_directory(request) @@ -11372,9 +11374,9 @@ def test_list_release_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_release_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_release_configs] = ( + mock_rpc + ) request = {} client.list_release_configs(request) @@ -11929,9 +11931,9 @@ def test_get_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_release_config] = ( + mock_rpc + ) request = {} client.get_release_config(request) @@ -12297,9 +12299,9 @@ def test_create_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_release_config] = ( + mock_rpc + ) request = {} client.create_release_config(request) @@ -12679,9 +12681,9 @@ def test_update_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_release_config] = ( + mock_rpc + ) request = {} client.update_release_config(request) @@ -13040,9 +13042,9 @@ def test_delete_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_release_config] = ( + mock_rpc + ) request = {} client.delete_release_config(request) @@ -13936,9 +13938,9 @@ def test_get_compilation_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_compilation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_compilation_result] = ( + mock_rpc + ) request = {} client.get_compilation_result(request) @@ -15127,9 +15129,9 @@ def test_list_workflow_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_workflow_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_workflow_configs] = ( + mock_rpc + ) request = {} client.list_workflow_configs(request) @@ -15682,9 +15684,9 @@ def test_get_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_workflow_config] = ( + mock_rpc + ) request = {} client.get_workflow_config(request) @@ -16046,9 +16048,9 @@ def test_create_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workflow_config] = ( + mock_rpc + ) request = {} client.create_workflow_config(request) @@ -16424,9 +16426,9 @@ def test_update_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_workflow_config] = ( + mock_rpc + ) request = {} client.update_workflow_config(request) @@ -16783,9 +16785,9 @@ def test_delete_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workflow_config] = ( + mock_rpc + ) request = {} client.delete_workflow_config(request) @@ -20030,9 +20032,9 @@ def test_list_repositories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -20470,9 +20472,9 @@ def test_create_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -20679,9 +20681,9 @@ def test_update_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -20863,9 +20865,9 @@ def test_delete_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -21178,9 +21180,9 @@ def test_read_repository_file_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.read_repository_file - ] = mock_rpc + client._transport._wrapped_methods[client._transport.read_repository_file] = ( + mock_rpc + ) request = {} client.read_repository_file(request) @@ -21890,9 +21892,9 @@ def test_fetch_remote_branches_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_remote_branches - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_remote_branches] = ( + mock_rpc + ) request = {} client.fetch_remote_branches(request) @@ -22452,9 +22454,9 @@ def test_create_workspace_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workspace] = ( + mock_rpc + ) request = {} client.create_workspace(request) @@ -22663,9 +22665,9 @@ def test_delete_workspace_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workspace] = ( + mock_rpc + ) request = {} client.delete_workspace(request) @@ -22842,9 +22844,9 @@ def test_install_npm_packages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.install_npm_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.install_npm_packages] = ( + mock_rpc + ) request = {} client.install_npm_packages(request) @@ -22965,9 +22967,9 @@ def test_pull_git_commits_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.pull_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.pull_git_commits] = ( + mock_rpc + ) request = {} client.pull_git_commits(request) @@ -23096,9 +23098,9 @@ def test_push_git_commits_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.push_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.push_git_commits] = ( + mock_rpc + ) request = {} client.push_git_commits(request) @@ -23347,9 +23349,9 @@ def test_fetch_git_ahead_behind_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_git_ahead_behind - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_git_ahead_behind] = ( + mock_rpc + ) request = {} client.fetch_git_ahead_behind(request) @@ -24412,9 +24414,9 @@ def test_remove_directory_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_directory - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_directory] = ( + mock_rpc + ) request = {} client.remove_directory(request) @@ -25241,9 +25243,9 @@ def test_list_release_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_release_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_release_configs] = ( + mock_rpc + ) request = {} client.list_release_configs(request) @@ -25505,9 +25507,9 @@ def test_get_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_release_config] = ( + mock_rpc + ) request = {} client.get_release_config(request) @@ -25690,9 +25692,9 @@ def test_create_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_release_config] = ( + mock_rpc + ) request = {} client.create_release_config(request) @@ -25904,9 +25906,9 @@ def test_update_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_release_config] = ( + mock_rpc + ) request = {} client.update_release_config(request) @@ -26091,9 +26093,9 @@ def test_delete_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_release_config] = ( + mock_rpc + ) request = {} client.delete_release_config(request) @@ -26540,9 +26542,9 @@ def test_get_compilation_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_compilation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_compilation_result] = ( + mock_rpc + ) request = {} client.get_compilation_result(request) @@ -27138,9 +27140,9 @@ def test_list_workflow_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_workflow_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_workflow_configs] = ( + mock_rpc + ) request = {} client.list_workflow_configs(request) @@ -27402,9 +27404,9 @@ def test_get_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_workflow_config] = ( + mock_rpc + ) request = {} client.get_workflow_config(request) @@ -27587,9 +27589,9 @@ def test_create_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workflow_config] = ( + mock_rpc + ) request = {} client.create_workflow_config(request) @@ -27801,9 +27803,9 @@ def test_update_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_workflow_config] = ( + mock_rpc + ) request = {} client.update_workflow_config(request) @@ -27988,9 +27990,9 @@ def test_delete_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workflow_config] = ( + mock_rpc + ) request = {} client.delete_workflow_config(request) diff --git a/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1beta1/test_dataform.py b/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1beta1/test_dataform.py index d252386f1488..ee66e805419b 100644 --- a/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1beta1/test_dataform.py +++ b/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1beta1/test_dataform.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,29 +65,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.options_pb2 as options_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.rpc.status_pb2 as status_pb2 # type: ignore -import google.type.expr_pb2 as expr_pb2 # type: ignore -import google.type.interval_pb2 as interval_pb2 # type: ignore from google.cloud.dataform_v1beta1.services.dataform import ( DataformAsyncClient, @@ -931,10 +933,9 @@ def test_dataform_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +980,9 @@ def test_dataform_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1018,9 @@ def test_dataform_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1250,9 +1249,7 @@ def test_dataform_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1707,9 +1704,9 @@ def test_create_team_folder_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_team_folder - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_team_folder] = ( + mock_rpc + ) request = {} client.create_team_folder(request) @@ -2062,9 +2059,9 @@ def test_update_team_folder_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_team_folder - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_team_folder] = ( + mock_rpc + ) request = {} client.update_team_folder(request) @@ -2412,9 +2409,9 @@ def test_delete_team_folder_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_team_folder - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_team_folder] = ( + mock_rpc + ) request = {} client.delete_team_folder(request) @@ -3313,9 +3310,9 @@ def test_search_team_folders_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_team_folders - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_team_folders] = ( + mock_rpc + ) request = {} client.search_team_folders(request) @@ -5127,9 +5124,9 @@ def test_query_folder_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_folder_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_folder_contents] = ( + mock_rpc + ) request = {} client.query_folder_contents(request) @@ -6579,9 +6576,9 @@ def test_list_repositories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -7500,9 +7497,9 @@ def test_create_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -7889,9 +7886,9 @@ def test_update_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -8250,9 +8247,9 @@ def test_delete_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -9184,9 +9181,9 @@ def test_read_repository_file_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.read_repository_file - ] = mock_rpc + client._transport._wrapped_methods[client._transport.read_repository_file] = ( + mock_rpc + ) request = {} client.read_repository_file(request) @@ -10632,9 +10629,9 @@ def test_fetch_remote_branches_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_remote_branches - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_remote_branches] = ( + mock_rpc + ) request = {} client.fetch_remote_branches(request) @@ -11741,9 +11738,9 @@ def test_create_workspace_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workspace] = ( + mock_rpc + ) request = {} client.create_workspace(request) @@ -12083,9 +12080,9 @@ def test_delete_workspace_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workspace] = ( + mock_rpc + ) request = {} client.delete_workspace(request) @@ -12402,9 +12399,9 @@ def test_install_npm_packages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.install_npm_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.install_npm_packages] = ( + mock_rpc + ) request = {} client.install_npm_packages(request) @@ -12647,9 +12644,9 @@ def test_pull_git_commits_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.pull_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.pull_git_commits] = ( + mock_rpc + ) request = {} client.pull_git_commits(request) @@ -12886,9 +12883,9 @@ def test_push_git_commits_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.push_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.push_git_commits] = ( + mock_rpc + ) request = {} client.push_git_commits(request) @@ -13387,9 +13384,9 @@ def test_fetch_git_ahead_behind_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_git_ahead_behind - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_git_ahead_behind] = ( + mock_rpc + ) request = {} client.fetch_git_ahead_behind(request) @@ -15522,9 +15519,9 @@ def test_remove_directory_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_directory - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_directory] = ( + mock_rpc + ) request = {} client.remove_directory(request) @@ -16963,9 +16960,9 @@ def test_list_release_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_release_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_release_configs] = ( + mock_rpc + ) request = {} client.list_release_configs(request) @@ -17520,9 +17517,9 @@ def test_get_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_release_config] = ( + mock_rpc + ) request = {} client.get_release_config(request) @@ -17888,9 +17885,9 @@ def test_create_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_release_config] = ( + mock_rpc + ) request = {} client.create_release_config(request) @@ -18270,9 +18267,9 @@ def test_update_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_release_config] = ( + mock_rpc + ) request = {} client.update_release_config(request) @@ -18631,9 +18628,9 @@ def test_delete_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_release_config] = ( + mock_rpc + ) request = {} client.delete_release_config(request) @@ -19527,9 +19524,9 @@ def test_get_compilation_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_compilation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_compilation_result] = ( + mock_rpc + ) request = {} client.get_compilation_result(request) @@ -20718,9 +20715,9 @@ def test_list_workflow_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_workflow_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_workflow_configs] = ( + mock_rpc + ) request = {} client.list_workflow_configs(request) @@ -21273,9 +21270,9 @@ def test_get_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_workflow_config] = ( + mock_rpc + ) request = {} client.get_workflow_config(request) @@ -21637,9 +21634,9 @@ def test_create_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workflow_config] = ( + mock_rpc + ) request = {} client.create_workflow_config(request) @@ -22015,9 +22012,9 @@ def test_update_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_workflow_config] = ( + mock_rpc + ) request = {} client.update_workflow_config(request) @@ -22374,9 +22371,9 @@ def test_delete_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workflow_config] = ( + mock_rpc + ) request = {} client.delete_workflow_config(request) @@ -26300,9 +26297,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -26687,9 +26684,9 @@ def test_create_team_folder_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_team_folder - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_team_folder] = ( + mock_rpc + ) request = {} client.create_team_folder(request) @@ -26882,9 +26879,9 @@ def test_update_team_folder_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_team_folder - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_team_folder] = ( + mock_rpc + ) request = {} client.update_team_folder(request) @@ -27068,9 +27065,9 @@ def test_delete_team_folder_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_team_folder - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_team_folder] = ( + mock_rpc + ) request = {} client.delete_team_folder(request) @@ -27521,9 +27518,9 @@ def test_search_team_folders_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_team_folders - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_team_folders] = ( + mock_rpc + ) request = {} client.search_team_folders(request) @@ -28445,9 +28442,9 @@ def test_query_folder_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_folder_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_folder_contents] = ( + mock_rpc + ) request = {} client.query_folder_contents(request) @@ -29160,9 +29157,9 @@ def test_list_repositories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -29600,9 +29597,9 @@ def test_create_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -29809,9 +29806,9 @@ def test_update_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -29993,9 +29990,9 @@ def test_delete_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -30490,9 +30487,9 @@ def test_read_repository_file_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.read_repository_file - ] = mock_rpc + client._transport._wrapped_methods[client._transport.read_repository_file] = ( + mock_rpc + ) request = {} client.read_repository_file(request) @@ -31202,9 +31199,9 @@ def test_fetch_remote_branches_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_remote_branches - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_remote_branches] = ( + mock_rpc + ) request = {} client.fetch_remote_branches(request) @@ -31764,9 +31761,9 @@ def test_create_workspace_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workspace] = ( + mock_rpc + ) request = {} client.create_workspace(request) @@ -31975,9 +31972,9 @@ def test_delete_workspace_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workspace] = ( + mock_rpc + ) request = {} client.delete_workspace(request) @@ -32154,9 +32151,9 @@ def test_install_npm_packages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.install_npm_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.install_npm_packages] = ( + mock_rpc + ) request = {} client.install_npm_packages(request) @@ -32277,9 +32274,9 @@ def test_pull_git_commits_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.pull_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.pull_git_commits] = ( + mock_rpc + ) request = {} client.pull_git_commits(request) @@ -32408,9 +32405,9 @@ def test_push_git_commits_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.push_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.push_git_commits] = ( + mock_rpc + ) request = {} client.push_git_commits(request) @@ -32659,9 +32656,9 @@ def test_fetch_git_ahead_behind_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_git_ahead_behind - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_git_ahead_behind] = ( + mock_rpc + ) request = {} client.fetch_git_ahead_behind(request) @@ -33724,9 +33721,9 @@ def test_remove_directory_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_directory - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_directory] = ( + mock_rpc + ) request = {} client.remove_directory(request) @@ -34553,9 +34550,9 @@ def test_list_release_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_release_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_release_configs] = ( + mock_rpc + ) request = {} client.list_release_configs(request) @@ -34817,9 +34814,9 @@ def test_get_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_release_config] = ( + mock_rpc + ) request = {} client.get_release_config(request) @@ -35002,9 +34999,9 @@ def test_create_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_release_config] = ( + mock_rpc + ) request = {} client.create_release_config(request) @@ -35216,9 +35213,9 @@ def test_update_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_release_config] = ( + mock_rpc + ) request = {} client.update_release_config(request) @@ -35403,9 +35400,9 @@ def test_delete_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_release_config] = ( + mock_rpc + ) request = {} client.delete_release_config(request) @@ -35852,9 +35849,9 @@ def test_get_compilation_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_compilation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_compilation_result] = ( + mock_rpc + ) request = {} client.get_compilation_result(request) @@ -36450,9 +36447,9 @@ def test_list_workflow_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_workflow_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_workflow_configs] = ( + mock_rpc + ) request = {} client.list_workflow_configs(request) @@ -36714,9 +36711,9 @@ def test_get_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_workflow_config] = ( + mock_rpc + ) request = {} client.get_workflow_config(request) @@ -36899,9 +36896,9 @@ def test_create_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workflow_config] = ( + mock_rpc + ) request = {} client.create_workflow_config(request) @@ -37113,9 +37110,9 @@ def test_update_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_workflow_config] = ( + mock_rpc + ) request = {} client.update_workflow_config(request) @@ -37300,9 +37297,9 @@ def test_delete_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workflow_config] = ( + mock_rpc + ) request = {} client.delete_workflow_config(request) @@ -39308,9 +39305,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/__init__.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/__init__.py index be1c66719d7a..d68667af532f 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/__init__.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_labeling_service import ( DataLabelingServiceAsyncClient, DataLabelingServiceClient, diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/async_client.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/async_client.py index d551abb708f7..b7cf96316290 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/async_client.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datalabeling_v1beta1 import gapic_version as package_version @@ -50,21 +50,24 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.datalabeling_v1beta1.services.data_labeling_service import pagers -from google.cloud.datalabeling_v1beta1.types import data_labeling_service, data_payloads +from google.cloud.datalabeling_v1beta1.types import ( + annotation, + annotation_spec_set, + data_labeling_service, + data_payloads, + dataset, + evaluation, + evaluation_job, + human_annotation_config, + instruction, + operations, +) from google.cloud.datalabeling_v1beta1.types import ( annotation_spec_set as gcd_annotation_spec_set, ) +from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job from google.cloud.datalabeling_v1beta1.types import instruction as gcd_instruction -from google.cloud.datalabeling_v1beta1.types import annotation -from google.cloud.datalabeling_v1beta1.types import annotation_spec_set -from google.cloud.datalabeling_v1beta1.types import dataset -from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset -from google.cloud.datalabeling_v1beta1.types import evaluation -from google.cloud.datalabeling_v1beta1.types import evaluation_job -from google.cloud.datalabeling_v1beta1.types import human_annotation_config -from google.cloud.datalabeling_v1beta1.types import instruction -from google.cloud.datalabeling_v1beta1.types import operations from .client import DataLabelingServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataLabelingServiceTransport @@ -160,7 +163,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataLabelingServiceAsyncClient: The constructed client. """ - return DataLabelingServiceClient.from_service_account_info.__func__(DataLabelingServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataLabelingServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataLabelingServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -176,7 +182,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataLabelingServiceAsyncClient: The constructed client. """ - return DataLabelingServiceClient.from_service_account_file.__func__(DataLabelingServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataLabelingServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataLabelingServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -214,7 +223,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataLabelingServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataLabelingServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataLabelingServiceTransport: diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/client.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/client.py index 599ac606dca3..770fef7ee18b 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/client.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datalabeling_v1beta1 import gapic_version as package_version @@ -67,21 +67,24 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.datalabeling_v1beta1.services.data_labeling_service import pagers -from google.cloud.datalabeling_v1beta1.types import data_labeling_service, data_payloads +from google.cloud.datalabeling_v1beta1.types import ( + annotation, + annotation_spec_set, + data_labeling_service, + data_payloads, + dataset, + evaluation, + evaluation_job, + human_annotation_config, + instruction, + operations, +) from google.cloud.datalabeling_v1beta1.types import ( annotation_spec_set as gcd_annotation_spec_set, ) +from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job from google.cloud.datalabeling_v1beta1.types import instruction as gcd_instruction -from google.cloud.datalabeling_v1beta1.types import annotation -from google.cloud.datalabeling_v1beta1.types import annotation_spec_set -from google.cloud.datalabeling_v1beta1.types import dataset -from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset -from google.cloud.datalabeling_v1beta1.types import evaluation -from google.cloud.datalabeling_v1beta1.types import evaluation_job -from google.cloud.datalabeling_v1beta1.types import human_annotation_config -from google.cloud.datalabeling_v1beta1.types import instruction -from google.cloud.datalabeling_v1beta1.types import operations from .transports.base import DEFAULT_CLIENT_INFO, DataLabelingServiceTransport from .transports.grpc import DataLabelingServiceGrpcTransport @@ -96,9 +99,7 @@ class DataLabelingServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataLabelingServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataLabelingServiceTransport]] _transport_registry["grpc"] = DataLabelingServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataLabelingServiceGrpcAsyncIOTransport @@ -784,11 +785,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataLabelingServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataLabelingServiceClient._read_environment_variables() + ) self._client_cert_source = DataLabelingServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -823,8 +822,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataLabelingServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/pagers.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/pagers.py index e0cffac23665..2074c65d7813 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/pagers.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/pagers.py @@ -74,7 +74,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -150,7 +150,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -230,7 +230,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -306,7 +306,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -386,7 +386,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -464,7 +464,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -546,7 +546,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -622,7 +622,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -702,7 +702,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -780,7 +780,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -862,7 +862,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -940,7 +940,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1022,7 +1022,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1100,7 +1100,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1182,7 +1182,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1264,7 +1264,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1350,7 +1350,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1428,7 +1428,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/__init__.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/__init__.py index 4e50b66979e5..2c9e70273ddc 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/__init__.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import DataLabelingServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataLabelingServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataLabelingServiceTransport]] _transport_registry["grpc"] = DataLabelingServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataLabelingServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/base.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/base.py index 0d0b704368c7..eba768caf61e 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/base.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/base.py @@ -17,28 +17,30 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.datalabeling_v1beta1 import gapic_version as package_version +from google.cloud.datalabeling_v1beta1.types import ( + annotation_spec_set, + data_labeling_service, + dataset, + evaluation, + evaluation_job, + instruction, +) from google.cloud.datalabeling_v1beta1.types import ( annotation_spec_set as gcd_annotation_spec_set, ) -from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job -from google.cloud.datalabeling_v1beta1.types import annotation_spec_set -from google.cloud.datalabeling_v1beta1.types import data_labeling_service -from google.cloud.datalabeling_v1beta1.types import dataset from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset -from google.cloud.datalabeling_v1beta1.types import evaluation -from google.cloud.datalabeling_v1beta1.types import evaluation_job -from google.cloud.datalabeling_v1beta1.types import instruction +from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc.py index fb0a80b1a82a..1c0e49f0cfb1 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc.py @@ -16,31 +16,33 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from google.cloud.datalabeling_v1beta1.types import ( + annotation_spec_set, + data_labeling_service, + dataset, + evaluation, + evaluation_job, + instruction, +) from google.cloud.datalabeling_v1beta1.types import ( annotation_spec_set as gcd_annotation_spec_set, ) -from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job -from google.cloud.datalabeling_v1beta1.types import annotation_spec_set -from google.cloud.datalabeling_v1beta1.types import data_labeling_service -from google.cloud.datalabeling_v1beta1.types import dataset from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset -from google.cloud.datalabeling_v1beta1.types import evaluation -from google.cloud.datalabeling_v1beta1.types import evaluation_job -from google.cloud.datalabeling_v1beta1.types import instruction +from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job from .base import DEFAULT_CLIENT_INFO, DataLabelingServiceTransport @@ -821,12 +823,12 @@ def create_annotation_spec_set( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_annotation_spec_set" not in self._stubs: - self._stubs[ - "create_annotation_spec_set" - ] = self._logged_channel.unary_unary( - "/google.cloud.datalabeling.v1beta1.DataLabelingService/CreateAnnotationSpecSet", - request_serializer=data_labeling_service.CreateAnnotationSpecSetRequest.serialize, - response_deserializer=gcd_annotation_spec_set.AnnotationSpecSet.deserialize, + self._stubs["create_annotation_spec_set"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datalabeling.v1beta1.DataLabelingService/CreateAnnotationSpecSet", + request_serializer=data_labeling_service.CreateAnnotationSpecSetRequest.serialize, + response_deserializer=gcd_annotation_spec_set.AnnotationSpecSet.deserialize, + ) ) return self._stubs["create_annotation_spec_set"] @@ -910,12 +912,12 @@ def delete_annotation_spec_set( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_annotation_spec_set" not in self._stubs: - self._stubs[ - "delete_annotation_spec_set" - ] = self._logged_channel.unary_unary( - "/google.cloud.datalabeling.v1beta1.DataLabelingService/DeleteAnnotationSpecSet", - request_serializer=data_labeling_service.DeleteAnnotationSpecSetRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_annotation_spec_set"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datalabeling.v1beta1.DataLabelingService/DeleteAnnotationSpecSet", + request_serializer=data_labeling_service.DeleteAnnotationSpecSetRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_annotation_spec_set"] @@ -1115,12 +1117,12 @@ def search_example_comparisons( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_example_comparisons" not in self._stubs: - self._stubs[ - "search_example_comparisons" - ] = self._logged_channel.unary_unary( - "/google.cloud.datalabeling.v1beta1.DataLabelingService/SearchExampleComparisons", - request_serializer=data_labeling_service.SearchExampleComparisonsRequest.serialize, - response_deserializer=data_labeling_service.SearchExampleComparisonsResponse.deserialize, + self._stubs["search_example_comparisons"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datalabeling.v1beta1.DataLabelingService/SearchExampleComparisons", + request_serializer=data_labeling_service.SearchExampleComparisonsRequest.serialize, + response_deserializer=data_labeling_service.SearchExampleComparisonsResponse.deserialize, + ) ) return self._stubs["search_example_comparisons"] diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc_asyncio.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc_asyncio.py index 6f292261257d..74e92932b47a 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc_asyncio.py @@ -17,33 +17,35 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.datalabeling_v1beta1.types import ( + annotation_spec_set, + data_labeling_service, + dataset, + evaluation, + evaluation_job, + instruction, +) from google.cloud.datalabeling_v1beta1.types import ( annotation_spec_set as gcd_annotation_spec_set, ) -from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job -from google.cloud.datalabeling_v1beta1.types import annotation_spec_set -from google.cloud.datalabeling_v1beta1.types import data_labeling_service -from google.cloud.datalabeling_v1beta1.types import dataset from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset -from google.cloud.datalabeling_v1beta1.types import evaluation -from google.cloud.datalabeling_v1beta1.types import evaluation_job -from google.cloud.datalabeling_v1beta1.types import instruction +from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job from .base import DEFAULT_CLIENT_INFO, DataLabelingServiceTransport from .grpc import DataLabelingServiceGrpcTransport @@ -851,12 +853,12 @@ def create_annotation_spec_set( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_annotation_spec_set" not in self._stubs: - self._stubs[ - "create_annotation_spec_set" - ] = self._logged_channel.unary_unary( - "/google.cloud.datalabeling.v1beta1.DataLabelingService/CreateAnnotationSpecSet", - request_serializer=data_labeling_service.CreateAnnotationSpecSetRequest.serialize, - response_deserializer=gcd_annotation_spec_set.AnnotationSpecSet.deserialize, + self._stubs["create_annotation_spec_set"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datalabeling.v1beta1.DataLabelingService/CreateAnnotationSpecSet", + request_serializer=data_labeling_service.CreateAnnotationSpecSetRequest.serialize, + response_deserializer=gcd_annotation_spec_set.AnnotationSpecSet.deserialize, + ) ) return self._stubs["create_annotation_spec_set"] @@ -941,12 +943,12 @@ def delete_annotation_spec_set( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_annotation_spec_set" not in self._stubs: - self._stubs[ - "delete_annotation_spec_set" - ] = self._logged_channel.unary_unary( - "/google.cloud.datalabeling.v1beta1.DataLabelingService/DeleteAnnotationSpecSet", - request_serializer=data_labeling_service.DeleteAnnotationSpecSetRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_annotation_spec_set"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datalabeling.v1beta1.DataLabelingService/DeleteAnnotationSpecSet", + request_serializer=data_labeling_service.DeleteAnnotationSpecSetRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_annotation_spec_set"] @@ -1152,12 +1154,12 @@ def search_example_comparisons( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_example_comparisons" not in self._stubs: - self._stubs[ - "search_example_comparisons" - ] = self._logged_channel.unary_unary( - "/google.cloud.datalabeling.v1beta1.DataLabelingService/SearchExampleComparisons", - request_serializer=data_labeling_service.SearchExampleComparisonsRequest.serialize, - response_deserializer=data_labeling_service.SearchExampleComparisonsResponse.deserialize, + self._stubs["search_example_comparisons"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datalabeling.v1beta1.DataLabelingService/SearchExampleComparisons", + request_serializer=data_labeling_service.SearchExampleComparisonsRequest.serialize, + response_deserializer=data_labeling_service.SearchExampleComparisonsResponse.deserialize, + ) ) return self._stubs["search_example_comparisons"] diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/__init__.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/__init__.py index 100ed6e5e9ed..6098750fbf2c 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/__init__.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/__init__.py @@ -40,7 +40,10 @@ VideoEventAnnotation, VideoObjectTrackingAnnotation, ) -from .annotation_spec_set import AnnotationSpec, AnnotationSpecSet +from .annotation_spec_set import ( + AnnotationSpec, + AnnotationSpecSet, +) from .data_labeling_service import ( CreateAnnotationSpecSetRequest, CreateDatasetRequest, @@ -86,7 +89,12 @@ SearchExampleComparisonsResponse, UpdateEvaluationJobRequest, ) -from .data_payloads import ImagePayload, TextPayload, VideoPayload, VideoThumbnail +from .data_payloads import ( + ImagePayload, + TextPayload, + VideoPayload, + VideoThumbnail, +) from .dataset import ( AnnotatedDataset, AnnotatedDatasetMetadata, @@ -135,7 +143,11 @@ TextEntityExtractionConfig, VideoClassificationConfig, ) -from .instruction import CsvInstruction, Instruction, PdfInstruction +from .instruction import ( + CsvInstruction, + Instruction, + PdfInstruction, +) from .operations import ( CreateInstructionMetadata, ExportDataOperationMetadata, diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/annotation.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/annotation.py index 128d5539e81e..3e906540946b 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/annotation.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/annotation.py @@ -64,6 +64,7 @@ class AnnotationSource(proto.Enum): OPERATOR (3): Answer is provided by a human contributor. """ + ANNOTATION_SOURCE_UNSPECIFIED = 0 OPERATOR = 3 @@ -81,6 +82,7 @@ class AnnotationSentiment(proto.Enum): This label describes positively about the data. """ + ANNOTATION_SENTIMENT_UNSPECIFIED = 0 NEGATIVE = 1 POSITIVE = 2 @@ -125,6 +127,7 @@ class AnnotationType(proto.Enum): General classification. Allowed for continuous evaluation. """ + ANNOTATION_TYPE_UNSPECIFIED = 0 IMAGE_CLASSIFICATION_ANNOTATION = 1 IMAGE_BOUNDING_BOX_ANNOTATION = 2 @@ -521,13 +524,13 @@ class ImageSegmentationAnnotation(proto.Message): A byte string of a full image's color map. """ - annotation_colors: MutableMapping[ - str, annotation_spec_set.AnnotationSpec - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=1, - message=annotation_spec_set.AnnotationSpec, + annotation_colors: MutableMapping[str, annotation_spec_set.AnnotationSpec] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=1, + message=annotation_spec_set.AnnotationSpec, + ) ) mime_type: str = proto.Field( proto.STRING, @@ -713,12 +716,12 @@ class VideoObjectTrackingAnnotation(proto.Message): number=2, message="TimeSegment", ) - object_tracking_frames: MutableSequence[ - "ObjectTrackingFrame" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="ObjectTrackingFrame", + object_tracking_frames: MutableSequence["ObjectTrackingFrame"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="ObjectTrackingFrame", + ) ) diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/data_labeling_service.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/data_labeling_service.py index 5f1374dcb80c..6522f250cb94 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/data_labeling_service.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/data_labeling_service.py @@ -23,11 +23,10 @@ from google.cloud.datalabeling_v1beta1.types import ( annotation_spec_set as gcd_annotation_spec_set, ) +from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset +from google.cloud.datalabeling_v1beta1.types import evaluation, human_annotation_config from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job from google.cloud.datalabeling_v1beta1.types import instruction as gcd_instruction -from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset -from google.cloud.datalabeling_v1beta1.types import evaluation -from google.cloud.datalabeling_v1beta1.types import human_annotation_config __protobuf__ = proto.module( package="google.cloud.datalabeling.v1beta1", @@ -424,12 +423,12 @@ class ListAnnotatedDatasetsResponse(proto.Message): def raw_page(self): return self - annotated_datasets: MutableSequence[ - gcd_dataset.AnnotatedDataset - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_dataset.AnnotatedDataset, + annotated_datasets: MutableSequence[gcd_dataset.AnnotatedDataset] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_dataset.AnnotatedDataset, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -524,6 +523,7 @@ class Feature(proto.Enum): is different from bounding poly since it is more fine-grained, pixel level annotation. """ + FEATURE_UNSPECIFIED = 0 CLASSIFICATION = 1 BOUNDING_BOX = 2 @@ -636,6 +636,7 @@ class Feature(proto.Enum): Label the range of video for the specified events. """ + FEATURE_UNSPECIFIED = 0 CLASSIFICATION = 1 OBJECT_DETECTION = 2 @@ -729,6 +730,7 @@ class Feature(proto.Enum): TEXT_ENTITY_EXTRACTION (2): Label entities and their span in text. """ + FEATURE_UNSPECIFIED = 0 TEXT_CLASSIFICATION = 1 TEXT_ENTITY_EXTRACTION = 2 @@ -946,12 +948,12 @@ class ListAnnotationSpecSetsResponse(proto.Message): def raw_page(self): return self - annotation_spec_sets: MutableSequence[ - gcd_annotation_spec_set.AnnotationSpecSet - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_annotation_spec_set.AnnotationSpecSet, + annotation_spec_sets: MutableSequence[gcd_annotation_spec_set.AnnotationSpecSet] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_annotation_spec_set.AnnotationSpecSet, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1269,12 +1271,12 @@ class ExampleComparison(proto.Message): number=1, message=gcd_dataset.Example, ) - model_created_examples: MutableSequence[ - gcd_dataset.Example - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=gcd_dataset.Example, + model_created_examples: MutableSequence[gcd_dataset.Example] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=gcd_dataset.Example, + ) ) @property @@ -1474,12 +1476,12 @@ class ListEvaluationJobsResponse(proto.Message): def raw_page(self): return self - evaluation_jobs: MutableSequence[ - gcd_evaluation_job.EvaluationJob - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_evaluation_job.EvaluationJob, + evaluation_jobs: MutableSequence[gcd_evaluation_job.EvaluationJob] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_evaluation_job.EvaluationJob, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/dataset.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/dataset.py index 2bd1333bbf5b..7375083264e4 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/dataset.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/dataset.py @@ -20,10 +20,10 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.datalabeling_v1beta1.types import annotation, data_payloads from google.cloud.datalabeling_v1beta1.types import ( human_annotation_config as gcd_human_annotation_config, ) -from google.cloud.datalabeling_v1beta1.types import annotation, data_payloads __protobuf__ = proto.module( package="google.cloud.datalabeling.v1beta1", @@ -62,6 +62,7 @@ class DataType(proto.Enum): GENERAL_DATA (6): Allowed for continuous evaluation. """ + DATA_TYPE_UNSPECIFIED = 0 IMAGE = 1 VIDEO = 2 diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation.py index 09209498cf50..a4ddf0abad51 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation.py @@ -344,12 +344,12 @@ class ConfidenceMetricsEntry(proto.Message): proto.FLOAT, number=2, ) - confidence_metrics_entries: MutableSequence[ - ConfidenceMetricsEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ConfidenceMetricsEntry, + confidence_metrics_entries: MutableSequence[ConfidenceMetricsEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ConfidenceMetricsEntry, + ) ) mean_average_precision: float = proto.Field( proto.FLOAT, @@ -407,12 +407,12 @@ class Row(proto.Message): number=1, message=annotation_spec_set.AnnotationSpec, ) - entries: MutableSequence[ - "ConfusionMatrix.ConfusionMatrixEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ConfusionMatrix.ConfusionMatrixEntry", + entries: MutableSequence["ConfusionMatrix.ConfusionMatrixEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ConfusionMatrix.ConfusionMatrixEntry", + ) ) row: MutableSequence[Row] = proto.RepeatedField( diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation_job.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation_job.py index 982e18967402..f54cf3d54156 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation_job.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation_job.py @@ -21,10 +21,10 @@ import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore +from google.cloud.datalabeling_v1beta1.types import dataset, evaluation from google.cloud.datalabeling_v1beta1.types import ( human_annotation_config as gcd_human_annotation_config, ) -from google.cloud.datalabeling_v1beta1.types import dataset, evaluation __protobuf__ = proto.module( package="google.cloud.datalabeling.v1beta1", @@ -167,6 +167,7 @@ class State(proto.Enum): The job has this state right before it is deleted. """ + STATE_UNSPECIFIED = 0 SCHEDULED = 1 RUNNING = 2 diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/human_annotation_config.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/human_annotation_config.py index b9d6c4e540f9..d2c6bfa40d06 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/human_annotation_config.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/human_annotation_config.py @@ -53,6 +53,7 @@ class StringAggregationType(proto.Enum): NO_AGGREGATION (3): Preserve all answers by crowd compute. """ + STRING_AGGREGATION_TYPE_UNSPECIFIED = 0 MAJORITY_VOTE = 1 UNANIMOUS_VOTE = 2 @@ -284,12 +285,12 @@ class AnnotationSpecSetConfig(proto.Message): number=2, ) - annotation_spec_set_configs: MutableSequence[ - AnnotationSpecSetConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=AnnotationSpecSetConfig, + annotation_spec_set_configs: MutableSequence[AnnotationSpecSetConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=AnnotationSpecSetConfig, + ) ) apply_shot_detection: bool = proto.Field( proto.BOOL, diff --git a/packages/google-cloud-datalabeling/mypy.ini b/packages/google-cloud-datalabeling/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-datalabeling/mypy.ini +++ b/packages/google-cloud-datalabeling/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-datalabeling/noxfile.py b/packages/google-cloud-datalabeling/noxfile.py index 2b47c80bef53..0db1eda35f4e 100644 --- a/packages/google-cloud-datalabeling/noxfile.py +++ b/packages/google-cloud-datalabeling/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-datalabeling/tests/unit/gapic/datalabeling_v1beta1/test_data_labeling_service.py b/packages/google-cloud-datalabeling/tests/unit/gapic/datalabeling_v1beta1/test_data_labeling_service.py index e6eaa275c071..ba4428a68774 100644 --- a/packages/google-cloud-datalabeling/tests/unit/gapic/datalabeling_v1beta1/test_data_labeling_service.py +++ b/packages/google-cloud-datalabeling/tests/unit/gapic/datalabeling_v1beta1/test_data_labeling_service.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +40,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +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 google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,20 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -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 google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.datalabeling_v1beta1.services.data_labeling_service import ( DataLabelingServiceAsyncClient, @@ -69,21 +70,24 @@ pagers, transports, ) -from google.cloud.datalabeling_v1beta1.types import data_labeling_service, data_payloads +from google.cloud.datalabeling_v1beta1.types import ( + annotation, + annotation_spec_set, + data_labeling_service, + data_payloads, + dataset, + evaluation, + evaluation_job, + human_annotation_config, + instruction, + operations, +) from google.cloud.datalabeling_v1beta1.types import ( annotation_spec_set as gcd_annotation_spec_set, ) +from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job from google.cloud.datalabeling_v1beta1.types import instruction as gcd_instruction -from google.cloud.datalabeling_v1beta1.types import annotation -from google.cloud.datalabeling_v1beta1.types import annotation_spec_set -from google.cloud.datalabeling_v1beta1.types import dataset -from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset -from google.cloud.datalabeling_v1beta1.types import evaluation -from google.cloud.datalabeling_v1beta1.types import evaluation_job -from google.cloud.datalabeling_v1beta1.types import human_annotation_config -from google.cloud.datalabeling_v1beta1.types import instruction -from google.cloud.datalabeling_v1beta1.types import operations CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -988,10 +992,9 @@ def test_data_labeling_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1036,10 +1039,9 @@ def test_data_labeling_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1075,10 +1077,9 @@ def test_data_labeling_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1327,9 +1328,7 @@ def test_data_labeling_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4566,9 +4565,9 @@ def test_get_annotated_dataset_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_annotated_dataset - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_annotated_dataset] = ( + mock_rpc + ) request = {} client.get_annotated_dataset(request) @@ -9293,9 +9292,9 @@ def test_create_instruction_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instruction - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instruction] = ( + mock_rpc + ) request = {} client.create_instruction(request) @@ -9994,9 +9993,9 @@ def test_list_instructions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_instructions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_instructions] = ( + mock_rpc + ) request = {} client.list_instructions(request) @@ -10545,9 +10544,9 @@ def test_delete_instruction_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instruction - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instruction] = ( + mock_rpc + ) request = {} client.delete_instruction(request) @@ -11220,9 +11219,9 @@ def test_search_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_evaluations] = ( + mock_rpc + ) request = {} client.search_evaluations(request) @@ -12348,9 +12347,9 @@ def test_create_evaluation_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_evaluation_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_evaluation_job] = ( + mock_rpc + ) request = {} client.create_evaluation_job(request) @@ -12721,9 +12720,9 @@ def test_update_evaluation_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_evaluation_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_evaluation_job] = ( + mock_rpc + ) request = {} client.update_evaluation_job(request) @@ -13097,9 +13096,9 @@ def test_get_evaluation_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_evaluation_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_evaluation_job] = ( + mock_rpc + ) request = {} client.get_evaluation_job(request) @@ -13448,9 +13447,9 @@ def test_pause_evaluation_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.pause_evaluation_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.pause_evaluation_job] = ( + mock_rpc + ) request = {} client.pause_evaluation_job(request) @@ -13779,9 +13778,9 @@ def test_resume_evaluation_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_evaluation_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_evaluation_job] = ( + mock_rpc + ) request = {} client.resume_evaluation_job(request) @@ -14110,9 +14109,9 @@ def test_delete_evaluation_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_evaluation_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_evaluation_job] = ( + mock_rpc + ) request = {} client.delete_evaluation_job(request) @@ -14447,9 +14446,9 @@ def test_list_evaluation_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluation_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluation_jobs] = ( + mock_rpc + ) request = {} client.list_evaluation_jobs(request) diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/__init__.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/__init__.py index cf1c570bf245..c6f72be3b627 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/__init__.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.business_glossary_service import ( BusinessGlossaryServiceAsyncClient, BusinessGlossaryServiceClient, diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/async_client.py index 283103b9fbc1..3ab471f83f5e 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -46,13 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataplex_v1.services.business_glossary_service import pagers from google.cloud.dataplex_v1.types import business_glossary, service @@ -148,7 +150,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BusinessGlossaryServiceAsyncClient: The constructed client. """ - return BusinessGlossaryServiceClient.from_service_account_info.__func__(BusinessGlossaryServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BusinessGlossaryServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(BusinessGlossaryServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -164,7 +169,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BusinessGlossaryServiceAsyncClient: The constructed client. """ - return BusinessGlossaryServiceClient.from_service_account_file.__func__(BusinessGlossaryServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BusinessGlossaryServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + BusinessGlossaryServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -202,7 +212,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return BusinessGlossaryServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return BusinessGlossaryServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> BusinessGlossaryServiceTransport: diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/client.py index 313b7b12feeb..baf54d3e1378 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -63,13 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataplex_v1.services.business_glossary_service import pagers from google.cloud.dataplex_v1.types import business_glossary, service @@ -88,9 +90,7 @@ class BusinessGlossaryServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BusinessGlossaryServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BusinessGlossaryServiceTransport]] _transport_registry["grpc"] = BusinessGlossaryServiceGrpcTransport _transport_registry["grpc_asyncio"] = BusinessGlossaryServiceGrpcAsyncIOTransport _transport_registry["rest"] = BusinessGlossaryServiceRestTransport @@ -691,11 +691,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BusinessGlossaryServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BusinessGlossaryServiceClient._read_environment_variables() + ) self._client_cert_source = ( BusinessGlossaryServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -732,8 +730,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BusinessGlossaryServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/pagers.py index 96480e5393cd..feed3d84524b 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -459,7 +459,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/__init__.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/__init__.py index 62b48ea0365b..c4fffeb1d0f1 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/__init__.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[BusinessGlossaryServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[BusinessGlossaryServiceTransport]] _transport_registry["grpc"] = BusinessGlossaryServiceGrpcTransport _transport_registry["grpc_asyncio"] = BusinessGlossaryServiceGrpcAsyncIOTransport _transport_registry["rest"] = BusinessGlossaryServiceRestTransport diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/base.py index 33bb7a0725a4..8b8aef7ceeb7 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataplex_v1 import gapic_version as package_version from google.cloud.dataplex_v1.types import business_glossary @@ -445,13 +447,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc.py index 50886bca0f30..22579f3da3d3 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dataplex_v1.types import business_glossary diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc_asyncio.py index 22c306a33536..641c11ca8d9c 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import business_glossary diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest.py index a3d13b3ff197..728a97074555 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest.py @@ -16,21 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dataplex_v1.types import business_glossary @@ -1242,9 +1244,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseCreateGlossary._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseCreateGlossary._get_http_options() request, metadata = self._interceptor.pre_create_glossary(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseCreateGlossary._get_transcoded_request( @@ -1398,9 +1398,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseCreateGlossaryCategory._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseCreateGlossaryCategory._get_http_options() request, metadata = self._interceptor.pre_create_glossary_category( request, metadata @@ -1559,9 +1557,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseCreateGlossaryTerm._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseCreateGlossaryTerm._get_http_options() request, metadata = self._interceptor.pre_create_glossary_term( request, metadata @@ -1716,9 +1712,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseDeleteGlossary._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseDeleteGlossary._get_http_options() request, metadata = self._interceptor.pre_delete_glossary(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseDeleteGlossary._get_transcoded_request( @@ -1857,9 +1851,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseDeleteGlossaryCategory._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseDeleteGlossaryCategory._get_http_options() request, metadata = self._interceptor.pre_delete_glossary_category( request, metadata @@ -1966,9 +1958,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseDeleteGlossaryTerm._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseDeleteGlossaryTerm._get_http_options() request, metadata = self._interceptor.pre_delete_glossary_term( request, metadata @@ -2088,9 +2078,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseGetGlossary._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseGetGlossary._get_http_options() request, metadata = self._interceptor.pre_get_glossary(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseGetGlossary._get_transcoded_request( @@ -2237,9 +2225,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseGetGlossaryCategory._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseGetGlossaryCategory._get_http_options() request, metadata = self._interceptor.pre_get_glossary_category( request, metadata @@ -2393,9 +2379,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseGetGlossaryTerm._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseGetGlossaryTerm._get_http_options() request, metadata = self._interceptor.pre_get_glossary_term( request, metadata @@ -2542,9 +2526,7 @@ def __call__( List Glossaries Response """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseListGlossaries._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseListGlossaries._get_http_options() request, metadata = self._interceptor.pre_list_glossaries(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseListGlossaries._get_transcoded_request( @@ -2691,9 +2673,7 @@ def __call__( List GlossaryCategories Response """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseListGlossaryCategories._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseListGlossaryCategories._get_http_options() request, metadata = self._interceptor.pre_list_glossary_categories( request, metadata @@ -2842,9 +2822,7 @@ def __call__( List GlossaryTerms Response """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseListGlossaryTerms._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseListGlossaryTerms._get_http_options() request, metadata = self._interceptor.pre_list_glossary_terms( request, metadata @@ -2997,9 +2975,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseUpdateGlossary._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseUpdateGlossary._get_http_options() request, metadata = self._interceptor.pre_update_glossary(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseUpdateGlossary._get_transcoded_request( @@ -3152,9 +3128,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseUpdateGlossaryCategory._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseUpdateGlossaryCategory._get_http_options() request, metadata = self._interceptor.pre_update_glossary_category( request, metadata @@ -3312,9 +3286,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseUpdateGlossaryTerm._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseUpdateGlossaryTerm._get_http_options() request, metadata = self._interceptor.pre_update_glossary_term( request, metadata @@ -3428,7 +3400,9 @@ def create_glossary_category( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateGlossaryCategory(self._session, self._host, self._interceptor) # type: ignore + return self._CreateGlossaryCategory( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_glossary_term( @@ -3454,7 +3428,9 @@ def delete_glossary_category( ) -> Callable[[business_glossary.DeleteGlossaryCategoryRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteGlossaryCategory(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteGlossaryCategory( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_glossary_term( @@ -3513,7 +3489,9 @@ def list_glossary_categories( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListGlossaryCategories(self._session, self._host, self._interceptor) # type: ignore + return self._ListGlossaryCategories( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_glossary_terms( @@ -3543,7 +3521,9 @@ def update_glossary_category( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateGlossaryCategory(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateGlossaryCategory( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_glossary_term( @@ -3613,9 +3593,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -3754,9 +3732,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -3895,9 +3871,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -4017,9 +3991,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -4137,9 +4109,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -4278,9 +4248,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest_base.py index 13fe915d5ae7..94fab5c1af31 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest_base.py @@ -17,13 +17,15 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataplex_v1.types import business_glossary diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/async_client.py index 2c70c5a6aac0..6b781ad5a3c9 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -46,13 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataplex_v1.services.catalog_service import pagers from google.cloud.dataplex_v1.types import catalog, service @@ -141,7 +143,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CatalogServiceAsyncClient: The constructed client. """ - return CatalogServiceClient.from_service_account_info.__func__(CatalogServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CatalogServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CatalogServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +162,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CatalogServiceAsyncClient: The constructed client. """ - return CatalogServiceClient.from_service_account_file.__func__(CatalogServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CatalogServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CatalogServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/client.py index be23605f89e9..c706274a5246 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -63,13 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataplex_v1.services.catalog_service import pagers from google.cloud.dataplex_v1.types import catalog, service @@ -88,9 +90,7 @@ class CatalogServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CatalogServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CatalogServiceTransport]] _transport_registry["grpc"] = CatalogServiceGrpcTransport _transport_registry["grpc_asyncio"] = CatalogServiceGrpcAsyncIOTransport _transport_registry["rest"] = CatalogServiceRestTransport @@ -778,11 +778,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CatalogServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CatalogServiceClient._read_environment_variables() + ) self._client_cert_source = CatalogServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -817,8 +815,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CatalogServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/pagers.py index 17a69c13cbcd..71d1c9fa520d 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/base.py index c91a23626b17..069c61a2420d 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataplex_v1 import gapic_version as package_version from google.cloud.dataplex_v1.types import catalog @@ -731,13 +733,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc.py index 134b142ff8da..9f5827ed69d6 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dataplex_v1.types import catalog diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc_asyncio.py index 20a8769e6439..0fdd54fe1c03 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import catalog diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest.py index a0fd82bd3d81..778d5fc50dd2 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest.py @@ -16,21 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dataplex_v1.types import catalog @@ -1964,9 +1966,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseCancelMetadataJob._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseCancelMetadataJob._get_http_options() request, metadata = self._interceptor.pre_cancel_metadata_job( request, metadata @@ -2085,9 +2085,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseCreateAspectType._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseCreateAspectType._get_http_options() request, metadata = self._interceptor.pre_create_aspect_type( request, metadata @@ -2391,9 +2389,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseCreateEntryGroup._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseCreateEntryGroup._get_http_options() request, metadata = self._interceptor.pre_create_entry_group( request, metadata @@ -2543,9 +2539,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseCreateEntryLink._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseCreateEntryLink._get_http_options() request, metadata = self._interceptor.pre_create_entry_link( request, metadata @@ -2698,9 +2692,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseCreateEntryType._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseCreateEntryType._get_http_options() request, metadata = self._interceptor.pre_create_entry_type( request, metadata @@ -2851,9 +2843,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseCreateMetadataJob._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseCreateMetadataJob._get_http_options() request, metadata = self._interceptor.pre_create_metadata_job( request, metadata @@ -3003,9 +2993,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseDeleteAspectType._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseDeleteAspectType._get_http_options() request, metadata = self._interceptor.pre_delete_aspect_type( request, metadata @@ -3297,9 +3285,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseDeleteEntryGroup._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseDeleteEntryGroup._get_http_options() request, metadata = self._interceptor.pre_delete_entry_group( request, metadata @@ -3443,9 +3429,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseDeleteEntryLink._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseDeleteEntryLink._get_http_options() request, metadata = self._interceptor.pre_delete_entry_link( request, metadata @@ -3592,9 +3576,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseDeleteEntryType._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseDeleteEntryType._get_http_options() request, metadata = self._interceptor.pre_delete_entry_type( request, metadata @@ -4619,9 +4601,7 @@ def __call__( List AspectTypes response. """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseListAspectTypes._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseListAspectTypes._get_http_options() request, metadata = self._interceptor.pre_list_aspect_types( request, metadata @@ -4909,9 +4889,7 @@ def __call__( List entry groups response. """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseListEntryGroups._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseListEntryGroups._get_http_options() request, metadata = self._interceptor.pre_list_entry_groups( request, metadata @@ -5201,9 +5179,7 @@ def __call__( List metadata jobs response. """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseListMetadataJobs._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseListMetadataJobs._get_http_options() request, metadata = self._interceptor.pre_list_metadata_jobs( request, metadata @@ -5645,9 +5621,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseUpdateAspectType._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseUpdateAspectType._get_http_options() request, metadata = self._interceptor.pre_update_aspect_type( request, metadata @@ -5951,9 +5925,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseUpdateEntryGroup._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseUpdateEntryGroup._get_http_options() request, metadata = self._interceptor.pre_update_entry_group( request, metadata @@ -6104,9 +6076,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseUpdateEntryType._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseUpdateEntryType._get_http_options() request, metadata = self._interceptor.pre_update_entry_type( request, metadata @@ -6756,9 +6726,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -6875,9 +6843,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest_base.py index a138874769bd..4248f0b8e7f8 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest_base.py @@ -17,13 +17,15 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataplex_v1.types import catalog diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/async_client.py index b0180f34d1e3..b5bb3cd4a158 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -46,13 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataplex_v1.services.cmek_service import pagers from google.cloud.dataplex_v1.types import cmek, service @@ -129,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CmekServiceAsyncClient: The constructed client. """ - return CmekServiceClient.from_service_account_info.__func__(CmekServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CmekServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CmekServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +150,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CmekServiceAsyncClient: The constructed client. """ - return CmekServiceClient.from_service_account_file.__func__(CmekServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CmekServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CmekServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/client.py index 438808116e9d..5d65cb7d283f 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -63,13 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataplex_v1.services.cmek_service import pagers from google.cloud.dataplex_v1.types import cmek, service @@ -649,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CmekServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CmekServiceClient._read_environment_variables() + ) self._client_cert_source = CmekServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -688,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CmekServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/pagers.py index 106bcdcea836..faeef89b67b3 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/base.py index 77d0ccf6891d..17a34d5ff705 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version from google.cloud.dataplex_v1.types import cmek @@ -283,13 +285,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc.py index 5aaa0188a8fe..a5426e971748 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import cmek diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc_asyncio.py index c69b3430b7fe..447751908f27 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import cmek diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest.py index 4e336351b55c..487d695b15d1 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -728,9 +730,7 @@ def __call__( """ - http_options = ( - _BaseCmekServiceRestTransport._BaseCreateEncryptionConfig._get_http_options() - ) + http_options = _BaseCmekServiceRestTransport._BaseCreateEncryptionConfig._get_http_options() request, metadata = self._interceptor.pre_create_encryption_config( request, metadata @@ -880,9 +880,7 @@ def __call__( """ - http_options = ( - _BaseCmekServiceRestTransport._BaseDeleteEncryptionConfig._get_http_options() - ) + http_options = _BaseCmekServiceRestTransport._BaseDeleteEncryptionConfig._get_http_options() request, metadata = self._interceptor.pre_delete_encryption_config( request, metadata @@ -1028,9 +1026,7 @@ def __call__( """ - http_options = ( - _BaseCmekServiceRestTransport._BaseGetEncryptionConfig._get_http_options() - ) + http_options = _BaseCmekServiceRestTransport._BaseGetEncryptionConfig._get_http_options() request, metadata = self._interceptor.pre_get_encryption_config( request, metadata @@ -1174,9 +1170,7 @@ def __call__( List EncryptionConfigs Response """ - http_options = ( - _BaseCmekServiceRestTransport._BaseListEncryptionConfigs._get_http_options() - ) + http_options = _BaseCmekServiceRestTransport._BaseListEncryptionConfigs._get_http_options() request, metadata = self._interceptor.pre_list_encryption_configs( request, metadata @@ -1326,9 +1320,7 @@ def __call__( """ - http_options = ( - _BaseCmekServiceRestTransport._BaseUpdateEncryptionConfig._get_http_options() - ) + http_options = _BaseCmekServiceRestTransport._BaseUpdateEncryptionConfig._get_http_options() request, metadata = self._interceptor.pre_update_encryption_config( request, metadata @@ -1427,7 +1419,9 @@ def create_encryption_config( ) -> Callable[[cmek.CreateEncryptionConfigRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateEncryptionConfig(self._session, self._host, self._interceptor) # type: ignore + return self._CreateEncryptionConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_encryption_config( @@ -1435,7 +1429,9 @@ def delete_encryption_config( ) -> Callable[[cmek.DeleteEncryptionConfigRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteEncryptionConfig(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteEncryptionConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_encryption_config( @@ -1461,7 +1457,9 @@ def update_encryption_config( ) -> Callable[[cmek.UpdateEncryptionConfigRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateEncryptionConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateEncryptionConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest_base.py index 2e54082df7f3..5adc9fab6568 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/async_client.py index c56f50dac6e5..54b867651a3c 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -44,18 +44,19 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataplex_v1.services.content_service import pagers -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content from .client import ContentServiceClient @@ -128,7 +129,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ContentServiceAsyncClient: The constructed client. """ - return ContentServiceClient.from_service_account_info.__func__(ContentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ContentServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ContentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +148,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ContentServiceAsyncClient: The constructed client. """ - return ContentServiceClient.from_service_account_file.__func__(ContentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ContentServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ContentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/client.py index cdf6707f3a5b..bf5516331df4 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -61,18 +61,19 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataplex_v1.services.content_service import pagers -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content from .transports.base import DEFAULT_CLIENT_INFO, ContentServiceTransport @@ -89,9 +90,7 @@ class ContentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ContentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ContentServiceTransport]] _transport_registry["grpc"] = ContentServiceGrpcTransport _transport_registry["grpc_asyncio"] = ContentServiceGrpcAsyncIOTransport _transport_registry["rest"] = ContentServiceRestTransport @@ -657,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContentServiceClient._read_environment_variables() + ) self._client_cert_source = ContentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -696,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/pagers.py index d1c5b0162b57..a82aab041cf9 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/base.py index 352dd0e39165..0c2bb003288c 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/base.py @@ -17,24 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataplex_v1 import gapic_version as package_version -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -360,13 +361,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc.py index 50c11ea264e3..5732be0f6088 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc.py @@ -16,27 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content from .base import DEFAULT_CLIENT_INFO, ContentServiceTransport diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc_asyncio.py index 5ab1236f9b70..e9ab0f2067ba 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc_asyncio.py @@ -17,29 +17,30 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content from .base import DEFAULT_CLIENT_INFO, ContentServiceTransport diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest.py index 96929828830a..644b58bab2a7 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest.py @@ -16,27 +16,28 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -1770,9 +1771,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseContentServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseContentServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2419,9 +2418,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseContentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2538,9 +2535,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContentServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseContentServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest_base.py index d6a746abfd39..37aa093addc1 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest_base.py @@ -17,18 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import gapic_v1, path_template +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content from .base import DEFAULT_CLIENT_INFO, ContentServiceTransport diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/async_client.py index 355dda0c5bbb..b1be57c4fe74 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -46,13 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataplex_v1.services.data_scan_service import pagers from google.cloud.dataplex_v1.types import ( @@ -146,7 +148,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataScanServiceAsyncClient: The constructed client. """ - return DataScanServiceClient.from_service_account_info.__func__(DataScanServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataScanServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataScanServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -162,7 +167,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataScanServiceAsyncClient: The constructed client. """ - return DataScanServiceClient.from_service_account_file.__func__(DataScanServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataScanServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataScanServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/client.py index 0b212490997c..8c7b962bf90f 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -63,13 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataplex_v1.services.data_scan_service import pagers from google.cloud.dataplex_v1.types import ( @@ -97,9 +99,7 @@ class DataScanServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataScanServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataScanServiceTransport]] _transport_registry["grpc"] = DataScanServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataScanServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataScanServiceRestTransport @@ -736,11 +736,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataScanServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataScanServiceClient._read_environment_variables() + ) self._client_cert_source = DataScanServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -775,8 +773,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataScanServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/pagers.py index d15fb0986e3e..e35a0ae7fa6c 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/base.py index c33ddf1079f2..cdf8a5a245b8 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version from google.cloud.dataplex_v1.types import datascans @@ -344,13 +346,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc.py index a409a6c4ae04..c84cfb816974 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import datascans @@ -581,12 +583,12 @@ def generate_data_quality_rules( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_data_quality_rules" not in self._stubs: - self._stubs[ - "generate_data_quality_rules" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataScanService/GenerateDataQualityRules", - request_serializer=datascans.GenerateDataQualityRulesRequest.serialize, - response_deserializer=datascans.GenerateDataQualityRulesResponse.deserialize, + self._stubs["generate_data_quality_rules"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataScanService/GenerateDataQualityRules", + request_serializer=datascans.GenerateDataQualityRulesRequest.serialize, + response_deserializer=datascans.GenerateDataQualityRulesResponse.deserialize, + ) ) return self._stubs["generate_data_quality_rules"] diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc_asyncio.py index 043be983efc2..790d15d0a9dc 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import datascans @@ -600,12 +602,12 @@ def generate_data_quality_rules( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_data_quality_rules" not in self._stubs: - self._stubs[ - "generate_data_quality_rules" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataScanService/GenerateDataQualityRules", - request_serializer=datascans.GenerateDataQualityRulesRequest.serialize, - response_deserializer=datascans.GenerateDataQualityRulesResponse.deserialize, + self._stubs["generate_data_quality_rules"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataScanService/GenerateDataQualityRules", + request_serializer=datascans.GenerateDataQualityRulesRequest.serialize, + response_deserializer=datascans.GenerateDataQualityRulesResponse.deserialize, + ) ) return self._stubs["generate_data_quality_rules"] diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest.py index 5621f852b585..5fef49be9000 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -952,9 +954,7 @@ def __call__( """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseCreateDataScan._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseCreateDataScan._get_http_options() request, metadata = self._interceptor.pre_create_data_scan( request, metadata @@ -1104,9 +1104,7 @@ def __call__( """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseDeleteDataScan._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseDeleteDataScan._get_http_options() request, metadata = self._interceptor.pre_delete_data_scan( request, metadata @@ -1254,9 +1252,7 @@ def __call__( """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseGenerateDataQualityRules._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseGenerateDataQualityRules._get_http_options() request, metadata = self._interceptor.pre_generate_data_quality_rules( request, metadata @@ -1579,9 +1575,7 @@ def __call__( """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseGetDataScanJob._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseGetDataScanJob._get_http_options() request, metadata = self._interceptor.pre_get_data_scan_job( request, metadata @@ -1725,9 +1719,7 @@ def __call__( List DataScanJobs response. """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseListDataScanJobs._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseListDataScanJobs._get_http_options() request, metadata = self._interceptor.pre_list_data_scan_jobs( request, metadata @@ -2171,9 +2163,7 @@ def __call__( """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseUpdateDataScan._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseUpdateDataScan._get_http_options() request, metadata = self._interceptor.pre_update_data_scan( request, metadata @@ -2291,7 +2281,9 @@ def generate_data_quality_rules( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateDataQualityRules(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateDataQualityRules( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_data_scan( @@ -2678,9 +2670,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2797,9 +2787,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -3054,9 +3042,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataScanServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest_base.py index 96597b805754..905abb34e661 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/async_client.py index 109d7818cdcb..c3336d8da889 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -47,18 +47,19 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataplex_v1.services.data_taxonomy_service import pagers -from google.cloud.dataplex_v1.types import data_taxonomy +from google.cloud.dataplex_v1.types import data_taxonomy, security, service from google.cloud.dataplex_v1.types import data_taxonomy as gcd_data_taxonomy -from google.cloud.dataplex_v1.types import security, service from .client import DataTaxonomyServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataTaxonomyServiceTransport @@ -141,7 +142,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataTaxonomyServiceAsyncClient: The constructed client. """ - return DataTaxonomyServiceClient.from_service_account_info.__func__(DataTaxonomyServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataTaxonomyServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataTaxonomyServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +161,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataTaxonomyServiceAsyncClient: The constructed client. """ - return DataTaxonomyServiceClient.from_service_account_file.__func__(DataTaxonomyServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataTaxonomyServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataTaxonomyServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -195,7 +202,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataTaxonomyServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataTaxonomyServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataTaxonomyServiceTransport: diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/client.py index 43b3731ea968..031d2c764fd1 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -63,18 +63,19 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataplex_v1.services.data_taxonomy_service import pagers -from google.cloud.dataplex_v1.types import data_taxonomy +from google.cloud.dataplex_v1.types import data_taxonomy, security, service from google.cloud.dataplex_v1.types import data_taxonomy as gcd_data_taxonomy -from google.cloud.dataplex_v1.types import security, service from .transports.base import DEFAULT_CLIENT_INFO, DataTaxonomyServiceTransport from .transports.grpc import DataTaxonomyServiceGrpcTransport @@ -90,9 +91,7 @@ class DataTaxonomyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataTaxonomyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataTaxonomyServiceTransport]] _transport_registry["grpc"] = DataTaxonomyServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataTaxonomyServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataTaxonomyServiceRestTransport @@ -685,11 +684,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataTaxonomyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataTaxonomyServiceClient._read_environment_variables() + ) self._client_cert_source = DataTaxonomyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -724,8 +721,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataTaxonomyServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/pagers.py index d00c18577cef..9f030092aa92 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -459,7 +459,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/__init__.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/__init__.py index cd50c7990eea..5130db638058 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/__init__.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import DataTaxonomyServiceRestInterceptor, DataTaxonomyServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataTaxonomyServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataTaxonomyServiceTransport]] _transport_registry["grpc"] = DataTaxonomyServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataTaxonomyServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataTaxonomyServiceRestTransport diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/base.py index 04928976255c..9044360f2dbc 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version from google.cloud.dataplex_v1.types import data_taxonomy @@ -433,13 +435,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc.py index 7c0116431dd9..59ee565fb440 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import data_taxonomy from google.cloud.dataplex_v1.types import data_taxonomy as gcd_data_taxonomy @@ -506,12 +508,12 @@ def create_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_data_attribute_binding" not in self._stubs: - self._stubs[ - "create_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/CreateDataAttributeBinding", - request_serializer=data_taxonomy.CreateDataAttributeBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/CreateDataAttributeBinding", + request_serializer=data_taxonomy.CreateDataAttributeBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_data_attribute_binding"] @@ -536,12 +538,12 @@ def update_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_attribute_binding" not in self._stubs: - self._stubs[ - "update_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/UpdateDataAttributeBinding", - request_serializer=data_taxonomy.UpdateDataAttributeBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/UpdateDataAttributeBinding", + request_serializer=data_taxonomy.UpdateDataAttributeBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_data_attribute_binding"] @@ -568,12 +570,12 @@ def delete_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_data_attribute_binding" not in self._stubs: - self._stubs[ - "delete_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/DeleteDataAttributeBinding", - request_serializer=data_taxonomy.DeleteDataAttributeBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/DeleteDataAttributeBinding", + request_serializer=data_taxonomy.DeleteDataAttributeBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_data_attribute_binding"] @@ -600,12 +602,12 @@ def list_data_attribute_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_data_attribute_bindings" not in self._stubs: - self._stubs[ - "list_data_attribute_bindings" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/ListDataAttributeBindings", - request_serializer=data_taxonomy.ListDataAttributeBindingsRequest.serialize, - response_deserializer=data_taxonomy.ListDataAttributeBindingsResponse.deserialize, + self._stubs["list_data_attribute_bindings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/ListDataAttributeBindings", + request_serializer=data_taxonomy.ListDataAttributeBindingsRequest.serialize, + response_deserializer=data_taxonomy.ListDataAttributeBindingsResponse.deserialize, + ) ) return self._stubs["list_data_attribute_bindings"] @@ -631,12 +633,12 @@ def get_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_attribute_binding" not in self._stubs: - self._stubs[ - "get_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/GetDataAttributeBinding", - request_serializer=data_taxonomy.GetDataAttributeBindingRequest.serialize, - response_deserializer=data_taxonomy.DataAttributeBinding.deserialize, + self._stubs["get_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/GetDataAttributeBinding", + request_serializer=data_taxonomy.GetDataAttributeBindingRequest.serialize, + response_deserializer=data_taxonomy.DataAttributeBinding.deserialize, + ) ) return self._stubs["get_data_attribute_binding"] diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc_asyncio.py index ca06d71c3bc8..e7bcccf26cb8 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import data_taxonomy from google.cloud.dataplex_v1.types import data_taxonomy as gcd_data_taxonomy @@ -521,12 +523,12 @@ def create_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_data_attribute_binding" not in self._stubs: - self._stubs[ - "create_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/CreateDataAttributeBinding", - request_serializer=data_taxonomy.CreateDataAttributeBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/CreateDataAttributeBinding", + request_serializer=data_taxonomy.CreateDataAttributeBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_data_attribute_binding"] @@ -552,12 +554,12 @@ def update_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_attribute_binding" not in self._stubs: - self._stubs[ - "update_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/UpdateDataAttributeBinding", - request_serializer=data_taxonomy.UpdateDataAttributeBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/UpdateDataAttributeBinding", + request_serializer=data_taxonomy.UpdateDataAttributeBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_data_attribute_binding"] @@ -585,12 +587,12 @@ def delete_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_data_attribute_binding" not in self._stubs: - self._stubs[ - "delete_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/DeleteDataAttributeBinding", - request_serializer=data_taxonomy.DeleteDataAttributeBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/DeleteDataAttributeBinding", + request_serializer=data_taxonomy.DeleteDataAttributeBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_data_attribute_binding"] @@ -617,12 +619,12 @@ def list_data_attribute_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_data_attribute_bindings" not in self._stubs: - self._stubs[ - "list_data_attribute_bindings" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/ListDataAttributeBindings", - request_serializer=data_taxonomy.ListDataAttributeBindingsRequest.serialize, - response_deserializer=data_taxonomy.ListDataAttributeBindingsResponse.deserialize, + self._stubs["list_data_attribute_bindings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/ListDataAttributeBindings", + request_serializer=data_taxonomy.ListDataAttributeBindingsRequest.serialize, + response_deserializer=data_taxonomy.ListDataAttributeBindingsResponse.deserialize, + ) ) return self._stubs["list_data_attribute_bindings"] @@ -648,12 +650,12 @@ def get_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_attribute_binding" not in self._stubs: - self._stubs[ - "get_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/GetDataAttributeBinding", - request_serializer=data_taxonomy.GetDataAttributeBindingRequest.serialize, - response_deserializer=data_taxonomy.DataAttributeBinding.deserialize, + self._stubs["get_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/GetDataAttributeBinding", + request_serializer=data_taxonomy.GetDataAttributeBindingRequest.serialize, + response_deserializer=data_taxonomy.DataAttributeBinding.deserialize, + ) ) return self._stubs["get_data_attribute_binding"] diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest.py index daaa0c12fa2e..462f0849fe61 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1310,9 +1312,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseCreateDataAttribute._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseCreateDataAttribute._get_http_options() request, metadata = self._interceptor.pre_create_data_attribute( request, metadata @@ -1467,9 +1467,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseCreateDataAttributeBinding._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseCreateDataAttributeBinding._get_http_options() request, metadata = self._interceptor.pre_create_data_attribute_binding( request, metadata @@ -1536,11 +1534,10 @@ def __call__( resp = self._interceptor.post_create_data_attribute_binding(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_data_attribute_binding_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_data_attribute_binding_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1624,9 +1621,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseCreateDataTaxonomy._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseCreateDataTaxonomy._get_http_options() request, metadata = self._interceptor.pre_create_data_taxonomy( request, metadata @@ -1779,9 +1774,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseDeleteDataAttribute._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseDeleteDataAttribute._get_http_options() request, metadata = self._interceptor.pre_delete_data_attribute( request, metadata @@ -1930,9 +1923,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseDeleteDataAttributeBinding._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseDeleteDataAttributeBinding._get_http_options() request, metadata = self._interceptor.pre_delete_data_attribute_binding( request, metadata @@ -1994,11 +1985,10 @@ def __call__( resp = self._interceptor.post_delete_data_attribute_binding(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_data_attribute_binding_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_data_attribute_binding_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2081,9 +2071,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseDeleteDataTaxonomy._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseDeleteDataTaxonomy._get_http_options() request, metadata = self._interceptor.pre_delete_data_taxonomy( request, metadata @@ -2240,9 +2228,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseGetDataAttribute._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseGetDataAttribute._get_http_options() request, metadata = self._interceptor.pre_get_data_attribute( request, metadata @@ -2392,9 +2378,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseGetDataAttributeBinding._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseGetDataAttributeBinding._get_http_options() request, metadata = self._interceptor.pre_get_data_attribute_binding( request, metadata @@ -2549,9 +2533,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseGetDataTaxonomy._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseGetDataTaxonomy._get_http_options() request, metadata = self._interceptor.pre_get_data_taxonomy( request, metadata @@ -2697,9 +2679,7 @@ def __call__( List DataAttributeBindings response. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseListDataAttributeBindings._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseListDataAttributeBindings._get_http_options() request, metadata = self._interceptor.pre_list_data_attribute_bindings( request, metadata @@ -2848,9 +2828,7 @@ def __call__( List DataAttributes response. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseListDataAttributes._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseListDataAttributes._get_http_options() request, metadata = self._interceptor.pre_list_data_attributes( request, metadata @@ -2999,9 +2977,7 @@ def __call__( List DataTaxonomies response. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseListDataTaxonomies._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseListDataTaxonomies._get_http_options() request, metadata = self._interceptor.pre_list_data_taxonomies( request, metadata @@ -3154,9 +3130,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseUpdateDataAttribute._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseUpdateDataAttribute._get_http_options() request, metadata = self._interceptor.pre_update_data_attribute( request, metadata @@ -3311,9 +3285,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseUpdateDataAttributeBinding._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseUpdateDataAttributeBinding._get_http_options() request, metadata = self._interceptor.pre_update_data_attribute_binding( request, metadata @@ -3380,11 +3352,10 @@ def __call__( resp = self._interceptor.post_update_data_attribute_binding(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_data_attribute_binding_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_data_attribute_binding_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3468,9 +3439,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseUpdateDataTaxonomy._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseUpdateDataTaxonomy._get_http_options() request, metadata = self._interceptor.pre_update_data_taxonomy( request, metadata @@ -3581,7 +3550,9 @@ def create_data_attribute_binding( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateDataAttributeBinding(self._session, self._host, self._interceptor) # type: ignore + return self._CreateDataAttributeBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_data_taxonomy( @@ -3609,7 +3580,9 @@ def delete_data_attribute_binding( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteDataAttributeBinding(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteDataAttributeBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_data_taxonomy( @@ -3636,7 +3609,9 @@ def get_data_attribute_binding( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetDataAttributeBinding(self._session, self._host, self._interceptor) # type: ignore + return self._GetDataAttributeBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_data_taxonomy( @@ -3655,7 +3630,9 @@ def list_data_attribute_bindings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListDataAttributeBindings(self._session, self._host, self._interceptor) # type: ignore + return self._ListDataAttributeBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_data_attributes( @@ -3695,7 +3672,9 @@ def update_data_attribute_binding( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateDataAttributeBinding(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDataAttributeBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_data_taxonomy( @@ -3765,9 +3744,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDataTaxonomyServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -3906,9 +3883,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataTaxonomyServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -4045,9 +4020,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -4165,9 +4138,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -4283,9 +4254,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataTaxonomyServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -4424,9 +4393,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataTaxonomyServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest_base.py index 423e13010b14..edc3a887b867 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/async_client.py index 575e7083b983..30c65f074824 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -46,13 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataplex_v1.services.dataplex_service import pagers from google.cloud.dataplex_v1.types import analyze, resources, service, tasks @@ -143,7 +145,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataplexServiceAsyncClient: The constructed client. """ - return DataplexServiceClient.from_service_account_info.__func__(DataplexServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataplexServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataplexServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +164,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataplexServiceAsyncClient: The constructed client. """ - return DataplexServiceClient.from_service_account_file.__func__(DataplexServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataplexServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataplexServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/client.py index f91289f9b0c5..f6678d498fbc 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -63,13 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataplex_v1.services.dataplex_service import pagers from google.cloud.dataplex_v1.types import analyze, resources, service, tasks @@ -88,9 +90,7 @@ class DataplexServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataplexServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataplexServiceTransport]] _transport_registry["grpc"] = DataplexServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataplexServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataplexServiceRestTransport @@ -816,11 +816,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataplexServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataplexServiceClient._read_environment_variables() + ) self._client_cert_source = DataplexServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -855,8 +853,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataplexServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/pagers.py index 1b39defdce5f..3b80a62440ce 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1159,7 +1159,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1235,7 +1235,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1315,7 +1315,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1391,7 +1391,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1471,7 +1471,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1547,7 +1547,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/base.py index d34d288a3dd8..112dd943bb03 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataplex_v1 import gapic_version as package_version from google.cloud.dataplex_v1.types import analyze, resources, service, tasks @@ -801,13 +803,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc.py index af5b558c743c..b00aca45496a 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dataplex_v1.types import analyze, resources, service, tasks diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc_asyncio.py index 481d4fa33e04..eb9bc555138c 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import analyze, resources, service, tasks diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest.py index 8c0ef98e1b19..1c9ba98cca18 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest.py @@ -16,21 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dataplex_v1.types import analyze, resources, service, tasks @@ -2461,9 +2463,7 @@ def __call__( """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseCreateEnvironment._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseCreateEnvironment._get_http_options() request, metadata = self._interceptor.pre_create_environment( request, metadata @@ -3212,9 +3212,7 @@ def __call__( """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseDeleteEnvironment._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseDeleteEnvironment._get_http_options() request, metadata = self._interceptor.pre_delete_environment( request, metadata @@ -3945,9 +3943,7 @@ def __call__( """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseGetEnvironment._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseGetEnvironment._get_http_options() request, metadata = self._interceptor.pre_get_environment(request, metadata) transcoded_request = _BaseDataplexServiceRestTransport._BaseGetEnvironment._get_transcoded_request( @@ -4707,9 +4703,7 @@ def __call__( List actions response. """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseListAssetActions._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseListAssetActions._get_http_options() request, metadata = self._interceptor.pre_list_asset_actions( request, metadata @@ -4997,9 +4991,7 @@ def __call__( List environments response. """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseListEnvironments._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseListEnvironments._get_http_options() request, metadata = self._interceptor.pre_list_environments( request, metadata @@ -5293,9 +5285,7 @@ def __call__( List actions response. """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseListLakeActions._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseListLakeActions._get_http_options() request, metadata = self._interceptor.pre_list_lake_actions( request, metadata @@ -5875,9 +5865,7 @@ def __call__( List actions response. """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseListZoneActions._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseListZoneActions._get_http_options() request, metadata = self._interceptor.pre_list_zone_actions( request, metadata @@ -6479,9 +6467,7 @@ def __call__( """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseUpdateEnvironment._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseUpdateEnvironment._get_http_options() request, metadata = self._interceptor.pre_update_environment( request, metadata @@ -7612,9 +7598,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -7731,9 +7715,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -7988,9 +7970,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataplexServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest_base.py index e2f0d00166e6..856b256ac0f9 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest_base.py @@ -17,13 +17,15 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataplex_v1.types import analyze, resources, service, tasks diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/async_client.py index 870de1248d6b..2dd1feb92a78 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -44,11 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.metadata_service import pagers from google.cloud.dataplex_v1.types import metadata_ @@ -125,7 +127,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MetadataServiceAsyncClient: The constructed client. """ - return MetadataServiceClient.from_service_account_info.__func__(MetadataServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + MetadataServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(MetadataServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +146,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MetadataServiceAsyncClient: The constructed client. """ - return MetadataServiceClient.from_service_account_file.__func__(MetadataServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + MetadataServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(MetadataServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/client.py index 1d6457e3c392..ae2c69b47801 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -61,11 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.metadata_service import pagers from google.cloud.dataplex_v1.types import metadata_ @@ -84,9 +86,7 @@ class MetadataServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MetadataServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MetadataServiceTransport]] _transport_registry["grpc"] = MetadataServiceGrpcTransport _transport_registry["grpc_asyncio"] = MetadataServiceGrpcAsyncIOTransport _transport_registry["rest"] = MetadataServiceRestTransport @@ -688,11 +688,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MetadataServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MetadataServiceClient._read_environment_variables() + ) self._client_cert_source = MetadataServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -727,8 +725,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MetadataServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/pagers.py index d03813be582f..74b964c76291 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/base.py index 962a38a493c5..65caf71e4f91 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataplex_v1 import gapic_version as package_version from google.cloud.dataplex_v1.types import metadata_ @@ -373,13 +375,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc.py index 3365078fe5cc..12fb99798187 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dataplex_v1.types import metadata_ diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc_asyncio.py index c0d838ec4989..cf8c58cf95c1 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import metadata_ diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest.py index 8db674c666c7..dfdf03150fd0 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest.py @@ -16,21 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dataplex_v1.types import metadata_ @@ -937,9 +939,7 @@ def __call__( """ - http_options = ( - _BaseMetadataServiceRestTransport._BaseCreatePartition._get_http_options() - ) + http_options = _BaseMetadataServiceRestTransport._BaseCreatePartition._get_http_options() request, metadata = self._interceptor.pre_create_partition( request, metadata @@ -1190,9 +1190,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseMetadataServiceRestTransport._BaseDeletePartition._get_http_options() - ) + http_options = _BaseMetadataServiceRestTransport._BaseDeletePartition._get_http_options() request, metadata = self._interceptor.pre_delete_partition( request, metadata @@ -1740,9 +1738,7 @@ def __call__( List metadata partitions response. """ - http_options = ( - _BaseMetadataServiceRestTransport._BaseListPartitions._get_http_options() - ) + http_options = _BaseMetadataServiceRestTransport._BaseListPartitions._get_http_options() request, metadata = self._interceptor.pre_list_partitions(request, metadata) transcoded_request = _BaseMetadataServiceRestTransport._BaseListPartitions._get_transcoded_request( @@ -2395,9 +2391,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseMetadataServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseMetadataServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2514,9 +2508,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseMetadataServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseMetadataServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2771,9 +2763,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseMetadataServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseMetadataServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseMetadataServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest_base.py index 6e087ed3e61d..0ad1e3d3d480 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest_base.py @@ -17,13 +17,15 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataplex_v1.types import metadata_ diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/__init__.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/__init__.py index e4594ef8f3e6..2f175b5e2543 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/__init__.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/__init__.py @@ -13,7 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .analyze import Content, Environment, Session +from .analyze import ( + Content, + Environment, + Session, +) from .business_glossary import ( CreateGlossaryCategoryRequest, CreateGlossaryRequest, @@ -104,9 +108,18 @@ ListContentResponse, UpdateContentRequest, ) -from .data_discovery import DataDiscoveryResult, DataDiscoverySpec -from .data_documentation import DataDocumentationResult, DataDocumentationSpec -from .data_profile import DataProfileResult, DataProfileSpec +from .data_discovery import ( + DataDiscoveryResult, + DataDiscoverySpec, +) +from .data_documentation import ( + DataDocumentationResult, + DataDocumentationSpec, +) +from .data_profile import ( + DataProfileResult, + DataProfileSpec, +) from .data_quality import ( DataQualityColumnResult, DataQualityDimension, @@ -157,7 +170,9 @@ RunDataScanResponse, UpdateDataScanRequest, ) -from .datascans_common import DataScanCatalogPublishingStatus +from .datascans_common import ( + DataScanCatalogPublishingStatus, +) from .logs import ( BusinessGlossaryEvent, DataQualityScanRuleResult, @@ -187,9 +202,23 @@ StorageSystem, UpdateEntityRequest, ) -from .processing import DataSource, ScannedData, Trigger -from .resources import Action, Asset, AssetStatus, Lake, State, Zone -from .security import DataAccessSpec, ResourceAccessSpec +from .processing import ( + DataSource, + ScannedData, + Trigger, +) +from .resources import ( + Action, + Asset, + AssetStatus, + Lake, + State, + Zone, +) +from .security import ( + DataAccessSpec, + ResourceAccessSpec, +) from .service import ( CancelJobRequest, CreateAssetRequest, @@ -235,7 +264,10 @@ UpdateTaskRequest, UpdateZoneRequest, ) -from .tasks import Job, Task +from .tasks import ( + Job, + Task, +) __all__ = ( "Content", diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/analyze.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/analyze.py index 94dccf4f0626..d5fcda0cb57a 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/analyze.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/analyze.py @@ -368,6 +368,7 @@ class QueryEngine(proto.Enum): SPARK (2): Spark SQL Query. """ + QUERY_ENGINE_UNSPECIFIED = 0 SPARK = 2 @@ -394,6 +395,7 @@ class KernelType(proto.Enum): PYTHON3 (1): Python 3 Kernel. """ + KERNEL_TYPE_UNSPECIFIED = 0 PYTHON3 = 1 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/catalog.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/catalog.py index f034d2e2a330..867c22fc9103 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/catalog.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/catalog.py @@ -96,6 +96,7 @@ class EntryView(proto.Enum): ALL (4): No description available. """ + ENTRY_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -122,6 +123,7 @@ class TransferStatus(proto.Enum): from Data Catalog service. The resource can only be updated from Dataplex API. """ + TRANSFER_STATUS_UNSPECIFIED = 0 TRANSFER_STATUS_MIGRATED = 1 TRANSFER_STATUS_TRANSFERRED = 2 @@ -184,6 +186,7 @@ class DataClassification(proto.Enum): METADATA_AND_DATA (1): Metadata and data classification. """ + DATA_CLASSIFICATION_UNSPECIFIED = 0 METADATA_AND_DATA = 1 @@ -391,19 +394,19 @@ class Annotations(proto.Message): proto.STRING, number=5, ) - record_fields: MutableSequence[ - "AspectType.MetadataTemplate" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="AspectType.MetadataTemplate", + record_fields: MutableSequence["AspectType.MetadataTemplate"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="AspectType.MetadataTemplate", + ) ) - enum_values: MutableSequence[ - "AspectType.MetadataTemplate.EnumValue" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="AspectType.MetadataTemplate.EnumValue", + enum_values: MutableSequence["AspectType.MetadataTemplate.EnumValue"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="AspectType.MetadataTemplate.EnumValue", + ) ) map_items: "AspectType.MetadataTemplate" = proto.Field( proto.MESSAGE, @@ -2350,6 +2353,7 @@ class Type(proto.Enum): EXPORT (2): Export job. """ + TYPE_UNSPECIFIED = 0 IMPORT = 1 EXPORT = 2 @@ -2539,6 +2543,7 @@ class SyncMode(proto.Enum): This sync mode is supported for entries. """ + SYNC_MODE_UNSPECIFIED = 0 FULL = 1 INCREMENTAL = 2 @@ -2569,6 +2574,7 @@ class LogLevel(proto.Enum): import items, but doesn't specify which import item has an error. """ + LOG_LEVEL_UNSPECIFIED = 0 DEBUG = 1 INFO = 2 @@ -2850,6 +2856,7 @@ class State(proto.Enum): SUCCEEDED_WITH_ERRORS (7): The job completed with some errors. """ + STATE_UNSPECIFIED = 0 QUEUED = 1 RUNNING = 2 @@ -3000,6 +3007,7 @@ class Type(proto.Enum): The Entry is referenced as the target of the directional Entry Link. """ + UNSPECIFIED = 0 SOURCE = 2 TARGET = 3 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/cmek.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/cmek.py index ca1d4c8d30f2..77fcf1b0a916 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/cmek.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/cmek.py @@ -91,6 +91,7 @@ class EncryptionState(proto.Enum): fails due to reasons like permission issues, invalid key etc. """ + ENCRYPTION_STATE_UNSPECIFIED = 0 ENCRYPTING = 1 COMPLETED = 2 @@ -120,6 +121,7 @@ class ErrorCode(proto.Enum): REQUIRE_USER_ACTION (2): User action is required to resolve the error. """ + UNKNOWN = 0 INTERNAL_ERROR = 1 REQUIRE_USER_ACTION = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/content.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/content.py index eda7c90412c2..2bb8197e9a14 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/content.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/content.py @@ -209,6 +209,7 @@ class ContentView(proto.Enum): FULL (2): Returns the complete proto. """ + CONTENT_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_discovery.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_discovery.py index 0e571059f10d..20e0e36e74e8 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_discovery.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_discovery.py @@ -105,6 +105,7 @@ class TableType(proto.Enum): credentials of the associated BigQuery connection. """ + TABLE_TYPE_UNSPECIFIED = 0 EXTERNAL = 1 BIGLAKE = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_profile.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_profile.py index f70fb4d3a871..e2cc7e9a79a2 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_profile.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_profile.py @@ -472,12 +472,12 @@ class TopNValue(proto.Message): message="DataProfileResult.Profile.Field.ProfileInfo", ) - fields: MutableSequence[ - "DataProfileResult.Profile.Field" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="DataProfileResult.Profile.Field", + fields: MutableSequence["DataProfileResult.Profile.Field"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="DataProfileResult.Profile.Field", + ) ) class PostScanActionsResult(proto.Message): @@ -517,6 +517,7 @@ class State(proto.Enum): result to export (usually caused by scan failed). """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_quality.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_quality.py index 0a4dfae85e65..0ebcdc196127 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_quality.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_quality.py @@ -302,6 +302,7 @@ class State(proto.Enum): result to export (usually caused by scan failed). """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -788,6 +789,7 @@ class ColumnStatistic(proto.Enum): MAX (3): Evaluate the column max """ + STATISTIC_UNDEFINED = 0 MEAN = 1 MIN = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_taxonomy.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_taxonomy.py index 2d33107b73b5..bc51a2a00d4d 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_taxonomy.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_taxonomy.py @@ -928,12 +928,12 @@ class ListDataAttributeBindingsResponse(proto.Message): def raw_page(self): return self - data_attribute_bindings: MutableSequence[ - "DataAttributeBinding" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="DataAttributeBinding", + data_attribute_bindings: MutableSequence["DataAttributeBinding"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="DataAttributeBinding", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans.py index 2a1900d7b896..3c84682c5a60 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans.py @@ -68,6 +68,7 @@ class DataScanType(proto.Enum): DATA_DOCUMENTATION (4): Data documentation scan. """ + DATA_SCAN_TYPE_UNSPECIFIED = 0 DATA_QUALITY = 1 DATA_PROFILE = 2 @@ -202,6 +203,7 @@ class DataScanView(proto.Enum): FULL (10): Include everything. """ + DATA_SCAN_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 10 @@ -362,6 +364,7 @@ class DataScanJobView(proto.Enum): FULL (10): Include everything. """ + DATA_SCAN_JOB_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 10 @@ -888,6 +891,7 @@ class State(proto.Enum): The DataScanJob has been created but not started to run yet. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 CANCELING = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans_common.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans_common.py index 1a8ef46d0a0c..793d4353a8f1 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans_common.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans_common.py @@ -48,6 +48,7 @@ class State(proto.Enum): FAILED (2): Publish to catalog failed. """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/logs.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/logs.py index 8f8b5861536b..d43a27b46ac8 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/logs.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/logs.py @@ -129,6 +129,7 @@ class EventType(proto.Enum): TABLE_DELETED (13): An event representing a table being deleted. """ + EVENT_TYPE_UNSPECIFIED = 0 CONFIG = 1 ENTITY_CREATED = 2 @@ -153,6 +154,7 @@ class EntityType(proto.Enum): FILESET (2): Entities representing unstructured data. """ + ENTITY_TYPE_UNSPECIFIED = 0 TABLE = 1 FILESET = 2 @@ -170,6 +172,7 @@ class TableType(proto.Enum): OBJECT_TABLE (3): Object table type for unstructured data. """ + TABLE_TYPE_UNSPECIFIED = 0 EXTERNAL_TABLE = 1 BIGLAKE_TABLE = 2 @@ -391,6 +394,7 @@ class Type(proto.Enum): NOTEBOOK (2): Notebook jobs. """ + TYPE_UNSPECIFIED = 0 SPARK = 1 NOTEBOOK = 2 @@ -411,6 +415,7 @@ class State(proto.Enum): Job was cancelled or aborted via the service executing the job. """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -426,6 +431,7 @@ class Service(proto.Enum): DATAPROC (1): Cloud Dataproc. """ + SERVICE_UNSPECIFIED = 0 DATAPROC = 1 @@ -443,6 +449,7 @@ class ExecutionTrigger(proto.Enum): The job was triggered by the explicit call of Task API. """ + EXECUTION_TRIGGER_UNSPECIFIED = 0 TASK_CONFIG = 1 RUN_REQUEST = 2 @@ -545,6 +552,7 @@ class EventType(proto.Enum): yet assigned to a user. This comes before START in the sequence """ + EVENT_TYPE_UNSPECIFIED = 0 START = 1 STOP = 2 @@ -580,6 +588,7 @@ class Engine(proto.Enum): BIGQUERY (2): BigQuery engine is specified in Query. """ + ENGINE_UNSPECIFIED = 0 SPARK_SQL = 1 BIGQUERY = 2 @@ -706,6 +715,7 @@ class EventType(proto.Enum): GOVERNANCE_RULE_PROCESSING (18): Governance rule processing Event. """ + EVENT_TYPE_UNSPECIFIED = 0 RESOURCE_IAM_POLICY_UPDATE = 1 BIGQUERY_TABLE_CREATE = 2 @@ -748,6 +758,7 @@ class EntityType(proto.Enum): FILESET (2): Fileset entity type. """ + ENTITY_TYPE_UNSPECIFIED = 0 TABLE = 1 FILESET = 2 @@ -858,6 +869,7 @@ class ScanType(proto.Enum): DATA_DISCOVERY (4): Data scan for data discovery. """ + SCAN_TYPE_UNSPECIFIED = 0 DATA_PROFILE = 1 DATA_QUALITY = 2 @@ -880,6 +892,7 @@ class State(proto.Enum): CREATED (5): Data scan job was created. """ + STATE_UNSPECIFIED = 0 STARTED = 1 SUCCEEDED = 2 @@ -898,6 +911,7 @@ class Trigger(proto.Enum): SCHEDULE (2): Data scan triggers as per schedule. """ + TRIGGER_UNSPECIFIED = 0 ON_DEMAND = 1 SCHEDULE = 2 @@ -913,6 +927,7 @@ class Scope(proto.Enum): INCREMENTAL (2): Data scan runs on incremental data. """ + SCOPE_UNSPECIFIED = 0 FULL = 1 INCREMENTAL = 2 @@ -1085,6 +1100,7 @@ class State(proto.Enum): result to export (usually caused by scan failed). """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -1272,6 +1288,7 @@ class RuleType(proto.Enum): See [DataQualityRule.SqlAssertion][google.cloud.dataplex.v1.DataQualityRule.SqlAssertion]. """ + RULE_TYPE_UNSPECIFIED = 0 NON_NULL_EXPECTATION = 1 RANGE_EXPECTATION = 2 @@ -1295,6 +1312,7 @@ class EvaluationType(proto.Enum): The rule evaluation is done for an aggregate of rows. """ + EVALUATION_TYPE_UNSPECIFIED = 0 PER_ROW = 1 AGGREGATE = 2 @@ -1310,6 +1328,7 @@ class Result(proto.Enum): FAILED (2): The data quality rule failed. """ + RESULT_UNSPECIFIED = 0 PASSED = 1 FAILED = 2 @@ -1408,6 +1427,7 @@ class EventType(proto.Enum): GLOSSARY_TERM_DELETE (9): Glossary term delete event. """ + EVENT_TYPE_UNSPECIFIED = 0 GLOSSARY_CREATE = 1 GLOSSARY_UPDATE = 2 @@ -1457,6 +1477,7 @@ class EventType(proto.Enum): ENTRY_LINK_DELETE (2): EntryLink delete event. """ + EVENT_TYPE_UNSPECIFIED = 0 ENTRY_LINK_CREATE = 1 ENTRY_LINK_DELETE = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/metadata_.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/metadata_.py index 40465093067c..e31031814f31 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/metadata_.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/metadata_.py @@ -57,6 +57,7 @@ class StorageSystem(proto.Enum): The entity data is contained within a BigQuery dataset. """ + STORAGE_SYSTEM_UNSPECIFIED = 0 CLOUD_STORAGE = 1 BIGQUERY = 2 @@ -184,6 +185,7 @@ class EntityView(proto.Enum): FILESETS (2): Only list fileset entities. """ + ENTITY_VIEW_UNSPECIFIED = 0 TABLES = 1 FILESETS = 2 @@ -265,6 +267,7 @@ class EntityView(proto.Enum): Include everything. Currently, this is the same as the SCHEMA view. """ + ENTITY_VIEW_UNSPECIFIED = 0 BASIC = 1 SCHEMA = 2 @@ -535,6 +538,7 @@ class Type(proto.Enum): FILESET (2): Unstructured data. """ + TYPE_UNSPECIFIED = 0 TABLE = 1 FILESET = 2 @@ -786,6 +790,7 @@ class Type(proto.Enum): NULL (100): Null field that does not have values. """ + TYPE_UNSPECIFIED = 0 BOOLEAN = 1 BYTE = 2 @@ -818,6 +823,7 @@ class Mode(proto.Enum): The field has repeated (0 or more) semantics, and is a list of values. """ + MODE_UNSPECIFIED = 0 REQUIRED = 1 NULLABLE = 2 @@ -835,6 +841,7 @@ class PartitionStyle(proto.Enum): ``gs://bucket/path/to/table/dt=2019-10-31/lang=en``, ``gs://bucket/path/to/table/dt=2019-10-31/lang=en/late``. """ + PARTITION_STYLE_UNSPECIFIED = 0 HIVE_COMPATIBLE = 1 @@ -1015,6 +1022,7 @@ class Format(proto.Enum): UNKNOWN (1001): Data of an unknown format. """ + FORMAT_UNSPECIFIED = 0 PARQUET = 1 AVRO = 2 @@ -1041,6 +1049,7 @@ class CompressionFormat(proto.Enum): BZIP2 (3): BZip2 compressed set of files. """ + COMPRESSION_FORMAT_UNSPECIFIED = 0 GZIP = 2 BZIP2 = 3 @@ -1172,6 +1181,7 @@ class AccessMode(proto.Enum): Data is accessed through a managed interface using BigQuery APIs. """ + ACCESS_MODE_UNSPECIFIED = 0 DIRECT = 1 MANAGED = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/resources.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/resources.py index 847a03f54294..31bd9e0a12b4 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/resources.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/resources.py @@ -50,6 +50,7 @@ class State(proto.Enum): Resource is active but has unresolved actions. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 CREATING = 2 @@ -161,6 +162,7 @@ class State(proto.Enum): Attach/detach could not be done due to errors. """ + STATE_UNSPECIFIED = 0 NONE = 1 READY = 2 @@ -334,6 +336,7 @@ class Type(proto.Enum): file formats (parquet, avro and orc) and organized in a hive-compatible directory layout. """ + TYPE_UNSPECIFIED = 0 RAW = 1 CURATED = 2 @@ -361,6 +364,7 @@ class LocationType(proto.Enum): Resources that are associated with a multi-region location. """ + LOCATION_TYPE_UNSPECIFIED = 0 SINGLE_REGION = 1 MULTI_REGION = 2 @@ -663,6 +667,7 @@ class Category(proto.Enum): DATA_DISCOVERY (3): Data and discovery related issues. """ + CATEGORY_UNSPECIFIED = 0 RESOURCE_MANAGEMENT = 1 SECURITY_POLICY = 2 @@ -768,6 +773,7 @@ class SchemaChange(proto.Enum): Newly discovered schema has changed from existing schema for data in a curated zone. """ + SCHEMA_CHANGE_UNSPECIFIED = 0 INCOMPATIBLE = 1 MODIFIED = 2 @@ -816,6 +822,7 @@ class PartitionStructure(proto.Enum): Hive style partition definition (curated zone only). """ + PARTITION_STRUCTURE_UNSPECIFIED = 0 CONSISTENT_KEYS = 1 HIVE_STYLE_KEYS = 2 @@ -997,6 +1004,7 @@ class State(proto.Enum): Security policy could not be applied to the attached resource due to errors. """ + STATE_UNSPECIFIED = 0 READY = 1 APPLYING = 2 @@ -1182,6 +1190,7 @@ class Type(proto.Enum): BIGQUERY_DATASET (2): BigQuery dataset. """ + TYPE_UNSPECIFIED = 0 STORAGE_BUCKET = 1 BIGQUERY_DATASET = 2 @@ -1200,6 +1209,7 @@ class AccessMode(proto.Enum): Data is accessed through a managed interface using BigQuery APIs. """ + ACCESS_MODE_UNSPECIFIED = 0 DIRECT = 1 MANAGED = 2 @@ -1246,6 +1256,7 @@ class State(proto.Enum): ERROR (2): Resource has errors. """ + STATE_UNSPECIFIED = 0 READY = 1 ERROR = 2 @@ -1306,6 +1317,7 @@ class State(proto.Enum): DISABLED (5): Discovery for the asset is disabled. """ + STATE_UNSPECIFIED = 0 SCHEDULED = 1 IN_PROGRESS = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/tasks.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/tasks.py index a135fddc9c03..1c892cbfec85 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/tasks.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/tasks.py @@ -286,6 +286,7 @@ class Type(proto.Enum): RECURRING (2): The task is scheduled to run periodically. """ + TYPE_UNSPECIFIED = 0 ON_DEMAND = 1 RECURRING = 2 @@ -645,6 +646,7 @@ class Service(proto.Enum): DATAPROC (1): Dataproc service is used to run this job. """ + SERVICE_UNSPECIFIED = 0 DATAPROC = 1 @@ -668,6 +670,7 @@ class State(proto.Enum): The job was cancelled outside of Dataplex Universal Catalog. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 CANCELLING = 2 @@ -690,6 +693,7 @@ class Trigger(proto.Enum): The job was triggered by the explicit call of Task API. """ + TRIGGER_UNSPECIFIED = 0 TASK_CONFIG = 1 RUN_REQUEST = 2 diff --git a/packages/google-cloud-dataplex/mypy.ini b/packages/google-cloud-dataplex/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-dataplex/mypy.ini +++ b/packages/google-cloud-dataplex/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-dataplex/noxfile.py b/packages/google-cloud-dataplex/noxfile.py index 53f1df180441..45891fa0b15c 100644 --- a/packages/google-cloud-dataplex/noxfile.py +++ b/packages/google-cloud-dataplex/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_async.py b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_async.py index 0ffab1a00a70..217163713c4f 100644 --- a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_async.py +++ b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataplex -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START dataplex_v1_generated_ContentService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataplex_v1 diff --git a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_sync.py b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_sync.py index f4f51369d5b7..828f57e9db28 100644 --- a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_sync.py +++ b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataplex -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START dataplex_v1_generated_ContentService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataplex_v1 diff --git a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_async.py b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_async.py index fd93321b6b5f..c99c9ba5a188 100644 --- a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_async.py +++ b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataplex -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START dataplex_v1_generated_ContentService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataplex_v1 diff --git a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_sync.py b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_sync.py index 2f2cb33aaf08..5620f74130fe 100644 --- a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_sync.py +++ b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataplex -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START dataplex_v1_generated_ContentService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataplex_v1 diff --git a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_async.py b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_async.py index 6c307a409d10..957fedb6ca33 100644 --- a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_async.py +++ b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataplex -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START dataplex_v1_generated_ContentService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataplex_v1 diff --git a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_sync.py b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_sync.py index 7ba14be17a7f..8ff1df3c2231 100644 --- a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataplex -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START dataplex_v1_generated_ContentService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataplex_v1 diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_business_glossary_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_business_glossary_service.py index 36a0253db420..56f6a0730fe7 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_business_glossary_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_business_glossary_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.dataplex_v1.services.business_glossary_service import ( BusinessGlossaryServiceAsyncClient, @@ -1015,10 +1017,9 @@ def test_business_glossary_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1064,9 @@ def test_business_glossary_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1102,10 +1102,9 @@ def test_business_glossary_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1365,9 +1364,7 @@ def test_business_glossary_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4455,9 +4452,9 @@ def test_get_glossary_category_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_glossary_category - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_glossary_category] = ( + mock_rpc + ) request = {} client.get_glossary_category(request) @@ -5372,9 +5369,9 @@ def test_create_glossary_term_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_glossary_term] = ( + mock_rpc + ) request = {} client.create_glossary_term(request) @@ -5746,9 +5743,9 @@ def test_update_glossary_term_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_glossary_term] = ( + mock_rpc + ) request = {} client.update_glossary_term(request) @@ -6103,9 +6100,9 @@ def test_delete_glossary_term_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_glossary_term] = ( + mock_rpc + ) request = {} client.delete_glossary_term(request) @@ -6442,9 +6439,9 @@ def test_get_glossary_term_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_glossary_term] = ( + mock_rpc + ) request = {} client.get_glossary_term(request) @@ -6800,9 +6797,9 @@ def test_list_glossary_terms_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_glossary_terms - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_glossary_terms] = ( + mock_rpc + ) request = {} client.list_glossary_terms(request) @@ -8900,9 +8897,9 @@ def test_get_glossary_category_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_glossary_category - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_glossary_category] = ( + mock_rpc + ) request = {} client.get_glossary_category(request) @@ -9356,9 +9353,9 @@ def test_create_glossary_term_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_glossary_term] = ( + mock_rpc + ) request = {} client.create_glossary_term(request) @@ -9569,9 +9566,9 @@ def test_update_glossary_term_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_glossary_term] = ( + mock_rpc + ) request = {} client.update_glossary_term(request) @@ -9763,9 +9760,9 @@ def test_delete_glossary_term_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_glossary_term] = ( + mock_rpc + ) request = {} client.delete_glossary_term(request) @@ -9940,9 +9937,9 @@ def test_get_glossary_term_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_glossary_term] = ( + mock_rpc + ) request = {} client.get_glossary_term(request) @@ -10124,9 +10121,9 @@ def test_list_glossary_terms_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_glossary_terms - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_glossary_terms] = ( + mock_rpc + ) request = {} client.list_glossary_terms(request) diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_catalog_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_catalog_service.py index b3bc923f42dd..729871a82bd8 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_catalog_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_catalog_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,23 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 from google.cloud.dataplex_v1.services.catalog_service import ( CatalogServiceAsyncClient, @@ -963,10 +965,9 @@ def test_catalog_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1011,10 +1012,9 @@ def test_catalog_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1050,10 +1050,9 @@ def test_catalog_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1300,9 +1299,7 @@ def test_catalog_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1412,9 +1409,9 @@ def test_create_entry_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_type] = ( + mock_rpc + ) request = {} client.create_entry_type(request) @@ -1771,9 +1768,9 @@ def test_update_entry_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entry_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entry_type] = ( + mock_rpc + ) request = {} client.update_entry_type(request) @@ -2126,9 +2123,9 @@ def test_delete_entry_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_type] = ( + mock_rpc + ) request = {} client.delete_entry_type(request) @@ -2476,9 +2473,9 @@ def test_list_entry_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entry_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entry_types] = ( + mock_rpc + ) request = {} client.list_entry_types(request) @@ -3349,9 +3346,9 @@ def test_create_aspect_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_aspect_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_aspect_type] = ( + mock_rpc + ) request = {} client.create_aspect_type(request) @@ -3710,9 +3707,9 @@ def test_update_aspect_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_aspect_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_aspect_type] = ( + mock_rpc + ) request = {} client.update_aspect_type(request) @@ -4067,9 +4064,9 @@ def test_delete_aspect_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_aspect_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_aspect_type] = ( + mock_rpc + ) request = {} client.delete_aspect_type(request) @@ -4421,9 +4418,9 @@ def test_list_aspect_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_aspect_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_aspect_types] = ( + mock_rpc + ) request = {} client.list_aspect_types(request) @@ -5314,9 +5311,9 @@ def test_create_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_group] = ( + mock_rpc + ) request = {} client.create_entry_group(request) @@ -5675,9 +5672,9 @@ def test_update_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entry_group] = ( + mock_rpc + ) request = {} client.update_entry_group(request) @@ -6032,9 +6029,9 @@ def test_delete_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_group] = ( + mock_rpc + ) request = {} client.delete_entry_group(request) @@ -6386,9 +6383,9 @@ def test_list_entry_groups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entry_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entry_groups] = ( + mock_rpc + ) request = {} client.list_entry_groups(request) @@ -9936,9 +9933,9 @@ def test_create_metadata_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_job] = ( + mock_rpc + ) request = {} client.create_metadata_job(request) @@ -10302,9 +10299,9 @@ def test_get_metadata_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_job] = ( + mock_rpc + ) request = {} client.get_metadata_job(request) @@ -10641,9 +10638,9 @@ def test_list_metadata_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_jobs] = ( + mock_rpc + ) request = {} client.list_metadata_jobs(request) @@ -11183,9 +11180,9 @@ def test_cancel_metadata_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_metadata_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_metadata_job] = ( + mock_rpc + ) request = {} client.cancel_metadata_job(request) @@ -11517,9 +11514,9 @@ def test_create_entry_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_link] = ( + mock_rpc + ) request = {} client.create_entry_link(request) @@ -11876,9 +11873,9 @@ def test_delete_entry_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_link] = ( + mock_rpc + ) request = {} client.delete_entry_link(request) @@ -12468,9 +12465,9 @@ def test_create_entry_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_type] = ( + mock_rpc + ) request = {} client.create_entry_type(request) @@ -12685,9 +12682,9 @@ def test_update_entry_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entry_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entry_type] = ( + mock_rpc + ) request = {} client.update_entry_type(request) @@ -12886,9 +12883,9 @@ def test_delete_entry_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_type] = ( + mock_rpc + ) request = {} client.delete_entry_type(request) @@ -13068,9 +13065,9 @@ def test_list_entry_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entry_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entry_types] = ( + mock_rpc + ) request = {} client.list_entry_types(request) @@ -13506,9 +13503,9 @@ def test_create_aspect_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_aspect_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_aspect_type] = ( + mock_rpc + ) request = {} client.create_aspect_type(request) @@ -13726,9 +13723,9 @@ def test_update_aspect_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_aspect_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_aspect_type] = ( + mock_rpc + ) request = {} client.update_aspect_type(request) @@ -13929,9 +13926,9 @@ def test_delete_aspect_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_aspect_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_aspect_type] = ( + mock_rpc + ) request = {} client.delete_aspect_type(request) @@ -14112,9 +14109,9 @@ def test_list_aspect_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_aspect_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_aspect_types] = ( + mock_rpc + ) request = {} client.list_aspect_types(request) @@ -14554,9 +14551,9 @@ def test_create_entry_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_group] = ( + mock_rpc + ) request = {} client.create_entry_group(request) @@ -14774,9 +14771,9 @@ def test_update_entry_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entry_group] = ( + mock_rpc + ) request = {} client.update_entry_group(request) @@ -14977,9 +14974,9 @@ def test_delete_entry_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_group] = ( + mock_rpc + ) request = {} client.delete_entry_group(request) @@ -15160,9 +15157,9 @@ def test_list_entry_groups_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entry_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entry_groups] = ( + mock_rpc + ) request = {} client.list_entry_groups(request) @@ -17072,9 +17069,9 @@ def test_create_metadata_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_job] = ( + mock_rpc + ) request = {} client.create_metadata_job(request) @@ -17276,9 +17273,9 @@ def test_get_metadata_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_job] = ( + mock_rpc + ) request = {} client.get_metadata_job(request) @@ -17460,9 +17457,9 @@ def test_list_metadata_jobs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_jobs] = ( + mock_rpc + ) request = {} client.list_metadata_jobs(request) @@ -17722,9 +17719,9 @@ def test_cancel_metadata_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_metadata_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_metadata_job] = ( + mock_rpc + ) request = {} client.cancel_metadata_job(request) @@ -17900,9 +17897,9 @@ def test_create_entry_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_link] = ( + mock_rpc + ) request = {} client.create_entry_link(request) @@ -18111,9 +18108,9 @@ def test_delete_entry_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_link] = ( + mock_rpc + ) request = {} client.delete_entry_link(request) diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_cmek_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_cmek_service.py index fce673f37928..6cae16bec650 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_cmek_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_cmek_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.dataplex_v1.services.cmek_service import ( CmekServiceAsyncClient, @@ -939,10 +941,9 @@ def test_cmek_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -987,10 +988,9 @@ def test_cmek_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1026,9 @@ def test_cmek_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1262,9 +1261,7 @@ def test_cmek_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3008,9 +3005,9 @@ def test_get_encryption_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_config] = ( + mock_rpc + ) request = {} client.get_encryption_config(request) @@ -4140,9 +4137,9 @@ def test_get_encryption_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_config] = ( + mock_rpc + ) request = {} client.get_encryption_config(request) diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_content_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_content_service.py index 039b5a9ebddb..c13277ecd576 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_content_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_content_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,25 +43,32 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.options_pb2 as options_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.cloud.location import locations_pb2 +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account from google.cloud.dataplex_v1.services.content_service import ( ContentServiceAsyncClient, @@ -69,8 +76,7 @@ pagers, transports, ) -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content CRED_INFO_JSON = { @@ -958,10 +964,9 @@ def test_content_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1011,9 @@ def test_content_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1049,9 @@ def test_content_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1295,9 +1298,7 @@ def test_content_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3334,9 +3335,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5111,9 +5112,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_scan_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_scan_service.py index 5de39eb14d5b..2d51bbae6565 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_scan_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_scan_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.dataplex_v1.services.data_scan_service import ( DataScanServiceAsyncClient, @@ -996,10 +998,9 @@ def test_data_scan_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1045,9 @@ def test_data_scan_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1083,10 +1083,9 @@ def test_data_scan_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1333,9 +1332,7 @@ def test_data_scan_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1441,9 +1438,9 @@ def test_create_data_scan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_scan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_scan] = ( + mock_rpc + ) request = {} client.create_data_scan(request) @@ -1786,9 +1783,9 @@ def test_update_data_scan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_scan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_scan] = ( + mock_rpc + ) request = {} client.update_data_scan(request) @@ -2125,9 +2122,9 @@ def test_delete_data_scan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_scan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_scan] = ( + mock_rpc + ) request = {} client.delete_data_scan(request) @@ -3652,9 +3649,9 @@ def test_get_data_scan_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_scan_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_scan_job] = ( + mock_rpc + ) request = {} client.get_data_scan_job(request) @@ -4005,9 +4002,9 @@ def test_list_data_scan_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_scan_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_scan_jobs] = ( + mock_rpc + ) request = {} client.list_data_scan_jobs(request) @@ -4815,9 +4812,9 @@ def test_create_data_scan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_scan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_scan] = ( + mock_rpc + ) request = {} client.create_data_scan(request) @@ -5032,9 +5029,9 @@ def test_update_data_scan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_scan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_scan] = ( + mock_rpc + ) request = {} client.update_data_scan(request) @@ -5228,9 +5225,9 @@ def test_delete_data_scan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_scan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_scan] = ( + mock_rpc + ) request = {} client.delete_data_scan(request) @@ -6025,9 +6022,9 @@ def test_get_data_scan_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_scan_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_scan_job] = ( + mock_rpc + ) request = {} client.get_data_scan_job(request) @@ -6211,9 +6208,9 @@ def test_list_data_scan_jobs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_scan_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_scan_jobs] = ( + mock_rpc + ) request = {} client.list_data_scan_jobs(request) diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_taxonomy_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_taxonomy_service.py index 7c0bb9b31f96..4eb4f6804ed5 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_taxonomy_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_taxonomy_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.dataplex_v1.services.data_taxonomy_service import ( DataTaxonomyServiceAsyncClient, @@ -75,9 +77,8 @@ pagers, transports, ) -from google.cloud.dataplex_v1.types import data_taxonomy +from google.cloud.dataplex_v1.types import data_taxonomy, security, service from google.cloud.dataplex_v1.types import data_taxonomy as gcd_data_taxonomy -from google.cloud.dataplex_v1.types import security, service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1011,10 +1012,9 @@ def test_data_taxonomy_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1059,9 @@ def test_data_taxonomy_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1097,9 @@ def test_data_taxonomy_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1361,9 +1359,7 @@ def test_data_taxonomy_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1475,9 +1471,9 @@ def test_create_data_taxonomy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_taxonomy] = ( + mock_rpc + ) request = {} client.create_data_taxonomy(request) @@ -1837,9 +1833,9 @@ def test_update_data_taxonomy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_taxonomy] = ( + mock_rpc + ) request = {} client.update_data_taxonomy(request) @@ -2195,9 +2191,9 @@ def test_delete_data_taxonomy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_taxonomy] = ( + mock_rpc + ) request = {} client.delete_data_taxonomy(request) @@ -2552,9 +2548,9 @@ def test_list_data_taxonomies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_taxonomies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_taxonomies] = ( + mock_rpc + ) request = {} client.list_data_taxonomies(request) @@ -3108,9 +3104,9 @@ def test_get_data_taxonomy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_taxonomy] = ( + mock_rpc + ) request = {} client.get_data_taxonomy(request) @@ -5469,9 +5465,9 @@ def test_create_data_attribute_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_attribute] = ( + mock_rpc + ) request = {} client.create_data_attribute(request) @@ -5832,9 +5828,9 @@ def test_update_data_attribute_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_attribute] = ( + mock_rpc + ) request = {} client.update_data_attribute(request) @@ -6191,9 +6187,9 @@ def test_delete_data_attribute_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_attribute] = ( + mock_rpc + ) request = {} client.delete_data_attribute(request) @@ -6548,9 +6544,9 @@ def test_list_data_attributes_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_attributes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_attributes] = ( + mock_rpc + ) request = {} client.list_data_attributes(request) @@ -7106,9 +7102,9 @@ def test_get_data_attribute_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_attribute] = ( + mock_rpc + ) request = {} client.get_data_attribute(request) @@ -7391,9 +7387,9 @@ def test_create_data_taxonomy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_taxonomy] = ( + mock_rpc + ) request = {} client.create_data_taxonomy(request) @@ -7611,9 +7607,9 @@ def test_update_data_taxonomy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_taxonomy] = ( + mock_rpc + ) request = {} client.update_data_taxonomy(request) @@ -7814,9 +7810,9 @@ def test_delete_data_taxonomy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_taxonomy] = ( + mock_rpc + ) request = {} client.delete_data_taxonomy(request) @@ -7999,9 +7995,9 @@ def test_list_data_taxonomies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_taxonomies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_taxonomies] = ( + mock_rpc + ) request = {} client.list_data_taxonomies(request) @@ -8261,9 +8257,9 @@ def test_get_data_taxonomy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_taxonomy] = ( + mock_rpc + ) request = {} client.get_data_taxonomy(request) @@ -9549,9 +9545,9 @@ def test_create_data_attribute_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_attribute] = ( + mock_rpc + ) request = {} client.create_data_attribute(request) @@ -9772,9 +9768,9 @@ def test_update_data_attribute_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_attribute] = ( + mock_rpc + ) request = {} client.update_data_attribute(request) @@ -9976,9 +9972,9 @@ def test_delete_data_attribute_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_attribute] = ( + mock_rpc + ) request = {} client.delete_data_attribute(request) @@ -10161,9 +10157,9 @@ def test_list_data_attributes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_attributes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_attributes] = ( + mock_rpc + ) request = {} client.list_data_attributes(request) @@ -10429,9 +10425,9 @@ def test_get_data_attribute_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_attribute] = ( + mock_rpc + ) request = {} client.get_data_attribute(request) diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_dataplex_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_dataplex_service.py index bf6739884458..b3e948cce3a1 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_dataplex_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_dataplex_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,23 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.cloud.dataplex_v1.services.dataplex_service import ( DataplexServiceAsyncClient, @@ -987,10 +989,9 @@ def test_dataplex_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1036,9 @@ def test_dataplex_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1074,10 +1074,9 @@ def test_dataplex_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1324,9 +1323,7 @@ def test_dataplex_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3310,9 +3307,9 @@ def test_list_lake_actions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_lake_actions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_lake_actions] = ( + mock_rpc + ) request = {} client.list_lake_actions(request) @@ -5720,9 +5717,9 @@ def test_list_zone_actions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_zone_actions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_zone_actions] = ( + mock_rpc + ) request = {} client.list_zone_actions(request) @@ -8130,9 +8127,9 @@ def test_list_asset_actions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_asset_actions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_asset_actions] = ( + mock_rpc + ) request = {} client.list_asset_actions(request) @@ -12025,9 +12022,9 @@ def test_create_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -12386,9 +12383,9 @@ def test_update_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -12741,9 +12738,9 @@ def test_delete_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -13093,9 +13090,9 @@ def test_list_environments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -15433,9 +15430,9 @@ def test_list_lake_actions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_lake_actions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_lake_actions] = ( + mock_rpc + ) request = {} client.list_lake_actions(request) @@ -16711,9 +16708,9 @@ def test_list_zone_actions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_zone_actions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_zone_actions] = ( + mock_rpc + ) request = {} client.list_zone_actions(request) @@ -18001,9 +17998,9 @@ def test_list_asset_actions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_asset_actions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_asset_actions] = ( + mock_rpc + ) request = {} client.list_asset_actions(request) @@ -20072,9 +20069,9 @@ def test_create_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -20292,9 +20289,9 @@ def test_update_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -20495,9 +20492,9 @@ def test_delete_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -20676,9 +20673,9 @@ def test_list_environments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_metadata_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_metadata_service.py index f94687970642..bdce2895e091 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_metadata_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_metadata_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,20 +43,27 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.metadata_service import ( MetadataServiceAsyncClient, @@ -975,10 +982,9 @@ def test_metadata_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1029,9 @@ def test_metadata_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1067,9 @@ def test_metadata_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1312,9 +1316,7 @@ def test_metadata_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3274,9 +3276,9 @@ def test_create_partition_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_partition - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_partition] = ( + mock_rpc + ) request = {} client.create_partition(request) @@ -3610,9 +3612,9 @@ def test_delete_partition_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_partition - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_partition] = ( + mock_rpc + ) request = {} client.delete_partition(request) @@ -5662,9 +5664,9 @@ def test_create_partition_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_partition - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_partition] = ( + mock_rpc + ) request = {} client.create_partition(request) @@ -5857,9 +5859,9 @@ def test_delete_partition_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_partition - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_partition] = ( + mock_rpc + ) request = {} client.delete_partition(request) diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/__init__.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/__init__.py index 259cfe3dc03c..ec3c469b2a27 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/__init__.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dataproc_metastore import ( DataprocMetastoreAsyncClient, DataprocMetastoreClient, diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/async_client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/async_client.py index 9ffa905f78c4..a29e46b99143 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/async_client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1 import gapic_version as package_version @@ -47,13 +47,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.metastore_v1.services.dataproc_metastore import pagers from google.cloud.metastore_v1.types import metastore @@ -155,7 +157,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataprocMetastoreAsyncClient: The constructed client. """ - return DataprocMetastoreClient.from_service_account_info.__func__(DataprocMetastoreAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataprocMetastoreClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataprocMetastoreAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -171,7 +176,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataprocMetastoreAsyncClient: The constructed client. """ - return DataprocMetastoreClient.from_service_account_file.__func__(DataprocMetastoreAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataprocMetastoreClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataprocMetastoreAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/client.py index 75833ba6ff01..ad573ac2f224 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1 import gapic_version as package_version @@ -64,13 +64,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.metastore_v1.services.dataproc_metastore import pagers from google.cloud.metastore_v1.types import metastore @@ -89,9 +91,7 @@ class DataprocMetastoreClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataprocMetastoreTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreTransport]] _transport_registry["grpc"] = DataprocMetastoreGrpcTransport _transport_registry["grpc_asyncio"] = DataprocMetastoreGrpcAsyncIOTransport _transport_registry["rest"] = DataprocMetastoreRestTransport @@ -745,11 +745,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataprocMetastoreClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataprocMetastoreClient._read_environment_variables() + ) self._client_cert_source = DataprocMetastoreClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -784,8 +782,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataprocMetastoreTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/pagers.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/pagers.py index dfa6259ec500..71aece1ae2b2 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/pagers.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/base.py index fc2c150ed6df..ec4040312c44 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1 import gapic_version as package_version from google.cloud.metastore_v1.types import metastore @@ -482,13 +484,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc.py index 768cd4d63448..e11ed360b33f 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.metastore_v1.types import metastore @@ -832,12 +834,12 @@ def alter_metadata_resource_location( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "alter_metadata_resource_location" not in self._stubs: - self._stubs[ - "alter_metadata_resource_location" - ] = self._logged_channel.unary_unary( - "/google.cloud.metastore.v1.DataprocMetastore/AlterMetadataResourceLocation", - request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["alter_metadata_resource_location"] = ( + self._logged_channel.unary_unary( + "/google.cloud.metastore.v1.DataprocMetastore/AlterMetadataResourceLocation", + request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["alter_metadata_resource_location"] diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc_asyncio.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc_asyncio.py index ae10b2b9cf5b..469baa28fbb4 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.metastore_v1.types import metastore @@ -870,12 +872,12 @@ def alter_metadata_resource_location( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "alter_metadata_resource_location" not in self._stubs: - self._stubs[ - "alter_metadata_resource_location" - ] = self._logged_channel.unary_unary( - "/google.cloud.metastore.v1.DataprocMetastore/AlterMetadataResourceLocation", - request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["alter_metadata_resource_location"] = ( + self._logged_channel.unary_unary( + "/google.cloud.metastore.v1.DataprocMetastore/AlterMetadataResourceLocation", + request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["alter_metadata_resource_location"] diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest.py index 9025b001335c..058bd6179165 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1510,9 +1512,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseAlterMetadataResourceLocation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseAlterMetadataResourceLocation._get_http_options() request, metadata = self._interceptor.pre_alter_metadata_resource_location( request, metadata @@ -1579,11 +1579,10 @@ def __call__( resp = self._interceptor.post_alter_metadata_resource_location(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_alter_metadata_resource_location_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_alter_metadata_resource_location_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1667,9 +1666,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_http_options() request, metadata = self._interceptor.pre_create_backup(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_transcoded_request( @@ -1820,9 +1817,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateMetadataImport._get_http_options() request, metadata = self._interceptor.pre_create_metadata_import( request, metadata @@ -1977,9 +1972,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateService._get_http_options() request, metadata = self._interceptor.pre_create_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseCreateService._get_transcoded_request( @@ -2128,9 +2121,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_http_options() request, metadata = self._interceptor.pre_delete_backup(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_transcoded_request( @@ -2275,9 +2266,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_http_options() request, metadata = self._interceptor.pre_delete_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_transcoded_request( @@ -2423,9 +2412,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_http_options() request, metadata = self._interceptor.pre_export_metadata(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_transcoded_request( @@ -2719,9 +2706,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetMetadataImport._get_http_options() request, metadata = self._interceptor.pre_get_metadata_import( request, metadata @@ -3163,9 +3148,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListMetadataImports._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListMetadataImports._get_http_options() request, metadata = self._interceptor.pre_list_metadata_imports( request, metadata @@ -3316,9 +3299,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListServices._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListServices._get_http_options() request, metadata = self._interceptor.pre_list_services(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListServices._get_transcoded_request( @@ -3466,9 +3447,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseMoveTableToDatabase._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseMoveTableToDatabase._get_http_options() request, metadata = self._interceptor.pre_move_table_to_database( request, metadata @@ -3623,9 +3602,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_http_options() request, metadata = self._interceptor.pre_query_metadata(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_transcoded_request( @@ -3775,9 +3752,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_http_options() request, metadata = self._interceptor.pre_restore_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_transcoded_request( @@ -3928,9 +3903,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseUpdateMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseUpdateMetadataImport._get_http_options() request, metadata = self._interceptor.pre_update_metadata_import( request, metadata @@ -4085,9 +4058,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_http_options() request, metadata = self._interceptor.pre_update_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_transcoded_request( @@ -4186,7 +4157,9 @@ def alter_metadata_resource_location( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AlterMetadataResourceLocation(self._session, self._host, self._interceptor) # type: ignore + return self._AlterMetadataResourceLocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_backup( @@ -4520,9 +4493,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListLocations._get_transcoded_request( @@ -4660,9 +4631,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -4801,9 +4770,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -4948,9 +4915,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5094,9 +5059,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -5214,9 +5177,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -5331,9 +5292,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_transcoded_request( @@ -5472,9 +5431,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest_base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest_base.py index 7116c6a4b86c..03a69e9ca718 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest_base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/async_client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/async_client.py index 82bd4574997e..2308f9ea1c45 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/async_client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1 import gapic_version as package_version @@ -47,13 +47,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.metastore_v1.services.dataproc_metastore_federation import pagers from google.cloud.metastore_v1.types import metastore, metastore_federation @@ -149,7 +151,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataprocMetastoreFederationAsyncClient: The constructed client. """ - return DataprocMetastoreFederationClient.from_service_account_info.__func__(DataprocMetastoreFederationAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataprocMetastoreFederationClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + DataprocMetastoreFederationAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -165,7 +172,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataprocMetastoreFederationAsyncClient: The constructed client. """ - return DataprocMetastoreFederationClient.from_service_account_file.__func__(DataprocMetastoreFederationAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataprocMetastoreFederationClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + DataprocMetastoreFederationAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -203,7 +215,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataprocMetastoreFederationClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataprocMetastoreFederationClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataprocMetastoreFederationTransport: diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/client.py index 6ce6baa27063..1c8bf8948a7c 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1 import gapic_version as package_version @@ -64,13 +64,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.metastore_v1.services.dataproc_metastore_federation import pagers from google.cloud.metastore_v1.types import metastore, metastore_federation @@ -89,13 +91,11 @@ class DataprocMetastoreFederationClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataprocMetastoreFederationTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreFederationTransport]] _transport_registry["grpc"] = DataprocMetastoreFederationGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = DataprocMetastoreFederationGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + DataprocMetastoreFederationGrpcAsyncIOTransport + ) _transport_registry["rest"] = DataprocMetastoreFederationRestTransport def get_transport_class( @@ -658,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataprocMetastoreFederationClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataprocMetastoreFederationClient._read_environment_variables() + ) self._client_cert_source = ( DataprocMetastoreFederationClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -699,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataprocMetastoreFederationTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/pagers.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/pagers.py index da1bfdde4a59..aa542fe2f0c1 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/pagers.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/__init__.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/__init__.py index 7320002bfbbe..ee1d93bac827 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/__init__.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataprocMetastoreFederationTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreFederationTransport]] _transport_registry["grpc"] = DataprocMetastoreFederationGrpcTransport _transport_registry["grpc_asyncio"] = DataprocMetastoreFederationGrpcAsyncIOTransport _transport_registry["rest"] = DataprocMetastoreFederationRestTransport diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/base.py index 8d8cff97e650..8acf823c7ea4 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1 import gapic_version as package_version from google.cloud.metastore_v1.types import metastore_federation @@ -300,13 +302,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc.py index b1ba96e3e891..71c700946e24 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.metastore_v1.types import metastore_federation diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc_asyncio.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc_asyncio.py index af8eaee3808a..45dcc82eac70 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.metastore_v1.types import metastore_federation diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest.py index cf4305d520ff..b205bd4c8e79 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -807,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseCreateFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseCreateFederation._get_http_options() request, metadata = self._interceptor.pre_create_federation( request, metadata @@ -960,9 +960,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseDeleteFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseDeleteFederation._get_http_options() request, metadata = self._interceptor.pre_delete_federation( request, metadata @@ -1107,9 +1105,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_http_options() request, metadata = self._interceptor.pre_get_federation(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_transcoded_request( @@ -1254,9 +1250,7 @@ def __call__( Response message for ListFederations """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListFederations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListFederations._get_http_options() request, metadata = self._interceptor.pre_list_federations( request, metadata @@ -1409,9 +1403,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseUpdateFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseUpdateFederation._get_http_options() request, metadata = self._interceptor.pre_update_federation( request, metadata @@ -1613,9 +1605,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_transcoded_request( @@ -1756,9 +1746,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_transcoded_request( @@ -1899,9 +1887,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2043,9 +2029,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2192,9 +2176,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2338,9 +2320,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2460,9 +2440,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2580,9 +2558,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_transcoded_request( @@ -2723,9 +2699,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest_base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest_base.py index 48e601a68db5..98af96a63924 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest_base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore.py index bce52eb0d438..7ded26d9604f 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore.py @@ -191,6 +191,7 @@ class State(proto.Enum): error and cannot be used. The metastore service should be deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -215,6 +216,7 @@ class Tier(proto.Enum): availability, and sufficient scalability for enterprise-level Dataproc Metastore workloads. """ + TIER_UNSPECIFIED = 0 DEVELOPER = 1 ENTERPRISE = 3 @@ -238,6 +240,7 @@ class ReleaseChannel(proto.Enum): considered stable and have been validated for production use. """ + RELEASE_CHANNEL_UNSPECIFIED = 0 CANARY = 1 STABLE = 2 @@ -254,6 +257,7 @@ class DatabaseType(proto.Enum): Spanner is used to persist the metastore data. """ + DATABASE_TYPE_UNSPECIFIED = 0 MYSQL = 1 SPANNER = 2 @@ -434,6 +438,7 @@ class EndpointProtocol(proto.Enum): Use the modernized gRPC protocol for the metastore service endpoint. """ + ENDPOINT_PROTOCOL_UNSPECIFIED = 0 THRIFT = 1 GRPC = 2 @@ -658,6 +663,7 @@ class LogFormat(proto.Enum): JSON (2): Logging output uses the ``jsonPayload`` format. """ + LOG_FORMAT_UNSPECIFIED = 0 LEGACY = 1 JSON = 2 @@ -741,6 +747,7 @@ class State(proto.Enum): The metadata import failed, and attempted metadata changes were rolled back. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -774,6 +781,7 @@ class DatabaseType(proto.Enum): MYSQL (1): The type of the source database is MySQL. """ + DATABASE_TYPE_UNSPECIFIED = 0 MYSQL = 1 @@ -871,6 +879,7 @@ class State(proto.Enum): CANCELLED (4): The metadata export is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -948,6 +957,7 @@ class State(proto.Enum): RESTORING (5): The backup is being restored. """ + STATE_UNSPECIFIED = 0 CREATING = 1 DELETING = 2 @@ -1029,6 +1039,7 @@ class State(proto.Enum): CANCELLED (4): The metadata restore is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -1047,6 +1058,7 @@ class RestoreType(proto.Enum): METADATA_ONLY (2): Only the service's metadata is restored. """ + RESTORE_TYPE_UNSPECIFIED = 0 FULL = 1 METADATA_ONLY = 2 @@ -1128,6 +1140,7 @@ class InstanceSize(proto.Enum): Extra large instance size, maps to a scaling factor of 6.0. """ + INSTANCE_SIZE_UNSPECIFIED = 0 EXTRA_SMALL = 1 SMALL = 2 @@ -2051,12 +2064,12 @@ class HiveMetastoreVersion(proto.Message): number=2, ) - supported_hive_metastore_versions: MutableSequence[ - HiveMetastoreVersion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=HiveMetastoreVersion, + supported_hive_metastore_versions: MutableSequence[HiveMetastoreVersion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=HiveMetastoreVersion, + ) ) @@ -2077,6 +2090,7 @@ class Type(proto.Enum): AVRO (2): Database dump contains Avro files. """ + TYPE_UNSPECIFIED = 0 MYSQL = 1 AVRO = 2 diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore_federation.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore_federation.py index e4c9c327f053..b19f25091042 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore_federation.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore_federation.py @@ -106,6 +106,7 @@ class State(proto.Enum): error and cannot be used. The metastore federation should be deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -192,6 +193,7 @@ class MetastoreType(proto.Enum): DATAPROC_METASTORE (3): The backend metastore is Dataproc Metastore. """ + METASTORE_TYPE_UNSPECIFIED = 0 BIGQUERY = 2 DATAPROC_METASTORE = 3 diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/__init__.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/__init__.py index fa661269384d..df707d8446d0 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/__init__.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dataproc_metastore import ( DataprocMetastoreAsyncClient, DataprocMetastoreClient, diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/async_client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/async_client.py index a550b002f7b2..44fe6fca8ddf 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/async_client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1alpha import gapic_version as package_version @@ -47,13 +47,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.metastore_v1alpha.services.dataproc_metastore import pagers from google.cloud.metastore_v1alpha.types import metastore @@ -157,7 +159,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataprocMetastoreAsyncClient: The constructed client. """ - return DataprocMetastoreClient.from_service_account_info.__func__(DataprocMetastoreAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataprocMetastoreClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataprocMetastoreAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -173,7 +178,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataprocMetastoreAsyncClient: The constructed client. """ - return DataprocMetastoreClient.from_service_account_file.__func__(DataprocMetastoreAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataprocMetastoreClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataprocMetastoreAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/client.py index 4e6d651acfe8..7f0c18145aaf 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1alpha import gapic_version as package_version @@ -64,13 +64,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.metastore_v1alpha.services.dataproc_metastore import pagers from google.cloud.metastore_v1alpha.types import metastore @@ -89,9 +91,7 @@ class DataprocMetastoreClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataprocMetastoreTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreTransport]] _transport_registry["grpc"] = DataprocMetastoreGrpcTransport _transport_registry["grpc_asyncio"] = DataprocMetastoreGrpcAsyncIOTransport _transport_registry["rest"] = DataprocMetastoreRestTransport @@ -767,11 +767,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataprocMetastoreClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataprocMetastoreClient._read_environment_variables() + ) self._client_cert_source = DataprocMetastoreClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -806,8 +804,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataprocMetastoreTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/pagers.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/pagers.py index c95dad8ce76b..aa58a572d16d 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/pagers.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/base.py index 39a9048193d6..32c9dfcf3ab0 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1alpha import gapic_version as package_version from google.cloud.metastore_v1alpha.types import metastore @@ -499,13 +501,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc.py index 32344f0521aa..3368cd2f40a9 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.metastore_v1alpha.types import metastore @@ -860,12 +862,12 @@ def alter_metadata_resource_location( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "alter_metadata_resource_location" not in self._stubs: - self._stubs[ - "alter_metadata_resource_location" - ] = self._logged_channel.unary_unary( - "/google.cloud.metastore.v1alpha.DataprocMetastore/AlterMetadataResourceLocation", - request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["alter_metadata_resource_location"] = ( + self._logged_channel.unary_unary( + "/google.cloud.metastore.v1alpha.DataprocMetastore/AlterMetadataResourceLocation", + request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["alter_metadata_resource_location"] diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc_asyncio.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc_asyncio.py index 15d819832d9f..7a0962a9e16a 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.metastore_v1alpha.types import metastore @@ -898,12 +900,12 @@ def alter_metadata_resource_location( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "alter_metadata_resource_location" not in self._stubs: - self._stubs[ - "alter_metadata_resource_location" - ] = self._logged_channel.unary_unary( - "/google.cloud.metastore.v1alpha.DataprocMetastore/AlterMetadataResourceLocation", - request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["alter_metadata_resource_location"] = ( + self._logged_channel.unary_unary( + "/google.cloud.metastore.v1alpha.DataprocMetastore/AlterMetadataResourceLocation", + request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["alter_metadata_resource_location"] diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest.py index 74bf02fcd2f5..134dda44ebc4 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1568,9 +1570,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseAlterMetadataResourceLocation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseAlterMetadataResourceLocation._get_http_options() request, metadata = self._interceptor.pre_alter_metadata_resource_location( request, metadata @@ -1637,11 +1637,10 @@ def __call__( resp = self._interceptor.post_alter_metadata_resource_location(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_alter_metadata_resource_location_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_alter_metadata_resource_location_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1725,9 +1724,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_http_options() request, metadata = self._interceptor.pre_create_backup(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_transcoded_request( @@ -1878,9 +1875,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateMetadataImport._get_http_options() request, metadata = self._interceptor.pre_create_metadata_import( request, metadata @@ -2035,9 +2030,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateService._get_http_options() request, metadata = self._interceptor.pre_create_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseCreateService._get_transcoded_request( @@ -2186,9 +2179,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_http_options() request, metadata = self._interceptor.pre_delete_backup(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_transcoded_request( @@ -2333,9 +2324,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_http_options() request, metadata = self._interceptor.pre_delete_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_transcoded_request( @@ -2481,9 +2470,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_http_options() request, metadata = self._interceptor.pre_export_metadata(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_transcoded_request( @@ -2777,9 +2764,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetMetadataImport._get_http_options() request, metadata = self._interceptor.pre_get_metadata_import( request, metadata @@ -3221,9 +3206,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListMetadataImports._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListMetadataImports._get_http_options() request, metadata = self._interceptor.pre_list_metadata_imports( request, metadata @@ -3374,9 +3357,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListServices._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListServices._get_http_options() request, metadata = self._interceptor.pre_list_services(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListServices._get_transcoded_request( @@ -3524,9 +3505,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseMoveTableToDatabase._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseMoveTableToDatabase._get_http_options() request, metadata = self._interceptor.pre_move_table_to_database( request, metadata @@ -3681,9 +3660,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_http_options() request, metadata = self._interceptor.pre_query_metadata(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_transcoded_request( @@ -3833,9 +3810,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseRemoveIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseRemoveIamPolicy._get_http_options() request, metadata = self._interceptor.pre_remove_iam_policy( request, metadata @@ -3991,9 +3966,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_http_options() request, metadata = self._interceptor.pre_restore_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_transcoded_request( @@ -4144,9 +4117,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseUpdateMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseUpdateMetadataImport._get_http_options() request, metadata = self._interceptor.pre_update_metadata_import( request, metadata @@ -4301,9 +4272,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_http_options() request, metadata = self._interceptor.pre_update_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_transcoded_request( @@ -4402,7 +4371,9 @@ def alter_metadata_resource_location( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AlterMetadataResourceLocation(self._session, self._host, self._interceptor) # type: ignore + return self._AlterMetadataResourceLocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_backup( @@ -4746,9 +4717,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListLocations._get_transcoded_request( @@ -4886,9 +4855,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -5027,9 +4994,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -5174,9 +5139,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5320,9 +5283,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -5440,9 +5401,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -5557,9 +5516,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_transcoded_request( @@ -5698,9 +5655,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest_base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest_base.py index 62c76bd540ed..e84b393d9b5a 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest_base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/async_client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/async_client.py index 3105e1dc44f6..415f85a4ca0f 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/async_client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1alpha import gapic_version as package_version @@ -47,13 +47,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.metastore_v1alpha.services.dataproc_metastore_federation import pagers from google.cloud.metastore_v1alpha.types import metastore, metastore_federation @@ -149,7 +151,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataprocMetastoreFederationAsyncClient: The constructed client. """ - return DataprocMetastoreFederationClient.from_service_account_info.__func__(DataprocMetastoreFederationAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataprocMetastoreFederationClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + DataprocMetastoreFederationAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -165,7 +172,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataprocMetastoreFederationAsyncClient: The constructed client. """ - return DataprocMetastoreFederationClient.from_service_account_file.__func__(DataprocMetastoreFederationAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataprocMetastoreFederationClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + DataprocMetastoreFederationAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -203,7 +215,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataprocMetastoreFederationClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataprocMetastoreFederationClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataprocMetastoreFederationTransport: diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/client.py index 1d1b9340ada2..40b6991c83b4 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1alpha import gapic_version as package_version @@ -64,13 +64,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.metastore_v1alpha.services.dataproc_metastore_federation import pagers from google.cloud.metastore_v1alpha.types import metastore, metastore_federation @@ -89,13 +91,11 @@ class DataprocMetastoreFederationClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataprocMetastoreFederationTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreFederationTransport]] _transport_registry["grpc"] = DataprocMetastoreFederationGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = DataprocMetastoreFederationGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + DataprocMetastoreFederationGrpcAsyncIOTransport + ) _transport_registry["rest"] = DataprocMetastoreFederationRestTransport def get_transport_class( @@ -658,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataprocMetastoreFederationClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataprocMetastoreFederationClient._read_environment_variables() + ) self._client_cert_source = ( DataprocMetastoreFederationClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -699,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataprocMetastoreFederationTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/pagers.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/pagers.py index 95f508f2cf67..b9958ea0b1d1 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/pagers.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/__init__.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/__init__.py index 7320002bfbbe..ee1d93bac827 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/__init__.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataprocMetastoreFederationTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreFederationTransport]] _transport_registry["grpc"] = DataprocMetastoreFederationGrpcTransport _transport_registry["grpc_asyncio"] = DataprocMetastoreFederationGrpcAsyncIOTransport _transport_registry["rest"] = DataprocMetastoreFederationRestTransport diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/base.py index 7a486a8e3179..e29a3dbb262a 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1alpha import gapic_version as package_version from google.cloud.metastore_v1alpha.types import metastore_federation @@ -300,13 +302,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc.py index c2c04656b706..29f61cb992fc 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.metastore_v1alpha.types import metastore_federation diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc_asyncio.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc_asyncio.py index f26efbcd95b9..788f2983ef59 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.metastore_v1alpha.types import metastore_federation diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest.py index e566cc9a8d3f..36d9e1d163dd 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -807,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseCreateFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseCreateFederation._get_http_options() request, metadata = self._interceptor.pre_create_federation( request, metadata @@ -960,9 +960,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseDeleteFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseDeleteFederation._get_http_options() request, metadata = self._interceptor.pre_delete_federation( request, metadata @@ -1107,9 +1105,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_http_options() request, metadata = self._interceptor.pre_get_federation(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_transcoded_request( @@ -1254,9 +1250,7 @@ def __call__( Response message for ListFederations """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListFederations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListFederations._get_http_options() request, metadata = self._interceptor.pre_list_federations( request, metadata @@ -1409,9 +1403,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseUpdateFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseUpdateFederation._get_http_options() request, metadata = self._interceptor.pre_update_federation( request, metadata @@ -1613,9 +1605,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_transcoded_request( @@ -1756,9 +1746,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_transcoded_request( @@ -1899,9 +1887,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2043,9 +2029,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2192,9 +2176,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2338,9 +2320,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2460,9 +2440,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2580,9 +2558,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_transcoded_request( @@ -2723,9 +2699,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest_base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest_base.py index f925514036e7..460bd53fddb3 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest_base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore.py index fc67919b6f05..4f748a4396b2 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore.py @@ -201,6 +201,7 @@ class State(proto.Enum): error and cannot be used. The metastore service should be deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -225,6 +226,7 @@ class Tier(proto.Enum): availability, and sufficient scalability for enterprise-level Dataproc Metastore workloads. """ + TIER_UNSPECIFIED = 0 DEVELOPER = 1 ENTERPRISE = 3 @@ -248,6 +250,7 @@ class ReleaseChannel(proto.Enum): considered stable and have been validated for production use. """ + RELEASE_CHANNEL_UNSPECIFIED = 0 CANARY = 1 STABLE = 2 @@ -264,6 +267,7 @@ class DatabaseType(proto.Enum): Spanner is used to persist the metastore data. """ + DATABASE_TYPE_UNSPECIFIED = 0 MYSQL = 1 SPANNER = 2 @@ -527,6 +531,7 @@ class EndpointProtocol(proto.Enum): Use the modernized gRPC protocol for the metastore service endpoint. """ + ENDPOINT_PROTOCOL_UNSPECIFIED = 0 THRIFT = 1 GRPC = 2 @@ -759,6 +764,7 @@ class LogFormat(proto.Enum): JSON (2): Logging output uses the ``jsonPayload`` format. """ + LOG_FORMAT_UNSPECIFIED = 0 LEGACY = 1 JSON = 2 @@ -842,6 +848,7 @@ class State(proto.Enum): The metadata import failed, and attempted metadata changes were rolled back. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -875,6 +882,7 @@ class DatabaseType(proto.Enum): MYSQL (1): The type of the source database is MySQL. """ + DATABASE_TYPE_UNSPECIFIED = 0 MYSQL = 1 @@ -972,6 +980,7 @@ class State(proto.Enum): CANCELLED (4): The metadata export is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -1049,6 +1058,7 @@ class State(proto.Enum): RESTORING (5): The backup is being restored. """ + STATE_UNSPECIFIED = 0 CREATING = 1 DELETING = 2 @@ -1130,6 +1140,7 @@ class State(proto.Enum): CANCELLED (4): The metadata restore is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -1148,6 +1159,7 @@ class RestoreType(proto.Enum): METADATA_ONLY (2): Only the service's metadata is restored. """ + RESTORE_TYPE_UNSPECIFIED = 0 FULL = 1 METADATA_ONLY = 2 @@ -1229,6 +1241,7 @@ class InstanceSize(proto.Enum): Extra large instance size, maps to a scaling factor of 6.0. """ + INSTANCE_SIZE_UNSPECIFIED = 0 EXTRA_SMALL = 1 SMALL = 2 @@ -2152,12 +2165,12 @@ class HiveMetastoreVersion(proto.Message): number=2, ) - supported_hive_metastore_versions: MutableSequence[ - HiveMetastoreVersion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=HiveMetastoreVersion, + supported_hive_metastore_versions: MutableSequence[HiveMetastoreVersion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=HiveMetastoreVersion, + ) ) @@ -2178,6 +2191,7 @@ class Type(proto.Enum): AVRO (2): Database dump contains Avro files. """ + TYPE_UNSPECIFIED = 0 MYSQL = 1 AVRO = 2 diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore_federation.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore_federation.py index 6f80b173e7b7..9ed118dda882 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore_federation.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore_federation.py @@ -106,6 +106,7 @@ class State(proto.Enum): error and cannot be used. The metastore federation should be deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -194,6 +195,7 @@ class MetastoreType(proto.Enum): DATAPROC_METASTORE (3): The backend metastore is Dataproc Metastore. """ + METASTORE_TYPE_UNSPECIFIED = 0 DATAPLEX = 1 BIGQUERY = 2 diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/__init__.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/__init__.py index 613d6bc5527a..fc6cb92422c2 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/__init__.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dataproc_metastore import ( DataprocMetastoreAsyncClient, DataprocMetastoreClient, diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/async_client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/async_client.py index d130716a576b..c1d35dbf42a8 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/async_client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1beta import gapic_version as package_version @@ -47,13 +47,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.metastore_v1beta.services.dataproc_metastore import pagers from google.cloud.metastore_v1beta.types import metastore @@ -157,7 +159,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataprocMetastoreAsyncClient: The constructed client. """ - return DataprocMetastoreClient.from_service_account_info.__func__(DataprocMetastoreAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataprocMetastoreClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataprocMetastoreAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -173,7 +178,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataprocMetastoreAsyncClient: The constructed client. """ - return DataprocMetastoreClient.from_service_account_file.__func__(DataprocMetastoreAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataprocMetastoreClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataprocMetastoreAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/client.py index 5c885e15a5f1..aa629ac22e3d 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1beta import gapic_version as package_version @@ -64,13 +64,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.metastore_v1beta.services.dataproc_metastore import pagers from google.cloud.metastore_v1beta.types import metastore @@ -89,9 +91,7 @@ class DataprocMetastoreClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataprocMetastoreTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreTransport]] _transport_registry["grpc"] = DataprocMetastoreGrpcTransport _transport_registry["grpc_asyncio"] = DataprocMetastoreGrpcAsyncIOTransport _transport_registry["rest"] = DataprocMetastoreRestTransport @@ -767,11 +767,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataprocMetastoreClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataprocMetastoreClient._read_environment_variables() + ) self._client_cert_source = DataprocMetastoreClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -806,8 +804,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataprocMetastoreTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/pagers.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/pagers.py index cd56a8b122d3..60ae18252aba 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/pagers.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/base.py index 644f2150e627..a206821ff5c2 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1beta import gapic_version as package_version from google.cloud.metastore_v1beta.types import metastore @@ -499,13 +501,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc.py index 9ccf73427b79..379d926ae92b 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.metastore_v1beta.types import metastore @@ -860,12 +862,12 @@ def alter_metadata_resource_location( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "alter_metadata_resource_location" not in self._stubs: - self._stubs[ - "alter_metadata_resource_location" - ] = self._logged_channel.unary_unary( - "/google.cloud.metastore.v1beta.DataprocMetastore/AlterMetadataResourceLocation", - request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["alter_metadata_resource_location"] = ( + self._logged_channel.unary_unary( + "/google.cloud.metastore.v1beta.DataprocMetastore/AlterMetadataResourceLocation", + request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["alter_metadata_resource_location"] diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc_asyncio.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc_asyncio.py index 5fd81d09c522..1fb268343233 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.metastore_v1beta.types import metastore @@ -898,12 +900,12 @@ def alter_metadata_resource_location( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "alter_metadata_resource_location" not in self._stubs: - self._stubs[ - "alter_metadata_resource_location" - ] = self._logged_channel.unary_unary( - "/google.cloud.metastore.v1beta.DataprocMetastore/AlterMetadataResourceLocation", - request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["alter_metadata_resource_location"] = ( + self._logged_channel.unary_unary( + "/google.cloud.metastore.v1beta.DataprocMetastore/AlterMetadataResourceLocation", + request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["alter_metadata_resource_location"] diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest.py index 7ddce07c7f22..e900dfbb5a77 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1568,9 +1570,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseAlterMetadataResourceLocation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseAlterMetadataResourceLocation._get_http_options() request, metadata = self._interceptor.pre_alter_metadata_resource_location( request, metadata @@ -1637,11 +1637,10 @@ def __call__( resp = self._interceptor.post_alter_metadata_resource_location(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_alter_metadata_resource_location_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_alter_metadata_resource_location_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1725,9 +1724,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_http_options() request, metadata = self._interceptor.pre_create_backup(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_transcoded_request( @@ -1878,9 +1875,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateMetadataImport._get_http_options() request, metadata = self._interceptor.pre_create_metadata_import( request, metadata @@ -2035,9 +2030,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateService._get_http_options() request, metadata = self._interceptor.pre_create_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseCreateService._get_transcoded_request( @@ -2186,9 +2179,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_http_options() request, metadata = self._interceptor.pre_delete_backup(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_transcoded_request( @@ -2333,9 +2324,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_http_options() request, metadata = self._interceptor.pre_delete_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_transcoded_request( @@ -2481,9 +2470,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_http_options() request, metadata = self._interceptor.pre_export_metadata(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_transcoded_request( @@ -2777,9 +2764,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetMetadataImport._get_http_options() request, metadata = self._interceptor.pre_get_metadata_import( request, metadata @@ -3221,9 +3206,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListMetadataImports._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListMetadataImports._get_http_options() request, metadata = self._interceptor.pre_list_metadata_imports( request, metadata @@ -3374,9 +3357,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListServices._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListServices._get_http_options() request, metadata = self._interceptor.pre_list_services(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListServices._get_transcoded_request( @@ -3524,9 +3505,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseMoveTableToDatabase._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseMoveTableToDatabase._get_http_options() request, metadata = self._interceptor.pre_move_table_to_database( request, metadata @@ -3681,9 +3660,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_http_options() request, metadata = self._interceptor.pre_query_metadata(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_transcoded_request( @@ -3833,9 +3810,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseRemoveIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseRemoveIamPolicy._get_http_options() request, metadata = self._interceptor.pre_remove_iam_policy( request, metadata @@ -3991,9 +3966,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_http_options() request, metadata = self._interceptor.pre_restore_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_transcoded_request( @@ -4144,9 +4117,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseUpdateMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseUpdateMetadataImport._get_http_options() request, metadata = self._interceptor.pre_update_metadata_import( request, metadata @@ -4301,9 +4272,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_http_options() request, metadata = self._interceptor.pre_update_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_transcoded_request( @@ -4402,7 +4371,9 @@ def alter_metadata_resource_location( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AlterMetadataResourceLocation(self._session, self._host, self._interceptor) # type: ignore + return self._AlterMetadataResourceLocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_backup( @@ -4746,9 +4717,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListLocations._get_transcoded_request( @@ -4886,9 +4855,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -5027,9 +4994,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -5174,9 +5139,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5320,9 +5283,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -5440,9 +5401,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -5557,9 +5516,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_transcoded_request( @@ -5698,9 +5655,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest_base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest_base.py index 6c19ee5562b3..0d9a505554b5 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest_base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/async_client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/async_client.py index 51bd8bd995eb..1f623442b6f4 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/async_client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1beta import gapic_version as package_version @@ -47,13 +47,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.metastore_v1beta.services.dataproc_metastore_federation import pagers from google.cloud.metastore_v1beta.types import metastore, metastore_federation @@ -149,7 +151,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataprocMetastoreFederationAsyncClient: The constructed client. """ - return DataprocMetastoreFederationClient.from_service_account_info.__func__(DataprocMetastoreFederationAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataprocMetastoreFederationClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + DataprocMetastoreFederationAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -165,7 +172,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataprocMetastoreFederationAsyncClient: The constructed client. """ - return DataprocMetastoreFederationClient.from_service_account_file.__func__(DataprocMetastoreFederationAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataprocMetastoreFederationClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + DataprocMetastoreFederationAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -203,7 +215,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataprocMetastoreFederationClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataprocMetastoreFederationClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataprocMetastoreFederationTransport: diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/client.py index a1bd62c5df38..7cb7620ef4fc 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1beta import gapic_version as package_version @@ -64,13 +64,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.metastore_v1beta.services.dataproc_metastore_federation import pagers from google.cloud.metastore_v1beta.types import metastore, metastore_federation @@ -89,13 +91,11 @@ class DataprocMetastoreFederationClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataprocMetastoreFederationTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreFederationTransport]] _transport_registry["grpc"] = DataprocMetastoreFederationGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = DataprocMetastoreFederationGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + DataprocMetastoreFederationGrpcAsyncIOTransport + ) _transport_registry["rest"] = DataprocMetastoreFederationRestTransport def get_transport_class( @@ -658,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataprocMetastoreFederationClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataprocMetastoreFederationClient._read_environment_variables() + ) self._client_cert_source = ( DataprocMetastoreFederationClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -699,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataprocMetastoreFederationTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/pagers.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/pagers.py index b37a29ec3318..2c3e66cfd5c0 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/pagers.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/__init__.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/__init__.py index 7320002bfbbe..ee1d93bac827 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/__init__.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataprocMetastoreFederationTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreFederationTransport]] _transport_registry["grpc"] = DataprocMetastoreFederationGrpcTransport _transport_registry["grpc_asyncio"] = DataprocMetastoreFederationGrpcAsyncIOTransport _transport_registry["rest"] = DataprocMetastoreFederationRestTransport diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/base.py index f07c4acb9e98..36c51953666a 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1beta import gapic_version as package_version from google.cloud.metastore_v1beta.types import metastore_federation @@ -300,13 +302,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc.py index cbfa1274b927..7dbbc57367ff 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.metastore_v1beta.types import metastore_federation diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc_asyncio.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc_asyncio.py index 6e64ebde6efa..e9cc5edaba42 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.metastore_v1beta.types import metastore_federation diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest.py index 3078523c4e8b..6223af7e6dba 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -807,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseCreateFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseCreateFederation._get_http_options() request, metadata = self._interceptor.pre_create_federation( request, metadata @@ -960,9 +960,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseDeleteFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseDeleteFederation._get_http_options() request, metadata = self._interceptor.pre_delete_federation( request, metadata @@ -1107,9 +1105,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_http_options() request, metadata = self._interceptor.pre_get_federation(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_transcoded_request( @@ -1254,9 +1250,7 @@ def __call__( Response message for ListFederations """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListFederations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListFederations._get_http_options() request, metadata = self._interceptor.pre_list_federations( request, metadata @@ -1409,9 +1403,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseUpdateFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseUpdateFederation._get_http_options() request, metadata = self._interceptor.pre_update_federation( request, metadata @@ -1613,9 +1605,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_transcoded_request( @@ -1756,9 +1746,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_transcoded_request( @@ -1899,9 +1887,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2043,9 +2029,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2192,9 +2176,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2338,9 +2320,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2460,9 +2440,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2580,9 +2558,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_transcoded_request( @@ -2723,9 +2699,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest_base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest_base.py index 63b7f09d6497..5fba14d1271d 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest_base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore.py index 73cfccf937c8..66b3b6696ab4 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore.py @@ -201,6 +201,7 @@ class State(proto.Enum): error and cannot be used. The metastore service should be deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -225,6 +226,7 @@ class Tier(proto.Enum): availability, and sufficient scalability for enterprise-level Dataproc Metastore workloads. """ + TIER_UNSPECIFIED = 0 DEVELOPER = 1 ENTERPRISE = 3 @@ -248,6 +250,7 @@ class ReleaseChannel(proto.Enum): considered stable and have been validated for production use. """ + RELEASE_CHANNEL_UNSPECIFIED = 0 CANARY = 1 STABLE = 2 @@ -264,6 +267,7 @@ class DatabaseType(proto.Enum): Spanner is used to persist the metastore data. """ + DATABASE_TYPE_UNSPECIFIED = 0 MYSQL = 1 SPANNER = 2 @@ -527,6 +531,7 @@ class EndpointProtocol(proto.Enum): Use the modernized gRPC protocol for the metastore service endpoint. """ + ENDPOINT_PROTOCOL_UNSPECIFIED = 0 THRIFT = 1 GRPC = 2 @@ -759,6 +764,7 @@ class LogFormat(proto.Enum): JSON (2): Logging output uses the ``jsonPayload`` format. """ + LOG_FORMAT_UNSPECIFIED = 0 LEGACY = 1 JSON = 2 @@ -842,6 +848,7 @@ class State(proto.Enum): The metadata import failed, and attempted metadata changes were rolled back. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -875,6 +882,7 @@ class DatabaseType(proto.Enum): MYSQL (1): The type of the source database is MySQL. """ + DATABASE_TYPE_UNSPECIFIED = 0 MYSQL = 1 @@ -972,6 +980,7 @@ class State(proto.Enum): CANCELLED (4): The metadata export is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -1049,6 +1058,7 @@ class State(proto.Enum): RESTORING (5): The backup is being restored. """ + STATE_UNSPECIFIED = 0 CREATING = 1 DELETING = 2 @@ -1130,6 +1140,7 @@ class State(proto.Enum): CANCELLED (4): The metadata restore is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -1148,6 +1159,7 @@ class RestoreType(proto.Enum): METADATA_ONLY (2): Only the service's metadata is restored. """ + RESTORE_TYPE_UNSPECIFIED = 0 FULL = 1 METADATA_ONLY = 2 @@ -1229,6 +1241,7 @@ class InstanceSize(proto.Enum): Extra large instance size, maps to a scaling factor of 6.0. """ + INSTANCE_SIZE_UNSPECIFIED = 0 EXTRA_SMALL = 1 SMALL = 2 @@ -2152,12 +2165,12 @@ class HiveMetastoreVersion(proto.Message): number=2, ) - supported_hive_metastore_versions: MutableSequence[ - HiveMetastoreVersion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=HiveMetastoreVersion, + supported_hive_metastore_versions: MutableSequence[HiveMetastoreVersion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=HiveMetastoreVersion, + ) ) @@ -2178,6 +2191,7 @@ class Type(proto.Enum): AVRO (2): Database dump contains Avro files. """ + TYPE_UNSPECIFIED = 0 MYSQL = 1 AVRO = 2 diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore_federation.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore_federation.py index 0db11a8a9e64..e096b9024469 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore_federation.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore_federation.py @@ -106,6 +106,7 @@ class State(proto.Enum): error and cannot be used. The metastore federation should be deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -194,6 +195,7 @@ class MetastoreType(proto.Enum): DATAPROC_METASTORE (3): The backend metastore is Dataproc Metastore. """ + METASTORE_TYPE_UNSPECIFIED = 0 DATAPLEX = 1 BIGQUERY = 2 diff --git a/packages/google-cloud-dataproc-metastore/mypy.ini b/packages/google-cloud-dataproc-metastore/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-dataproc-metastore/mypy.ini +++ b/packages/google-cloud-dataproc-metastore/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-dataproc-metastore/noxfile.py b/packages/google-cloud-dataproc-metastore/noxfile.py index b8562b8fc864..0ac15db46ec9 100644 --- a/packages/google-cloud-dataproc-metastore/noxfile.py +++ b/packages/google-cloud-dataproc-metastore/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore.py b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore.py index f32f55d9d195..5f5888fb3b1c 100644 --- a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore.py +++ b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,24 +61,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore -import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore from google.cloud.metastore_v1.services.dataproc_metastore import ( DataprocMetastoreAsyncClient, @@ -998,10 +1000,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1047,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1085,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1340,9 +1339,7 @@ def test_dataproc_metastore_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3407,9 +3404,9 @@ def test_list_metadata_imports_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_imports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_imports] = ( + mock_rpc + ) request = {} client.list_metadata_imports(request) @@ -3956,9 +3953,9 @@ def test_get_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_import] = ( + mock_rpc + ) request = {} client.get_metadata_import(request) @@ -4303,9 +4300,9 @@ def test_create_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_import] = ( + mock_rpc + ) request = {} client.create_metadata_import(request) @@ -4693,9 +4690,9 @@ def test_update_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_metadata_import] = ( + mock_rpc + ) request = {} client.update_metadata_import(request) @@ -7452,9 +7449,9 @@ def test_move_table_to_database_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_table_to_database - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_table_to_database] = ( + mock_rpc + ) request = {} client.move_table_to_database(request) @@ -8948,9 +8945,9 @@ def test_list_metadata_imports_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_imports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_imports] = ( + mock_rpc + ) request = {} client.list_metadata_imports(request) @@ -9216,9 +9213,9 @@ def test_get_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_import] = ( + mock_rpc + ) request = {} client.get_metadata_import(request) @@ -9401,9 +9398,9 @@ def test_create_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_import] = ( + mock_rpc + ) request = {} client.create_metadata_import(request) @@ -9632,9 +9629,9 @@ def test_update_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_metadata_import] = ( + mock_rpc + ) request = {} client.update_metadata_import(request) @@ -11127,9 +11124,9 @@ def test_move_table_to_database_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_table_to_database - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_table_to_database] = ( + mock_rpc + ) request = {} client.move_table_to_database(request) diff --git a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore_federation.py b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore_federation.py index 5a1bbdc43384..95a47674c454 100644 --- a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore_federation.py +++ b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore_federation.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,22 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.metastore_v1.services.dataproc_metastore_federation import ( DataprocMetastoreFederationAsyncClient, @@ -1050,10 +1052,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1099,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1137,10 +1137,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1403,9 +1402,7 @@ def test_dataproc_metastore_federation_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1520,9 +1517,9 @@ def test_list_federations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_federations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_federations] = ( + mock_rpc + ) request = {} client.list_federations(request) @@ -2391,9 +2388,9 @@ def test_create_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_federation] = ( + mock_rpc + ) request = {} client.create_federation(request) @@ -2755,9 +2752,9 @@ def test_update_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_federation] = ( + mock_rpc + ) request = {} client.update_federation(request) @@ -3111,9 +3108,9 @@ def test_delete_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_federation] = ( + mock_rpc + ) request = {} client.delete_federation(request) @@ -3390,9 +3387,9 @@ def test_list_federations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_federations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_federations] = ( + mock_rpc + ) request = {} client.list_federations(request) @@ -3832,9 +3829,9 @@ def test_create_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_federation] = ( + mock_rpc + ) request = {} client.create_federation(request) @@ -4050,9 +4047,9 @@ def test_update_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_federation] = ( + mock_rpc + ) request = {} client.update_federation(request) @@ -4251,9 +4248,9 @@ def test_delete_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_federation] = ( + mock_rpc + ) request = {} client.delete_federation(request) diff --git a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore.py b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore.py index a37007bf213b..bea03a50eed7 100644 --- a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore.py +++ b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,24 +61,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore -import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore from google.cloud.metastore_v1alpha.services.dataproc_metastore import ( DataprocMetastoreAsyncClient, @@ -998,10 +1000,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1047,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1085,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1340,9 +1339,7 @@ def test_dataproc_metastore_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3407,9 +3404,9 @@ def test_list_metadata_imports_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_imports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_imports] = ( + mock_rpc + ) request = {} client.list_metadata_imports(request) @@ -3956,9 +3953,9 @@ def test_get_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_import] = ( + mock_rpc + ) request = {} client.get_metadata_import(request) @@ -4303,9 +4300,9 @@ def test_create_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_import] = ( + mock_rpc + ) request = {} client.create_metadata_import(request) @@ -4693,9 +4690,9 @@ def test_update_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_metadata_import] = ( + mock_rpc + ) request = {} client.update_metadata_import(request) @@ -7199,9 +7196,9 @@ def test_remove_iam_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_iam_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_iam_policy] = ( + mock_rpc + ) request = {} client.remove_iam_policy(request) @@ -7705,9 +7702,9 @@ def test_move_table_to_database_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_table_to_database - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_table_to_database] = ( + mock_rpc + ) request = {} client.move_table_to_database(request) @@ -9205,9 +9202,9 @@ def test_list_metadata_imports_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_imports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_imports] = ( + mock_rpc + ) request = {} client.list_metadata_imports(request) @@ -9473,9 +9470,9 @@ def test_get_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_import] = ( + mock_rpc + ) request = {} client.get_metadata_import(request) @@ -9658,9 +9655,9 @@ def test_create_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_import] = ( + mock_rpc + ) request = {} client.create_metadata_import(request) @@ -9889,9 +9886,9 @@ def test_update_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_metadata_import] = ( + mock_rpc + ) request = {} client.update_metadata_import(request) @@ -11247,9 +11244,9 @@ def test_remove_iam_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_iam_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_iam_policy] = ( + mock_rpc + ) request = {} client.remove_iam_policy(request) @@ -11507,9 +11504,9 @@ def test_move_table_to_database_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_table_to_database - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_table_to_database] = ( + mock_rpc + ) request = {} client.move_table_to_database(request) diff --git a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore_federation.py b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore_federation.py index a3ccf8a9cbcd..d3042e3d22a5 100644 --- a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore_federation.py +++ b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore_federation.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,22 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.metastore_v1alpha.services.dataproc_metastore_federation import ( DataprocMetastoreFederationAsyncClient, @@ -1050,10 +1052,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1099,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1137,10 +1137,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1403,9 +1402,7 @@ def test_dataproc_metastore_federation_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1520,9 +1517,9 @@ def test_list_federations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_federations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_federations] = ( + mock_rpc + ) request = {} client.list_federations(request) @@ -2391,9 +2388,9 @@ def test_create_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_federation] = ( + mock_rpc + ) request = {} client.create_federation(request) @@ -2755,9 +2752,9 @@ def test_update_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_federation] = ( + mock_rpc + ) request = {} client.update_federation(request) @@ -3111,9 +3108,9 @@ def test_delete_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_federation] = ( + mock_rpc + ) request = {} client.delete_federation(request) @@ -3390,9 +3387,9 @@ def test_list_federations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_federations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_federations] = ( + mock_rpc + ) request = {} client.list_federations(request) @@ -3832,9 +3829,9 @@ def test_create_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_federation] = ( + mock_rpc + ) request = {} client.create_federation(request) @@ -4050,9 +4047,9 @@ def test_update_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_federation] = ( + mock_rpc + ) request = {} client.update_federation(request) @@ -4251,9 +4248,9 @@ def test_delete_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_federation] = ( + mock_rpc + ) request = {} client.delete_federation(request) diff --git a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore.py b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore.py index c87890680fd4..6084f6095fd8 100644 --- a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore.py +++ b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,24 +61,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore -import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore from google.cloud.metastore_v1beta.services.dataproc_metastore import ( DataprocMetastoreAsyncClient, @@ -998,10 +1000,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1047,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1085,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1340,9 +1339,7 @@ def test_dataproc_metastore_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3407,9 +3404,9 @@ def test_list_metadata_imports_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_imports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_imports] = ( + mock_rpc + ) request = {} client.list_metadata_imports(request) @@ -3956,9 +3953,9 @@ def test_get_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_import] = ( + mock_rpc + ) request = {} client.get_metadata_import(request) @@ -4303,9 +4300,9 @@ def test_create_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_import] = ( + mock_rpc + ) request = {} client.create_metadata_import(request) @@ -4693,9 +4690,9 @@ def test_update_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_metadata_import] = ( + mock_rpc + ) request = {} client.update_metadata_import(request) @@ -7199,9 +7196,9 @@ def test_remove_iam_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_iam_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_iam_policy] = ( + mock_rpc + ) request = {} client.remove_iam_policy(request) @@ -7705,9 +7702,9 @@ def test_move_table_to_database_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_table_to_database - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_table_to_database] = ( + mock_rpc + ) request = {} client.move_table_to_database(request) @@ -9205,9 +9202,9 @@ def test_list_metadata_imports_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_imports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_imports] = ( + mock_rpc + ) request = {} client.list_metadata_imports(request) @@ -9473,9 +9470,9 @@ def test_get_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_import] = ( + mock_rpc + ) request = {} client.get_metadata_import(request) @@ -9658,9 +9655,9 @@ def test_create_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_import] = ( + mock_rpc + ) request = {} client.create_metadata_import(request) @@ -9889,9 +9886,9 @@ def test_update_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_metadata_import] = ( + mock_rpc + ) request = {} client.update_metadata_import(request) @@ -11247,9 +11244,9 @@ def test_remove_iam_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_iam_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_iam_policy] = ( + mock_rpc + ) request = {} client.remove_iam_policy(request) @@ -11507,9 +11504,9 @@ def test_move_table_to_database_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_table_to_database - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_table_to_database] = ( + mock_rpc + ) request = {} client.move_table_to_database(request) diff --git a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore_federation.py b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore_federation.py index 1928ab97f888..f3231f05d097 100644 --- a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore_federation.py +++ b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore_federation.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,22 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.metastore_v1beta.services.dataproc_metastore_federation import ( DataprocMetastoreFederationAsyncClient, @@ -1050,10 +1052,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1099,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1137,10 +1137,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1403,9 +1402,7 @@ def test_dataproc_metastore_federation_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1520,9 +1517,9 @@ def test_list_federations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_federations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_federations] = ( + mock_rpc + ) request = {} client.list_federations(request) @@ -2391,9 +2388,9 @@ def test_create_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_federation] = ( + mock_rpc + ) request = {} client.create_federation(request) @@ -2755,9 +2752,9 @@ def test_update_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_federation] = ( + mock_rpc + ) request = {} client.update_federation(request) @@ -3111,9 +3108,9 @@ def test_delete_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_federation] = ( + mock_rpc + ) request = {} client.delete_federation(request) @@ -3390,9 +3387,9 @@ def test_list_federations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_federations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_federations] = ( + mock_rpc + ) request = {} client.list_federations(request) @@ -3832,9 +3829,9 @@ def test_create_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_federation] = ( + mock_rpc + ) request = {} client.create_federation(request) @@ -4050,9 +4047,9 @@ def test_update_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_federation] = ( + mock_rpc + ) request = {} client.update_federation(request) @@ -4251,9 +4248,9 @@ def test_delete_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_federation] = ( + mock_rpc + ) request = {} client.delete_federation(request) diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/__init__.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/__init__.py index 626c0eb84df9..bfad2f05d701 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/__init__.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.autoscaling_policy_service import ( AutoscalingPolicyServiceAsyncClient, AutoscalingPolicyServiceClient, diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py index 533e04e4127c..b38c74c73790 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -44,8 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.autoscaling_policy_service import pagers @@ -129,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AutoscalingPolicyServiceAsyncClient: The constructed client. """ - return AutoscalingPolicyServiceClient.from_service_account_info.__func__(AutoscalingPolicyServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AutoscalingPolicyServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AutoscalingPolicyServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +150,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AutoscalingPolicyServiceAsyncClient: The constructed client. """ - return AutoscalingPolicyServiceClient.from_service_account_file.__func__(AutoscalingPolicyServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AutoscalingPolicyServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + AutoscalingPolicyServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -183,7 +193,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AutoscalingPolicyServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AutoscalingPolicyServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AutoscalingPolicyServiceTransport: diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py index f497e6463d55..97c91cd6c697 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -61,8 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.autoscaling_policy_service import pagers @@ -82,9 +84,7 @@ class AutoscalingPolicyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AutoscalingPolicyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AutoscalingPolicyServiceTransport]] _transport_registry["grpc"] = AutoscalingPolicyServiceGrpcTransport _transport_registry["grpc_asyncio"] = AutoscalingPolicyServiceGrpcAsyncIOTransport _transport_registry["rest"] = AutoscalingPolicyServiceRestTransport @@ -632,11 +632,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutoscalingPolicyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutoscalingPolicyServiceClient._read_environment_variables() + ) self._client_cert_source = ( AutoscalingPolicyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -673,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutoscalingPolicyServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/pagers.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/pagers.py index 7f9ba54df6c4..8728f50a059d 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/pagers.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/__init__.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/__init__.py index b2f97f6a7529..b611e7b112e6 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/__init__.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AutoscalingPolicyServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AutoscalingPolicyServiceTransport]] _transport_registry["grpc"] = AutoscalingPolicyServiceGrpcTransport _transport_registry["grpc_asyncio"] = AutoscalingPolicyServiceGrpcAsyncIOTransport _transport_registry["rest"] = AutoscalingPolicyServiceRestTransport diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py index a0695c3f94bb..209a98a0c209 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import autoscaling_policies @@ -322,13 +324,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py index db36ac5b95c3..f64ce3ed126f 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataproc_v1.types import autoscaling_policies diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py index dca2b849d3b0..81c0a9a31789 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import autoscaling_policies diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py index 4ebc09fa1d7d..c8a42fe6e30c 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dataproc_v1.types import autoscaling_policies @@ -654,9 +656,7 @@ def __call__( """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseCreateAutoscalingPolicy._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseCreateAutoscalingPolicy._get_http_options() request, metadata = self._interceptor.pre_create_autoscaling_policy( request, metadata @@ -807,9 +807,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseDeleteAutoscalingPolicy._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseDeleteAutoscalingPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_autoscaling_policy( request, metadata @@ -923,9 +921,7 @@ def __call__( """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseGetAutoscalingPolicy._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseGetAutoscalingPolicy._get_http_options() request, metadata = self._interceptor.pre_get_autoscaling_policy( request, metadata @@ -1075,9 +1071,7 @@ def __call__( """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseListAutoscalingPolicies._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseListAutoscalingPolicies._get_http_options() request, metadata = self._interceptor.pre_list_autoscaling_policies( request, metadata @@ -1230,9 +1224,7 @@ def __call__( """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseUpdateAutoscalingPolicy._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseUpdateAutoscalingPolicy._get_http_options() request, metadata = self._interceptor.pre_update_autoscaling_policy( request, metadata @@ -1338,7 +1330,9 @@ def create_autoscaling_policy( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateAutoscalingPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._CreateAutoscalingPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_autoscaling_policy( @@ -1348,7 +1342,9 @@ def delete_autoscaling_policy( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteAutoscalingPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteAutoscalingPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_autoscaling_policy( @@ -1370,7 +1366,9 @@ def list_autoscaling_policies( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListAutoscalingPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._ListAutoscalingPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_autoscaling_policy( @@ -1381,7 +1379,9 @@ def update_autoscaling_policy( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateAutoscalingPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAutoscalingPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_iam_policy(self): @@ -1442,9 +1442,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseAutoscalingPolicyServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1591,9 +1589,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseAutoscalingPolicyServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1740,9 +1736,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1887,9 +1881,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2004,9 +1996,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2124,9 +2114,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAutoscalingPolicyServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2267,9 +2255,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAutoscalingPolicyServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest_base.py index 284b600cd6d0..981f53f76f7f 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataproc_v1.types import autoscaling_policies diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/async_client.py index de50c89cab7e..8f5656126b44 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -46,10 +46,12 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.batch_controller import pagers from google.cloud.dataproc_v1.types import batches, operations, shared @@ -124,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BatchControllerAsyncClient: The constructed client. """ - return BatchControllerClient.from_service_account_info.__func__(BatchControllerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BatchControllerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(BatchControllerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +145,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BatchControllerAsyncClient: The constructed client. """ - return BatchControllerClient.from_service_account_file.__func__(BatchControllerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BatchControllerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(BatchControllerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/client.py index 06f604a69f3e..293f8dc2b2e1 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -63,10 +63,12 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.batch_controller import pagers from google.cloud.dataproc_v1.types import batches, operations, shared @@ -85,9 +87,7 @@ class BatchControllerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BatchControllerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BatchControllerTransport]] _transport_registry["grpc"] = BatchControllerGrpcTransport _transport_registry["grpc_asyncio"] = BatchControllerGrpcAsyncIOTransport _transport_registry["rest"] = BatchControllerRestTransport @@ -653,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BatchControllerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BatchControllerClient._read_environment_variables() + ) self._client_cert_source = BatchControllerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -692,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BatchControllerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/pagers.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/pagers.py index 14dfc4621cb9..097cf3b5222f 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/pagers.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/base.py index 004fa8a808be..bab0fe070ea6 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import batches @@ -269,13 +271,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc.py index 5a2caf2cbac9..d46b0378ff4a 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataproc_v1.types import batches diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc_asyncio.py index 3addbbf5ea9f..4d4756ce21b7 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import batches diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py index fe10648c1d98..3eb2db76c28f 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dataproc_v1.types import batches @@ -1514,9 +1516,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseBatchControllerRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseBatchControllerRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1658,9 +1658,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBatchControllerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseBatchControllerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1772,9 +1770,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBatchControllerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseBatchControllerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2029,9 +2025,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseBatchControllerRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseBatchControllerRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseBatchControllerRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest_base.py index 13d83511cfa5..a845640d1fc6 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataproc_v1.types import batches diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/async_client.py index 44817c469f56..bc9deb78586a 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -46,11 +46,13 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.cluster_controller import pagers from google.cloud.dataproc_v1.types import clusters, operations @@ -129,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ClusterControllerAsyncClient: The constructed client. """ - return ClusterControllerClient.from_service_account_info.__func__(ClusterControllerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ClusterControllerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ClusterControllerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +150,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ClusterControllerAsyncClient: The constructed client. """ - return ClusterControllerClient.from_service_account_file.__func__(ClusterControllerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ClusterControllerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ClusterControllerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/client.py index 00f9a99b430a..f00990a7ea7a 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -63,11 +63,13 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.cluster_controller import pagers from google.cloud.dataproc_v1.types import clusters, operations @@ -86,9 +88,7 @@ class ClusterControllerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ClusterControllerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ClusterControllerTransport]] _transport_registry["grpc"] = ClusterControllerGrpcTransport _transport_registry["grpc_asyncio"] = ClusterControllerGrpcAsyncIOTransport _transport_registry["rest"] = ClusterControllerRestTransport @@ -704,11 +704,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ClusterControllerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ClusterControllerClient._read_environment_variables() + ) self._client_cert_source = ClusterControllerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -743,8 +741,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ClusterControllerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/pagers.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/pagers.py index 152062a30190..d151cd21d5bc 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/pagers.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/base.py index 752a947678a6..ec03bad70895 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/base.py @@ -17,16 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import clusters @@ -384,13 +386,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc.py index d03e0036d3ae..64a30601a5f3 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc.py @@ -16,20 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import clusters diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc_asyncio.py index 027d194776f6..9e4733d575be 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc_asyncio.py @@ -17,22 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import clusters diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py index 6cbab820f3a7..0c6834a10c58 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py @@ -16,18 +16,20 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -898,9 +900,7 @@ def __call__( """ - http_options = ( - _BaseClusterControllerRestTransport._BaseCreateCluster._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseCreateCluster._get_http_options() request, metadata = self._interceptor.pre_create_cluster(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseCreateCluster._get_transcoded_request( @@ -1049,9 +1049,7 @@ def __call__( """ - http_options = ( - _BaseClusterControllerRestTransport._BaseDeleteCluster._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseDeleteCluster._get_http_options() request, metadata = self._interceptor.pre_delete_cluster(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseDeleteCluster._get_transcoded_request( @@ -1197,9 +1195,7 @@ def __call__( """ - http_options = ( - _BaseClusterControllerRestTransport._BaseDiagnoseCluster._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseDiagnoseCluster._get_http_options() request, metadata = self._interceptor.pre_diagnose_cluster( request, metadata @@ -1498,9 +1494,7 @@ def __call__( """ - http_options = ( - _BaseClusterControllerRestTransport._BaseListClusters._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseListClusters._get_http_options() request, metadata = self._interceptor.pre_list_clusters(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseListClusters._get_transcoded_request( @@ -1646,9 +1640,7 @@ def __call__( """ - http_options = ( - _BaseClusterControllerRestTransport._BaseStartCluster._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseStartCluster._get_http_options() request, metadata = self._interceptor.pre_start_cluster(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseStartCluster._get_transcoded_request( @@ -1949,9 +1941,7 @@ def __call__( """ - http_options = ( - _BaseClusterControllerRestTransport._BaseUpdateCluster._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseUpdateCluster._get_http_options() request, metadata = self._interceptor.pre_update_cluster(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseUpdateCluster._get_transcoded_request( @@ -2162,9 +2152,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseClusterControllerRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2308,9 +2296,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseClusterControllerRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2455,9 +2441,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseClusterControllerRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2600,9 +2584,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClusterControllerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2715,9 +2697,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClusterControllerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2832,9 +2812,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseClusterControllerRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseGetOperation._get_transcoded_request( @@ -2973,9 +2951,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseClusterControllerRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest_base.py index 884dc3cadb31..12662ca91e3d 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest_base.py @@ -18,8 +18,10 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/async_client.py index e39a9a6c029d..286811bce3e5 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -46,8 +46,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.job_controller import pagers @@ -117,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: JobControllerAsyncClient: The constructed client. """ - return JobControllerClient.from_service_account_info.__func__(JobControllerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + JobControllerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(JobControllerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -133,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: JobControllerAsyncClient: The constructed client. """ - return JobControllerClient.from_service_account_file.__func__(JobControllerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + JobControllerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(JobControllerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/client.py index bfebbf5360de..fd43ec386976 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -63,8 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.job_controller import pagers @@ -602,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = JobControllerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + JobControllerClient._read_environment_variables() + ) self._client_cert_source = JobControllerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(JobControllerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/pagers.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/pagers.py index 75ddd0cf7dcf..07d534c54631 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/pagers.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/base.py index 3c40537440d3..3ddcfb4850c2 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import jobs @@ -369,13 +371,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc.py index 09b1ce613dec..bfac2b7c7f0d 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataproc_v1.types import jobs diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc_asyncio.py index 2ff596b46801..d2fe5a986122 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import jobs diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest.py index 4aacf2159ea2..28837ad04cd3 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dataproc_v1.types import jobs @@ -1504,9 +1506,7 @@ def __call__( """ - http_options = ( - _BaseJobControllerRestTransport._BaseSubmitJobAsOperation._get_http_options() - ) + http_options = _BaseJobControllerRestTransport._BaseSubmitJobAsOperation._get_http_options() request, metadata = self._interceptor.pre_submit_job_as_operation( request, metadata @@ -2149,9 +2149,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseJobControllerRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseJobControllerRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest_base.py index ae7e3a8cd766..a6eac65dc33a 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataproc_v1.types import jobs diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/async_client.py index 376d60e51718..a635e2174397 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -46,8 +46,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.types import clusters, node_groups, operations @@ -122,7 +124,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: NodeGroupControllerAsyncClient: The constructed client. """ - return NodeGroupControllerClient.from_service_account_info.__func__(NodeGroupControllerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + NodeGroupControllerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(NodeGroupControllerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -138,7 +143,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: NodeGroupControllerAsyncClient: The constructed client. """ - return NodeGroupControllerClient.from_service_account_file.__func__(NodeGroupControllerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + NodeGroupControllerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(NodeGroupControllerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -176,7 +184,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return NodeGroupControllerClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return NodeGroupControllerClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> NodeGroupControllerTransport: diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/client.py index 3b255aaf1771..cd7d690d53bd 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -63,8 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.types import clusters, node_groups, operations @@ -83,9 +85,7 @@ class NodeGroupControllerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NodeGroupControllerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NodeGroupControllerTransport]] _transport_registry["grpc"] = NodeGroupControllerGrpcTransport _transport_registry["grpc_asyncio"] = NodeGroupControllerGrpcAsyncIOTransport _transport_registry["rest"] = NodeGroupControllerRestTransport @@ -633,11 +633,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NodeGroupControllerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NodeGroupControllerClient._read_environment_variables() + ) self._client_cert_source = NodeGroupControllerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -672,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NodeGroupControllerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/__init__.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/__init__.py index 668c835913b7..d9ce5ab0a93f 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/__init__.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import NodeGroupControllerRestInterceptor, NodeGroupControllerRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NodeGroupControllerTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NodeGroupControllerTransport]] _transport_registry["grpc"] = NodeGroupControllerGrpcTransport _transport_registry["grpc_asyncio"] = NodeGroupControllerGrpcAsyncIOTransport _transport_registry["rest"] = NodeGroupControllerRestTransport diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/base.py index 0a6f165b4cd6..ba560f36221d 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/base.py @@ -17,16 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import clusters, node_groups @@ -256,13 +258,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc.py index 2693e8f932fc..5b735ef655df 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc.py @@ -16,20 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import clusters, node_groups diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc_asyncio.py index 7d22402bef53..4da891bcba64 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc_asyncio.py @@ -17,22 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import clusters, node_groups diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py index 6cd8d341048a..d24c7fdfe199 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py @@ -16,18 +16,20 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -632,9 +634,7 @@ def __call__( """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseCreateNodeGroup._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseCreateNodeGroup._get_http_options() request, metadata = self._interceptor.pre_create_node_group( request, metadata @@ -786,9 +786,7 @@ def __call__( """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseGetNodeGroup._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseGetNodeGroup._get_http_options() request, metadata = self._interceptor.pre_get_node_group(request, metadata) transcoded_request = _BaseNodeGroupControllerRestTransport._BaseGetNodeGroup._get_transcoded_request( @@ -935,9 +933,7 @@ def __call__( """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseResizeNodeGroup._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseResizeNodeGroup._get_http_options() request, metadata = self._interceptor.pre_resize_node_group( request, metadata @@ -1113,9 +1109,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseNodeGroupControllerRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1260,9 +1254,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseNodeGroupControllerRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1407,9 +1399,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1554,9 +1544,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1669,9 +1657,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1787,9 +1773,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseNodeGroupControllerRestTransport._BaseGetOperation._get_transcoded_request( @@ -1928,9 +1912,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseNodeGroupControllerRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest_base.py index 6fbde39b63d6..9526a896c88e 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest_base.py @@ -18,8 +18,10 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/async_client.py index f9c9535b27df..7cb4f2961c61 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -46,10 +46,12 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.session_controller import pagers from google.cloud.dataproc_v1.types import operations, sessions, shared @@ -128,7 +130,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionControllerAsyncClient: The constructed client. """ - return SessionControllerClient.from_service_account_info.__func__(SessionControllerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SessionControllerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SessionControllerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +149,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionControllerAsyncClient: The constructed client. """ - return SessionControllerClient.from_service_account_file.__func__(SessionControllerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SessionControllerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SessionControllerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/client.py index 32ff20c586cf..114ba09c73f6 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -63,10 +63,12 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.session_controller import pagers from google.cloud.dataproc_v1.types import operations, sessions, shared @@ -85,9 +87,7 @@ class SessionControllerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionControllerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionControllerTransport]] _transport_registry["grpc"] = SessionControllerGrpcTransport _transport_registry["grpc_asyncio"] = SessionControllerGrpcAsyncIOTransport _transport_registry["rest"] = SessionControllerRestTransport @@ -677,11 +677,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionControllerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionControllerClient._read_environment_variables() + ) self._client_cert_source = SessionControllerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -716,8 +714,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionControllerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/pagers.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/pagers.py index 6ba10ab1fcde..3678d853b56e 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/pagers.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/base.py index 73f626bd99ce..8464b2b0016c 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/base.py @@ -17,16 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import sessions @@ -284,13 +286,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc.py index b3e91243b9b1..19fa7481ad09 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc.py @@ -16,20 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import sessions diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc_asyncio.py index 4231296d80be..d91b1ad87df9 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc_asyncio.py @@ -17,22 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import sessions diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest.py index dfd1db91550e..01acd2e02443 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest.py @@ -16,18 +16,20 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -736,9 +738,7 @@ def __call__( """ - http_options = ( - _BaseSessionControllerRestTransport._BaseCreateSession._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseCreateSession._get_http_options() request, metadata = self._interceptor.pre_create_session(request, metadata) transcoded_request = _BaseSessionControllerRestTransport._BaseCreateSession._get_transcoded_request( @@ -887,9 +887,7 @@ def __call__( """ - http_options = ( - _BaseSessionControllerRestTransport._BaseDeleteSession._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseDeleteSession._get_http_options() request, metadata = self._interceptor.pre_delete_session(request, metadata) transcoded_request = _BaseSessionControllerRestTransport._BaseDeleteSession._get_transcoded_request( @@ -1175,9 +1173,7 @@ def __call__( A list of interactive sessions. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseListSessions._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseListSessions._get_http_options() request, metadata = self._interceptor.pre_list_sessions(request, metadata) transcoded_request = _BaseSessionControllerRestTransport._BaseListSessions._get_transcoded_request( @@ -1325,9 +1321,7 @@ def __call__( """ - http_options = ( - _BaseSessionControllerRestTransport._BaseTerminateSession._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseTerminateSession._get_http_options() request, metadata = self._interceptor.pre_terminate_session( request, metadata @@ -1516,9 +1510,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseSessionControllerRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1662,9 +1654,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseSessionControllerRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1809,9 +1799,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1954,9 +1942,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2069,9 +2055,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2186,9 +2170,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSessionControllerRestTransport._BaseGetOperation._get_transcoded_request( @@ -2327,9 +2309,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSessionControllerRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest_base.py index ac286f79fadd..8861de8e1069 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest_base.py @@ -18,8 +18,10 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/async_client.py index d76188a18e3f..ea53880778f3 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -44,10 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.session_template_controller import pagers from google.cloud.dataproc_v1.types import session_templates, sessions, shared @@ -136,7 +138,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionTemplateControllerAsyncClient: The constructed client. """ - return SessionTemplateControllerClient.from_service_account_info.__func__(SessionTemplateControllerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SessionTemplateControllerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SessionTemplateControllerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -152,7 +157,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionTemplateControllerAsyncClient: The constructed client. """ - return SessionTemplateControllerClient.from_service_account_file.__func__(SessionTemplateControllerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SessionTemplateControllerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + SessionTemplateControllerAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -190,7 +200,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SessionTemplateControllerClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SessionTemplateControllerClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SessionTemplateControllerTransport: diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/client.py index 19bebd9ae0d2..c65fad323248 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -61,10 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.session_template_controller import pagers from google.cloud.dataproc_v1.types import session_templates, sessions, shared @@ -83,9 +85,7 @@ class SessionTemplateControllerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionTemplateControllerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionTemplateControllerTransport]] _transport_registry["grpc"] = SessionTemplateControllerGrpcTransport _transport_registry["grpc_asyncio"] = SessionTemplateControllerGrpcAsyncIOTransport _transport_registry["rest"] = SessionTemplateControllerRestTransport @@ -655,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionTemplateControllerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionTemplateControllerClient._read_environment_variables() + ) self._client_cert_source = ( SessionTemplateControllerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -696,8 +694,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionTemplateControllerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/pagers.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/pagers.py index 44944e815511..cabf2cfa1c1e 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/pagers.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/__init__.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/__init__.py index 352cc93dcae0..de3cae849455 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/__init__.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SessionTemplateControllerTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SessionTemplateControllerTransport]] _transport_registry["grpc"] = SessionTemplateControllerGrpcTransport _transport_registry["grpc_asyncio"] = SessionTemplateControllerGrpcAsyncIOTransport _transport_registry["rest"] = SessionTemplateControllerRestTransport diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/base.py index 6908f29f8e24..be40468e8349 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import session_templates @@ -292,13 +294,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc.py index 2d862b0884b7..dd732bc9c908 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataproc_v1.types import session_templates diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc_asyncio.py index 5d35c1bacc0e..b363c48ab3c9 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import session_templates diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest.py index faafa077be78..0e6a9fc74019 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dataproc_v1.types import session_templates @@ -656,9 +658,7 @@ def __call__( """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseCreateSessionTemplate._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseCreateSessionTemplate._get_http_options() request, metadata = self._interceptor.pre_create_session_template( request, metadata @@ -807,9 +807,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseDeleteSessionTemplate._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseDeleteSessionTemplate._get_http_options() request, metadata = self._interceptor.pre_delete_session_template( request, metadata @@ -923,9 +921,7 @@ def __call__( """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseGetSessionTemplate._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseGetSessionTemplate._get_http_options() request, metadata = self._interceptor.pre_get_session_template( request, metadata @@ -1073,9 +1069,7 @@ def __call__( A list of session templates. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseListSessionTemplates._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseListSessionTemplates._get_http_options() request, metadata = self._interceptor.pre_list_session_templates( request, metadata @@ -1226,9 +1220,7 @@ def __call__( """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseUpdateSessionTemplate._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseUpdateSessionTemplate._get_http_options() request, metadata = self._interceptor.pre_update_session_template( request, metadata @@ -1435,9 +1427,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseSessionTemplateControllerRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1584,9 +1574,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseSessionTemplateControllerRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1733,9 +1721,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1878,9 +1864,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1995,9 +1979,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2115,9 +2097,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSessionTemplateControllerRestTransport._BaseGetOperation._get_transcoded_request( @@ -2258,9 +2238,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSessionTemplateControllerRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest_base.py index 9dfabe80415c..6545a903041b 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataproc_v1.types import session_templates diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py index d89bbd67248e..130ae19b4c57 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -46,12 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.workflow_template_service import pagers from google.cloud.dataproc_v1.types import workflow_templates @@ -144,7 +146,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: WorkflowTemplateServiceAsyncClient: The constructed client. """ - return WorkflowTemplateServiceClient.from_service_account_info.__func__(WorkflowTemplateServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + WorkflowTemplateServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(WorkflowTemplateServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -160,7 +165,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: WorkflowTemplateServiceAsyncClient: The constructed client. """ - return WorkflowTemplateServiceClient.from_service_account_file.__func__(WorkflowTemplateServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + WorkflowTemplateServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + WorkflowTemplateServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -198,7 +208,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return WorkflowTemplateServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return WorkflowTemplateServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> WorkflowTemplateServiceTransport: diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/client.py index 2a9d0f903b9c..61d5f6062145 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -63,12 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.workflow_template_service import pagers from google.cloud.dataproc_v1.types import workflow_templates @@ -87,9 +89,7 @@ class WorkflowTemplateServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[WorkflowTemplateServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[WorkflowTemplateServiceTransport]] _transport_registry["grpc"] = WorkflowTemplateServiceGrpcTransport _transport_registry["grpc_asyncio"] = WorkflowTemplateServiceGrpcAsyncIOTransport _transport_registry["rest"] = WorkflowTemplateServiceRestTransport @@ -707,11 +707,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = WorkflowTemplateServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + WorkflowTemplateServiceClient._read_environment_variables() + ) self._client_cert_source = ( WorkflowTemplateServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -748,8 +746,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(WorkflowTemplateServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/pagers.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/pagers.py index 7873fa6df519..40bede01c13c 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/pagers.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/__init__.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/__init__.py index 270744e94849..0bf9bc46d52c 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/__init__.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[WorkflowTemplateServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[WorkflowTemplateServiceTransport]] _transport_registry["grpc"] = WorkflowTemplateServiceGrpcTransport _transport_registry["grpc_asyncio"] = WorkflowTemplateServiceGrpcAsyncIOTransport _transport_registry["rest"] = WorkflowTemplateServiceRestTransport diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/base.py index 257546a541d3..97ff1f77dc54 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import workflow_templates @@ -392,13 +394,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py index 79caba5eed50..ee7804ed1e23 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataproc_v1.types import workflow_templates @@ -446,12 +448,12 @@ def instantiate_workflow_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "instantiate_workflow_template" not in self._stubs: - self._stubs[ - "instantiate_workflow_template" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateWorkflowTemplate", - request_serializer=workflow_templates.InstantiateWorkflowTemplateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["instantiate_workflow_template"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateWorkflowTemplate", + request_serializer=workflow_templates.InstantiateWorkflowTemplateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["instantiate_workflow_template"] @@ -503,12 +505,12 @@ def instantiate_inline_workflow_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "instantiate_inline_workflow_template" not in self._stubs: - self._stubs[ - "instantiate_inline_workflow_template" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateInlineWorkflowTemplate", - request_serializer=workflow_templates.InstantiateInlineWorkflowTemplateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["instantiate_inline_workflow_template"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateInlineWorkflowTemplate", + request_serializer=workflow_templates.InstantiateInlineWorkflowTemplateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["instantiate_inline_workflow_template"] diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py index ef7815dea0ff..cc42e937965e 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import workflow_templates @@ -454,12 +456,12 @@ def instantiate_workflow_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "instantiate_workflow_template" not in self._stubs: - self._stubs[ - "instantiate_workflow_template" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateWorkflowTemplate", - request_serializer=workflow_templates.InstantiateWorkflowTemplateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["instantiate_workflow_template"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateWorkflowTemplate", + request_serializer=workflow_templates.InstantiateWorkflowTemplateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["instantiate_workflow_template"] @@ -511,12 +513,12 @@ def instantiate_inline_workflow_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "instantiate_inline_workflow_template" not in self._stubs: - self._stubs[ - "instantiate_inline_workflow_template" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateInlineWorkflowTemplate", - request_serializer=workflow_templates.InstantiateInlineWorkflowTemplateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["instantiate_inline_workflow_template"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateInlineWorkflowTemplate", + request_serializer=workflow_templates.InstantiateInlineWorkflowTemplateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["instantiate_inline_workflow_template"] diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py index a326f9560cf7..d784c5f5c4ff 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dataproc_v1.types import workflow_templates @@ -837,9 +839,7 @@ def __call__( """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseCreateWorkflowTemplate._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseCreateWorkflowTemplate._get_http_options() request, metadata = self._interceptor.pre_create_workflow_template( request, metadata @@ -990,9 +990,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseDeleteWorkflowTemplate._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseDeleteWorkflowTemplate._get_http_options() request, metadata = self._interceptor.pre_delete_workflow_template( request, metadata @@ -1106,9 +1104,7 @@ def __call__( """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseGetWorkflowTemplate._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseGetWorkflowTemplate._get_http_options() request, metadata = self._interceptor.pre_get_workflow_template( request, metadata @@ -1265,15 +1261,12 @@ def __call__( """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseInstantiateInlineWorkflowTemplate._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseInstantiateInlineWorkflowTemplate._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_instantiate_inline_workflow_template( - request, metadata + request, metadata = ( + self._interceptor.pre_instantiate_inline_workflow_template( + request, metadata + ) ) transcoded_request = _BaseWorkflowTemplateServiceRestTransport._BaseInstantiateInlineWorkflowTemplate._get_transcoded_request( http_options, request @@ -1337,11 +1330,10 @@ def __call__( resp = self._interceptor.post_instantiate_inline_workflow_template(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_instantiate_inline_workflow_template_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_instantiate_inline_workflow_template_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1429,9 +1421,7 @@ def __call__( """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseInstantiateWorkflowTemplate._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseInstantiateWorkflowTemplate._get_http_options() request, metadata = self._interceptor.pre_instantiate_workflow_template( request, metadata @@ -1498,11 +1488,10 @@ def __call__( resp = self._interceptor.post_instantiate_workflow_template(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_instantiate_workflow_template_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_instantiate_workflow_template_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1585,9 +1574,7 @@ def __call__( """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseListWorkflowTemplates._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseListWorkflowTemplates._get_http_options() request, metadata = self._interceptor.pre_list_workflow_templates( request, metadata @@ -1740,9 +1727,7 @@ def __call__( """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseUpdateWorkflowTemplate._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseUpdateWorkflowTemplate._get_http_options() request, metadata = self._interceptor.pre_update_workflow_template( request, metadata @@ -1848,7 +1833,9 @@ def create_workflow_template( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateWorkflowTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._CreateWorkflowTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_workflow_template( @@ -1856,7 +1843,9 @@ def delete_workflow_template( ) -> Callable[[workflow_templates.DeleteWorkflowTemplateRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteWorkflowTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteWorkflowTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_workflow_template( @@ -1878,7 +1867,9 @@ def instantiate_inline_workflow_template( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._InstantiateInlineWorkflowTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._InstantiateInlineWorkflowTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def instantiate_workflow_template( @@ -1889,7 +1880,9 @@ def instantiate_workflow_template( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._InstantiateWorkflowTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._InstantiateWorkflowTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_workflow_templates( @@ -1911,7 +1904,9 @@ def update_workflow_template( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateWorkflowTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateWorkflowTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_iam_policy(self): @@ -1972,9 +1967,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseWorkflowTemplateServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2119,9 +2112,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseWorkflowTemplateServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2266,9 +2257,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2413,9 +2402,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2530,9 +2517,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2650,9 +2635,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseWorkflowTemplateServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2791,9 +2774,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseWorkflowTemplateServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest_base.py index 831264bc4a49..afc98c194726 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dataproc_v1.types import workflow_templates diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/batches.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/batches.py index 7af51f2fa72d..01a1a227188c 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/batches.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/batches.py @@ -317,6 +317,7 @@ class State(proto.Enum): The batch is no longer running due to an error. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/clusters.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/clusters.py index 55e2f309e3c8..ad5211a073b2 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/clusters.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/clusters.py @@ -271,6 +271,7 @@ class ClusterTier(proto.Enum): CLUSTER_TIER_PREMIUM (2): Premium Dataproc cluster. """ + CLUSTER_TIER_UNSPECIFIED = 0 CLUSTER_TIER_STANDARD = 1 CLUSTER_TIER_PREMIUM = 2 @@ -313,12 +314,12 @@ class ClusterTier(proto.Enum): number=13, message="SoftwareConfig", ) - initialization_actions: MutableSequence[ - "NodeInitializationAction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=11, - message="NodeInitializationAction", + initialization_actions: MutableSequence["NodeInitializationAction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=11, + message="NodeInitializationAction", + ) ) encryption_config: "EncryptionConfig" = proto.Field( proto.MESSAGE, @@ -676,6 +677,7 @@ class PrivateIpv6GoogleAccess(proto.Enum): between Google Services and the Dataproc cluster. """ + PRIVATE_IPV6_GOOGLE_ACCESS_UNSPECIFIED = 0 INHERIT_FROM_SUBNETWORK = 1 OUTBOUND = 2 @@ -962,6 +964,7 @@ class Preemptibility(proto.Enum): (https://cloud.google.com/compute/docs/instances/preemptible), and provide additional features. """ + PREEMPTIBILITY_UNSPECIFIED = 0 NON_PREEMPTIBLE = 1 PREEMPTIBLE = 2 @@ -1256,12 +1259,12 @@ class InstanceSelectionResult(proto.Message): number=2, message=InstanceSelection, ) - instance_selection_results: MutableSequence[ - InstanceSelectionResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=InstanceSelectionResult, + instance_selection_results: MutableSequence[InstanceSelectionResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=InstanceSelectionResult, + ) ) @@ -1442,6 +1445,7 @@ class Role(proto.Enum): DRIVER (1): Job drivers run on the node pool. """ + ROLE_UNSPECIFIED = 0 DRIVER = 1 @@ -1557,6 +1561,7 @@ class State(proto.Enum): The cluster is being repaired. It is not ready for use. """ + UNKNOWN = 0 CREATING = 1 RUNNING = 2 @@ -1588,6 +1593,7 @@ class Substate(proto.Enum): Applies to RUNNING state. """ + UNSPECIFIED = 0 UNHEALTHY = 1 STALE_STATUS = 2 @@ -1987,6 +1993,7 @@ class MetricSource(proto.Enum): FLINK (8): flink metric source """ + METRIC_SOURCE_UNSPECIFIED = 0 MONITORING_AGENT_DEFAULTS = 1 HDFS = 2 @@ -2583,6 +2590,7 @@ class TarballAccess(proto.Enum): account has read access to the diagnostic tarball """ + TARBALL_ACCESS_UNSPECIFIED = 0 GOOGLE_CLOUD_SUPPORT = 1 GOOGLE_DATAPROC_DIAGNOSE = 2 @@ -2670,6 +2678,7 @@ class Type(proto.Enum): Must specify key value fields for specifying the reservations. """ + TYPE_UNSPECIFIED = 0 NO_RESERVATION = 1 ANY_RESERVATION = 2 diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/jobs.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/jobs.py index f4081a0b68dd..f9da9dceb4c9 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/jobs.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/jobs.py @@ -95,6 +95,7 @@ class Level(proto.Enum): OFF (8): Turn off log4j. """ + LEVEL_UNSPECIFIED = 0 ALL = 1 TRACE = 2 @@ -1021,6 +1022,7 @@ class State(proto.Enum): Applies to restartable jobs only. """ + STATE_UNSPECIFIED = 0 PENDING = 1 SETUP_DONE = 8 @@ -1058,6 +1060,7 @@ class Substate(proto.Enum): Applies to RUNNING state. """ + UNSPECIFIED = 0 SUBMITTED = 1 QUEUED = 2 @@ -1163,6 +1166,7 @@ class State(proto.Enum): KILLED (8): Status is KILLED. """ + STATE_UNSPECIFIED = 0 NEW = 1 NEW_SAVING = 2 @@ -1644,6 +1648,7 @@ class JobStateMatcher(proto.Enum): Only match jobs in terminal states: CANCELLED, DONE, or ERROR. """ + ALL = 0 ACTIVE = 1 NON_ACTIVE = 2 diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/operations.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/operations.py index 7bdf5d42eabb..01abf244c9d1 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/operations.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/operations.py @@ -64,6 +64,7 @@ class BatchOperationType(proto.Enum): BATCH (1): Batch operation type. """ + BATCH_OPERATION_TYPE_UNSPECIFIED = 0 BATCH = 1 @@ -141,6 +142,7 @@ class SessionOperationType(proto.Enum): DELETE (3): Delete Session operation type. """ + SESSION_OPERATION_TYPE_UNSPECIFIED = 0 CREATE = 1 TERMINATE = 2 @@ -215,6 +217,7 @@ class State(proto.Enum): The operation is done; either cancelled or completed. """ + UNKNOWN = 0 PENDING = 1 RUNNING = 2 @@ -348,6 +351,7 @@ class NodeGroupOperationType(proto.Enum): RESIZE (4): Resize node group operation type. """ + NODE_GROUP_OPERATION_TYPE_UNSPECIFIED = 0 CREATE = 1 UPDATE = 2 diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/sessions.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/sessions.py index 060fa027c6ce..ad746c5ff02a 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/sessions.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/sessions.py @@ -345,6 +345,7 @@ class State(proto.Enum): The session is no longer running due to an error. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -482,6 +483,7 @@ class Kernel(proto.Enum): SCALA (2): Scala kernel. """ + KERNEL_UNSPECIFIED = 0 PYTHON = 1 SCALA = 2 diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/shared.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/shared.py index 046a1f9f6b86..aa2aeabcdb4f 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/shared.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/shared.py @@ -96,6 +96,7 @@ class Component(proto.Enum): ZOOKEEPER (8): The Zookeeper service. """ + COMPONENT_UNSPECIFIED = 0 ANACONDA = 5 DELTA = 20 @@ -131,6 +132,7 @@ class FailureAction(proto.Enum): DELETE (2): Delete the failed cluster resource. """ + FAILURE_ACTION_UNSPECIFIED = 0 NO_ACTION = 1 DELETE = 2 @@ -706,6 +708,7 @@ class Role(proto.Enum): Run work associated with a Spark executor of a job. """ + ROLE_UNSPECIFIED = 0 DEFAULT = 1 CONTROLLER = 2 @@ -942,6 +945,7 @@ class AuthenticationType(proto.Enum): workload creator/user for authenticating to other services. """ + AUTHENTICATION_TYPE_UNSPECIFIED = 0 SERVICE_ACCOUNT = 1 END_USER_CREDENTIALS = 2 @@ -982,6 +986,7 @@ class Scenario(proto.Enum): AUTO (6): Automatic selection of scenarios. """ + SCENARIO_UNSPECIFIED = 0 SCALING = 2 BROADCAST_HASH_JOIN = 3 diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/workflow_templates.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/workflow_templates.py index a9dc0441ff4b..4c48b24fab8e 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/workflow_templates.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/workflow_templates.py @@ -737,6 +737,7 @@ class State(proto.Enum): The operation is done; either cancelled or completed. """ + UNKNOWN = 0 PENDING = 1 RUNNING = 2 @@ -887,6 +888,7 @@ class NodeState(proto.Enum): The node failed. A node can be marked FAILED because its ancestor or peer failed. """ + NODE_STATE_UNSPECIFIED = 0 BLOCKED = 1 RUNNABLE = 2 diff --git a/packages/google-cloud-dataproc/mypy.ini b/packages/google-cloud-dataproc/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-dataproc/mypy.ini +++ b/packages/google-cloud-dataproc/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-dataproc/noxfile.py b/packages/google-cloud-dataproc/noxfile.py index 8d05c88b0cb3..5ec459e06f9b 100644 --- a/packages/google-cloud-dataproc/noxfile.py +++ b/packages/google-cloud-dataproc/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py index c9991a656cd2..877b09fcb040 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,26 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore from google.cloud.dataproc_v1.services.autoscaling_policy_service import ( AutoscalingPolicyServiceAsyncClient, @@ -1008,10 +1015,9 @@ def test_autoscaling_policy_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1056,10 +1062,9 @@ def test_autoscaling_policy_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1095,10 +1100,9 @@ def test_autoscaling_policy_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1359,9 +1363,7 @@ def test_autoscaling_policy_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2177,9 +2179,9 @@ def test_get_autoscaling_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_autoscaling_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_autoscaling_policy] = ( + mock_rpc + ) request = {} client.get_autoscaling_policy(request) @@ -3715,9 +3717,9 @@ def test_get_autoscaling_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_autoscaling_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_autoscaling_policy] = ( + mock_rpc + ) request = {} client.get_autoscaling_policy(request) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_batch_controller.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_batch_controller.py index 67e849e7d89c..d93e022a92da 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_batch_controller.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_batch_controller.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +57,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.batch_controller import ( BatchControllerAsyncClient, @@ -984,10 +986,9 @@ def test_batch_controller_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1033,9 @@ def test_batch_controller_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1071,10 +1071,9 @@ def test_batch_controller_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1321,9 +1320,7 @@ def test_batch_controller_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_cluster_controller.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_cluster_controller.py index 5faed7e0b19b..d50ffcf826af 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_cluster_controller.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_cluster_controller.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.type.interval_pb2 as interval_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,23 +60,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.type.interval_pb2 as interval_pb2 # type: ignore from google.cloud.dataproc_v1.services.cluster_controller import ( ClusterControllerAsyncClient, @@ -996,10 +998,9 @@ def test_cluster_controller_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1045,9 @@ def test_cluster_controller_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1083,10 +1083,9 @@ def test_cluster_controller_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1338,9 +1337,7 @@ def test_cluster_controller_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3958,9 +3955,9 @@ def test_diagnose_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_cluster] = ( + mock_rpc + ) request = {} client.diagnose_cluster(request) @@ -5636,9 +5633,9 @@ def test_diagnose_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_cluster] = ( + mock_rpc + ) request = {} client.diagnose_cluster(request) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_job_controller.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_job_controller.py index b008ec8c35d3..728852786520 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_job_controller.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_job_controller.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +57,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.job_controller import ( JobControllerAsyncClient, @@ -956,10 +958,9 @@ def test_job_controller_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1005,9 @@ def test_job_controller_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1043,9 @@ def test_job_controller_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1293,9 +1292,7 @@ def test_job_controller_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_node_group_controller.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_node_group_controller.py index 08fed3727628..0ab7764abe9f 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_node_group_controller.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_node_group_controller.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +56,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore from google.cloud.dataproc_v1.services.node_group_controller import ( NodeGroupControllerAsyncClient, @@ -1005,10 +1007,9 @@ def test_node_group_controller_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1053,10 +1054,9 @@ def test_node_group_controller_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1092,10 +1092,9 @@ def test_node_group_controller_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1355,9 +1354,7 @@ def test_node_group_controller_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1469,9 +1466,9 @@ def test_create_node_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_node_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_node_group] = ( + mock_rpc + ) request = {} client.create_node_group(request) @@ -1834,9 +1831,9 @@ def test_resize_node_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resize_node_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resize_node_group] = ( + mock_rpc + ) request = {} client.resize_node_group(request) @@ -2445,9 +2442,9 @@ def test_create_node_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_node_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_node_group] = ( + mock_rpc + ) request = {} client.create_node_group(request) @@ -2649,9 +2646,9 @@ def test_resize_node_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resize_node_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resize_node_group] = ( + mock_rpc + ) request = {} client.resize_node_group(request) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_controller.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_controller.py index c37464d3e6b3..0d4835c9f827 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_controller.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_controller.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +57,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.session_controller import ( SessionControllerAsyncClient, @@ -993,10 +995,9 @@ def test_session_controller_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1042,9 @@ def test_session_controller_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1080,9 @@ def test_session_controller_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1335,9 +1334,7 @@ def test_session_controller_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2662,9 +2659,9 @@ def test_terminate_session_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.terminate_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.terminate_session] = ( + mock_rpc + ) request = {} client.terminate_session(request) @@ -3912,9 +3909,9 @@ def test_terminate_session_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.terminate_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.terminate_session] = ( + mock_rpc + ) request = {} client.terminate_session(request) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_template_controller.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_template_controller.py index 2f1e945be071..b542ecfe0569 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_template_controller.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_template_controller.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,20 +43,27 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.session_template_controller import ( SessionTemplateControllerAsyncClient, @@ -1014,10 +1021,9 @@ def test_session_template_controller_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1068,9 @@ def test_session_template_controller_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1101,10 +1106,9 @@ def test_session_template_controller_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1367,9 +1371,7 @@ def test_session_template_controller_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2204,9 +2206,9 @@ def test_get_session_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_session_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_session_template] = ( + mock_rpc + ) request = {} client.get_session_template(request) @@ -2557,9 +2559,9 @@ def test_list_session_templates_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_session_templates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_session_templates] = ( + mock_rpc + ) request = {} client.list_session_templates(request) @@ -3741,9 +3743,9 @@ def test_get_session_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_session_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_session_template] = ( + mock_rpc + ) request = {} client.get_session_template(request) @@ -3926,9 +3928,9 @@ def test_list_session_templates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_session_templates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_session_templates] = ( + mock_rpc + ) request = {} client.list_session_templates(request) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py index 30d07bb953fc..dd0f148a7c9c 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +58,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.workflow_template_service import ( WorkflowTemplateServiceAsyncClient, @@ -1014,10 +1016,9 @@ def test_workflow_template_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1063,9 @@ def test_workflow_template_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1101,10 +1101,9 @@ def test_workflow_template_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1364,9 +1363,7 @@ def test_workflow_template_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1845,9 +1842,9 @@ def test_get_workflow_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_workflow_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_workflow_template] = ( + mock_rpc + ) request = {} client.get_workflow_template(request) @@ -4267,9 +4264,9 @@ def test_get_workflow_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_workflow_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_workflow_template] = ( + mock_rpc + ) request = {} client.get_workflow_template(request) diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/__init__.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/__init__.py index 4ba52d2e0e58..84f536f3add3 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/__init__.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.datastream import DatastreamAsyncClient, DatastreamClient from .types.datastream import ( CreateConnectionProfileRequest, diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/async_client.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/async_client.py index d92ab315fdee..1e8280a91cc2 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/async_client.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datastream_v1 import gapic_version as package_version @@ -46,13 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.datastream_v1.services.datastream import pagers from google.cloud.datastream_v1.types import datastream, datastream_resources @@ -135,7 +137,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DatastreamAsyncClient: The constructed client. """ - return DatastreamClient.from_service_account_info.__func__(DatastreamAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DatastreamClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DatastreamAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -151,7 +156,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DatastreamAsyncClient: The constructed client. """ - return DatastreamClient.from_service_account_file.__func__(DatastreamAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DatastreamClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DatastreamAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/client.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/client.py index 1cbe426bbde3..638b7a7337a4 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/client.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datastream_v1 import gapic_version as package_version @@ -63,13 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.datastream_v1.services.datastream import pagers from google.cloud.datastream_v1.types import datastream, datastream_resources @@ -761,11 +763,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DatastreamClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DatastreamClient._read_environment_variables() + ) self._client_cert_source = DatastreamClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -800,8 +800,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DatastreamTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/pagers.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/pagers.py index 21546a7a3a9d..46b844c0b8f7 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/pagers.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/base.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/base.py index 9f64d55e81a2..13e4b1f6bb53 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/base.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datastream_v1 import gapic_version as package_version from google.cloud.datastream_v1.types import datastream, datastream_resources @@ -609,13 +611,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc.py index 349c2b65f9e1..490c5a211c09 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.datastream_v1.types import datastream, datastream_resources @@ -513,12 +515,12 @@ def discover_connection_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "discover_connection_profile" not in self._stubs: - self._stubs[ - "discover_connection_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.datastream.v1.Datastream/DiscoverConnectionProfile", - request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, - response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + self._stubs["discover_connection_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datastream.v1.Datastream/DiscoverConnectionProfile", + request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, + response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + ) ) return self._stubs["discover_connection_profile"] diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc_asyncio.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc_asyncio.py index d318228bd405..f0be7c19bb40 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc_asyncio.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datastream_v1.types import datastream, datastream_resources @@ -522,12 +524,12 @@ def discover_connection_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "discover_connection_profile" not in self._stubs: - self._stubs[ - "discover_connection_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.datastream.v1.Datastream/DiscoverConnectionProfile", - request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, - response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + self._stubs["discover_connection_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datastream.v1.Datastream/DiscoverConnectionProfile", + request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, + response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + ) ) return self._stubs["discover_connection_profile"] diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest.py index ce6ba200ae27..40fc992c999f 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1898,9 +1900,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseCreateConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseCreateConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_create_connection_profile( request, metadata @@ -2052,9 +2052,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseCreatePrivateConnection._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseCreatePrivateConnection._get_http_options() request, metadata = self._interceptor.pre_create_private_connection( request, metadata @@ -2518,9 +2516,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseDeleteConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseDeleteConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_delete_connection_profile( request, metadata @@ -2666,9 +2662,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseDeletePrivateConnection._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseDeletePrivateConnection._get_http_options() request, metadata = self._interceptor.pre_delete_private_connection( request, metadata @@ -3112,9 +3106,7 @@ def __call__( Response from a discover request. """ - http_options = ( - _BaseDatastreamRestTransport._BaseDiscoverConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseDiscoverConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_discover_connection_profile( request, metadata @@ -3422,9 +3414,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseGetConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseGetConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_get_connection_profile( request, metadata @@ -3575,9 +3565,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseGetPrivateConnection._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseGetPrivateConnection._get_http_options() request, metadata = self._interceptor.pre_get_private_connection( request, metadata @@ -4175,9 +4163,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseListConnectionProfiles._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseListConnectionProfiles._get_http_options() request, metadata = self._interceptor.pre_list_connection_profiles( request, metadata @@ -4326,9 +4312,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseListPrivateConnections._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseListPrivateConnections._get_http_options() request, metadata = self._interceptor.pre_list_private_connections( request, metadata @@ -5551,9 +5535,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseUpdateConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseUpdateConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_update_connection_profile( request, metadata @@ -5812,7 +5794,9 @@ def create_connection_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._CreateConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_private_connection( @@ -5822,7 +5806,9 @@ def create_private_connection( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreatePrivateConnection(self._session, self._host, self._interceptor) # type: ignore + return self._CreatePrivateConnection( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_route( @@ -5848,7 +5834,9 @@ def delete_connection_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_private_connection( @@ -5858,7 +5846,9 @@ def delete_private_connection( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeletePrivateConnection(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePrivateConnection( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_route( @@ -5885,7 +5875,9 @@ def discover_connection_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DiscoverConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DiscoverConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_static_ips( @@ -5952,7 +5944,9 @@ def list_connection_profiles( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListConnectionProfiles(self._session, self._host, self._interceptor) # type: ignore + return self._ListConnectionProfiles( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_private_connections( @@ -5963,7 +5957,9 @@ def list_private_connections( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListPrivateConnections(self._session, self._host, self._interceptor) # type: ignore + return self._ListPrivateConnections( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_routes( @@ -6037,7 +6033,9 @@ def update_connection_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_stream( diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest_base.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest_base.py index 106b14ec1008..eafba359b369 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest_base.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream.py index 625aff6f9639..a6e7a4b2f27d 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream.py @@ -392,12 +392,12 @@ class ListConnectionProfilesResponse(proto.Message): def raw_page(self): return self - connection_profiles: MutableSequence[ - datastream_resources.ConnectionProfile - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=datastream_resources.ConnectionProfile, + connection_profiles: MutableSequence[datastream_resources.ConnectionProfile] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=datastream_resources.ConnectionProfile, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1050,12 +1050,12 @@ class ListStreamObjectsResponse(proto.Message): def raw_page(self): return self - stream_objects: MutableSequence[ - datastream_resources.StreamObject - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=datastream_resources.StreamObject, + stream_objects: MutableSequence[datastream_resources.StreamObject] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=datastream_resources.StreamObject, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1273,12 +1273,12 @@ class ListPrivateConnectionsResponse(proto.Message): def raw_page(self): return self - private_connections: MutableSequence[ - datastream_resources.PrivateConnection - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=datastream_resources.PrivateConnection, + private_connections: MutableSequence[datastream_resources.PrivateConnection] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=datastream_resources.PrivateConnection, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream_resources.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream_resources.py index b859c7428204..5f9cdb861060 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream_resources.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream_resources.py @@ -830,6 +830,7 @@ class State(proto.Enum): Delete request has failed, resource is in invalid state. """ + STATE_UNSPECIFIED = 0 CREATING = 1 CREATED = 2 @@ -2550,6 +2551,7 @@ class SchemaFileFormat(proto.Enum): AVRO_SCHEMA_FILE (2): Avro schema format. """ + SCHEMA_FILE_FORMAT_UNSPECIFIED = 0 NO_SCHEMA_FILE = 1 AVRO_SCHEMA_FILE = 2 @@ -2565,6 +2567,7 @@ class JsonCompression(proto.Enum): GZIP (2): Gzip compression. """ + JSON_COMPRESSION_UNSPECIFIED = 0 NO_COMPRESSION = 1 GZIP = 2 @@ -2790,6 +2793,7 @@ class FileFormat(proto.Enum): PARQUET (1): Parquet file format. """ + FILE_FORMAT_UNSPECIFIED = 0 PARQUET = 1 @@ -2802,6 +2806,7 @@ class TableFormat(proto.Enum): ICEBERG (1): Iceberg table format. """ + TABLE_FORMAT_UNSPECIFIED = 0 ICEBERG = 1 @@ -3014,6 +3019,7 @@ class State(proto.Enum): The Stream is no longer reading new events, but still writing events in the buffer. """ + STATE_UNSPECIFIED = 0 NOT_STARTED = 1 RUNNING = 2 @@ -3473,6 +3479,7 @@ class State(proto.Enum): Backfill job failed since the table structure is currently unsupported for backfill. """ + STATE_UNSPECIFIED = 0 NOT_STARTED = 1 PENDING = 2 @@ -3496,6 +3503,7 @@ class Trigger(proto.Enum): Object backfill job was triggered manually using the dedicated API. """ + TRIGGER_UNSPECIFIED = 0 AUTOMATIC = 1 MANUAL = 2 @@ -3616,6 +3624,7 @@ class State(proto.Enum): WARNING (4): Validation executed with warnings. """ + STATE_UNSPECIFIED = 0 NOT_EXECUTED = 1 FAILED = 2 @@ -3668,6 +3677,7 @@ class Level(proto.Enum): ERROR (2): Definitely cause issues with the Stream. """ + LEVEL_UNSPECIFIED = 0 WARNING = 1 ERROR = 2 diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/__init__.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/__init__.py index d0a9de627a03..470d57560d1b 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/__init__.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.datastream import DatastreamAsyncClient, DatastreamClient from .types.datastream import ( CreateConnectionProfileRequest, diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/async_client.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/async_client.py index 7b5c0e2a8d00..6b012a074d3a 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/async_client.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datastream_v1alpha1 import gapic_version as package_version @@ -123,7 +123,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DatastreamAsyncClient: The constructed client. """ - return DatastreamClient.from_service_account_info.__func__(DatastreamAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DatastreamClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DatastreamAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +142,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DatastreamAsyncClient: The constructed client. """ - return DatastreamClient.from_service_account_file.__func__(DatastreamAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DatastreamClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DatastreamAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/client.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/client.py index a543e50e9e87..98bc40cd152e 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/client.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datastream_v1alpha1 import gapic_version as package_version @@ -692,11 +692,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DatastreamClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DatastreamClient._read_environment_variables() + ) self._client_cert_source = DatastreamClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -731,8 +729,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DatastreamTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/pagers.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/pagers.py index 15dc282f4781..3f04e59796d6 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/pagers.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/base.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/base.py index 0820ced52ebc..cb5280b434c0 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/base.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datastream_v1alpha1 import gapic_version as package_version from google.cloud.datastream_v1alpha1.types import datastream, datastream_resources diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc.py index b214b6a7222c..1e4263b3c5cd 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.datastream_v1alpha1.types import datastream, datastream_resources @@ -510,12 +510,12 @@ def discover_connection_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "discover_connection_profile" not in self._stubs: - self._stubs[ - "discover_connection_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.datastream.v1alpha1.Datastream/DiscoverConnectionProfile", - request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, - response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + self._stubs["discover_connection_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datastream.v1alpha1.Datastream/DiscoverConnectionProfile", + request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, + response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + ) ) return self._stubs["discover_connection_profile"] diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc_asyncio.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc_asyncio.py index bcee409d6ffc..79fbe2b8a46b 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc_asyncio.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datastream_v1alpha1.types import datastream, datastream_resources @@ -519,12 +519,12 @@ def discover_connection_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "discover_connection_profile" not in self._stubs: - self._stubs[ - "discover_connection_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.datastream.v1alpha1.Datastream/DiscoverConnectionProfile", - request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, - response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + self._stubs["discover_connection_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datastream.v1alpha1.Datastream/DiscoverConnectionProfile", + request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, + response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + ) ) return self._stubs["discover_connection_profile"] diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/rest.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/rest.py index 0e0bf9040ec8..fca0fb0776cb 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/rest.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1458,9 +1458,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseCreateConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseCreateConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_create_connection_profile( request, metadata @@ -1611,9 +1609,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseCreatePrivateConnection._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseCreatePrivateConnection._get_http_options() request, metadata = self._interceptor.pre_create_private_connection( request, metadata @@ -2075,9 +2071,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseDeleteConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseDeleteConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_delete_connection_profile( request, metadata @@ -2222,9 +2216,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseDeletePrivateConnection._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseDeletePrivateConnection._get_http_options() request, metadata = self._interceptor.pre_delete_private_connection( request, metadata @@ -2667,9 +2659,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseDiscoverConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseDiscoverConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_discover_connection_profile( request, metadata @@ -3129,9 +3119,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseGetConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseGetConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_get_connection_profile( request, metadata @@ -3281,9 +3269,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseGetPrivateConnection._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseGetPrivateConnection._get_http_options() request, metadata = self._interceptor.pre_get_private_connection( request, metadata @@ -3725,9 +3711,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseListConnectionProfiles._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseListConnectionProfiles._get_http_options() request, metadata = self._interceptor.pre_list_connection_profiles( request, metadata @@ -3873,9 +3857,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseListPrivateConnections._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseListPrivateConnections._get_http_options() request, metadata = self._interceptor.pre_list_private_connections( request, metadata @@ -4319,9 +4301,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseUpdateConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseUpdateConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_update_connection_profile( request, metadata @@ -4579,7 +4559,9 @@ def create_connection_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._CreateConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_private_connection( @@ -4589,7 +4571,9 @@ def create_private_connection( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreatePrivateConnection(self._session, self._host, self._interceptor) # type: ignore + return self._CreatePrivateConnection( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_route( @@ -4615,7 +4599,9 @@ def delete_connection_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_private_connection( @@ -4625,7 +4611,9 @@ def delete_private_connection( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeletePrivateConnection(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePrivateConnection( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_route( @@ -4652,7 +4640,9 @@ def discover_connection_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DiscoverConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DiscoverConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_errors( @@ -4717,7 +4707,9 @@ def list_connection_profiles( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListConnectionProfiles(self._session, self._host, self._interceptor) # type: ignore + return self._ListConnectionProfiles( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_private_connections( @@ -4728,7 +4720,9 @@ def list_private_connections( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListPrivateConnections(self._session, self._host, self._interceptor) # type: ignore + return self._ListPrivateConnections( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_routes( @@ -4754,7 +4748,9 @@ def update_connection_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_stream( diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream.py index 46f37ace1c2a..1421817d5ef4 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream.py @@ -329,12 +329,12 @@ class ListConnectionProfilesResponse(proto.Message): def raw_page(self): return self - connection_profiles: MutableSequence[ - datastream_resources.ConnectionProfile - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=datastream_resources.ConnectionProfile, + connection_profiles: MutableSequence[datastream_resources.ConnectionProfile] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=datastream_resources.ConnectionProfile, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -961,12 +961,12 @@ class ListPrivateConnectionsResponse(proto.Message): def raw_page(self): return self - private_connections: MutableSequence[ - datastream_resources.PrivateConnection - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=datastream_resources.PrivateConnection, + private_connections: MutableSequence[datastream_resources.PrivateConnection] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=datastream_resources.PrivateConnection, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream_resources.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream_resources.py index c3c7b8cb886c..13a1f30c54a1 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream_resources.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream_resources.py @@ -71,6 +71,7 @@ class GcsFileFormat(proto.Enum): AVRO (1): Avro file format """ + _pb_options = {"deprecated": True} GCS_FILE_FORMAT_UNSPECIFIED = 0 AVRO = 1 @@ -87,6 +88,7 @@ class SchemaFileFormat(proto.Enum): AVRO_SCHEMA_FILE (2): Avro schema format. """ + SCHEMA_FILE_FORMAT_UNSPECIFIED = 0 NO_SCHEMA_FILE = 1 AVRO_SCHEMA_FILE = 2 @@ -323,6 +325,7 @@ class State(proto.Enum): FAILED (3): The private connection creation has failed. """ + STATE_UNSPECIFIED = 0 CREATING = 1 CREATED = 2 @@ -960,6 +963,7 @@ class JsonCompression(proto.Enum): GZIP (2): Gzip compression. """ + JSON_COMPRESSION_UNSPECIFIED = 0 NO_COMPRESSION = 1 GZIP = 2 @@ -1141,6 +1145,7 @@ class State(proto.Enum): The Stream is no longer reading new events, but still writing events in the buffer. """ + STATE_UNSPECIFIED = 0 CREATED = 1 RUNNING = 2 @@ -1338,6 +1343,7 @@ class Status(proto.Enum): PASSED (3): Validation passed. """ + STATUS_UNSPECIFIED = 0 NOT_EXECUTED = 1 FAILED = 2 @@ -1389,6 +1395,7 @@ class Level(proto.Enum): ERROR (2): Definitely cause issues with the Stream. """ + LEVEL_UNSPECIFIED = 0 WARNING = 1 ERROR = 2 diff --git a/packages/google-cloud-datastream/mypy.ini b/packages/google-cloud-datastream/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-datastream/mypy.ini +++ b/packages/google-cloud-datastream/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-datastream/noxfile.py b/packages/google-cloud-datastream/noxfile.py index 10757612db00..ac5043dd4652 100644 --- a/packages/google-cloud-datastream/noxfile.py +++ b/packages/google-cloud-datastream/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1/test_datastream.py b/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1/test_datastream.py index 496ed027eb19..44eafa543b6a 100644 --- a/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1/test_datastream.py +++ b/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1/test_datastream.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,23 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.cloud.datastream_v1.services.datastream import ( DatastreamAsyncClient, @@ -936,10 +938,9 @@ def test_datastream_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +985,9 @@ def test_datastream_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1023,9 @@ def test_datastream_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1259,9 +1258,7 @@ def test_datastream_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1942,9 +1939,9 @@ def test_get_connection_profile_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_profile] = ( + mock_rpc + ) request = {} client.get_connection_profile(request) @@ -5769,9 +5766,9 @@ def test_get_stream_object_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_stream_object - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_stream_object] = ( + mock_rpc + ) request = {} client.get_stream_object(request) @@ -6114,9 +6111,9 @@ def test_lookup_stream_object_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.lookup_stream_object - ] = mock_rpc + client._transport._wrapped_methods[client._transport.lookup_stream_object] = ( + mock_rpc + ) request = {} client.lookup_stream_object(request) @@ -6373,9 +6370,9 @@ def test_list_stream_objects_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_stream_objects - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_stream_objects] = ( + mock_rpc + ) request = {} client.list_stream_objects(request) @@ -6913,9 +6910,9 @@ def test_start_backfill_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_backfill_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_backfill_job] = ( + mock_rpc + ) request = {} client.start_backfill_job(request) @@ -7246,9 +7243,9 @@ def test_stop_backfill_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_backfill_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_backfill_job] = ( + mock_rpc + ) request = {} client.stop_backfill_job(request) @@ -7582,9 +7579,9 @@ def test_fetch_static_ips_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_static_ips - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_static_ips] = ( + mock_rpc + ) request = {} client.fetch_static_ips(request) @@ -8497,9 +8494,9 @@ def test_get_private_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_private_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_private_connection] = ( + mock_rpc + ) request = {} client.get_private_connection(request) @@ -11496,9 +11493,9 @@ def test_get_connection_profile_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_profile] = ( + mock_rpc + ) request = {} client.get_connection_profile(request) @@ -13572,9 +13569,9 @@ def test_get_stream_object_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_stream_object - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_stream_object] = ( + mock_rpc + ) request = {} client.get_stream_object(request) @@ -13756,9 +13753,9 @@ def test_lookup_stream_object_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.lookup_stream_object - ] = mock_rpc + client._transport._wrapped_methods[client._transport.lookup_stream_object] = ( + mock_rpc + ) request = {} client.lookup_stream_object(request) @@ -13889,9 +13886,9 @@ def test_list_stream_objects_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_stream_objects - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_stream_objects] = ( + mock_rpc + ) request = {} client.list_stream_objects(request) @@ -14153,9 +14150,9 @@ def test_start_backfill_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_backfill_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_backfill_job] = ( + mock_rpc + ) request = {} client.start_backfill_job(request) @@ -14336,9 +14333,9 @@ def test_stop_backfill_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_backfill_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_backfill_job] = ( + mock_rpc + ) request = {} client.stop_backfill_job(request) @@ -14519,9 +14516,9 @@ def test_fetch_static_ips_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_static_ips - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_static_ips] = ( + mock_rpc + ) request = {} client.fetch_static_ips(request) @@ -15010,9 +15007,9 @@ def test_get_private_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_private_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_private_connection] = ( + mock_rpc + ) request = {} client.get_private_connection(request) diff --git a/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1alpha1/test_datastream.py b/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1alpha1/test_datastream.py index c4cfe596aa65..53124688913b 100644 --- a/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1alpha1/test_datastream.py +++ b/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1alpha1/test_datastream.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.cloud.datastream_v1alpha1.services.datastream import ( DatastreamAsyncClient, @@ -932,10 +932,9 @@ def test_datastream_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -980,10 +979,9 @@ def test_datastream_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1017,9 @@ def test_datastream_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1255,9 +1252,7 @@ def test_datastream_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1934,9 +1929,9 @@ def test_get_connection_profile_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_profile] = ( + mock_rpc + ) request = {} client.get_connection_profile(request) @@ -5739,9 +5734,9 @@ def test_fetch_static_ips_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_static_ips - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_static_ips] = ( + mock_rpc + ) request = {} client.fetch_static_ips(request) @@ -6650,9 +6645,9 @@ def test_get_private_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_private_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_private_connection] = ( + mock_rpc + ) request = {} client.get_private_connection(request) @@ -9645,9 +9640,9 @@ def test_get_connection_profile_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_profile] = ( + mock_rpc + ) request = {} client.get_connection_profile(request) @@ -11637,9 +11632,9 @@ def test_fetch_static_ips_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_static_ips - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_static_ips] = ( + mock_rpc + ) request = {} client.fetch_static_ips(request) @@ -12124,9 +12119,9 @@ def test_get_private_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_private_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_private_connection] = ( + mock_rpc + ) request = {} client.get_private_connection(request) diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/__init__.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/__init__.py index 57fe9dee1826..df0993896fd8 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/__init__.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_deploy import CloudDeployAsyncClient, CloudDeployClient from .types.automation_payload import AutomationEvent from .types.automationrun_payload import AutomationRunEvent diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/async_client.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/async_client.py index 3ac5c2149abf..c89859ad1b14 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/async_client.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.deploy_v1 import gapic_version as package_version @@ -46,13 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.deploy_v1.services.cloud_deploy import pagers from google.cloud.deploy_v1.types import cloud_deploy @@ -160,7 +162,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudDeployAsyncClient: The constructed client. """ - return CloudDeployClient.from_service_account_info.__func__(CloudDeployAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudDeployClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CloudDeployAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -176,7 +181,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudDeployAsyncClient: The constructed client. """ - return CloudDeployClient.from_service_account_file.__func__(CloudDeployAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudDeployClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CloudDeployAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/client.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/client.py index f44ac66ce83a..d968ea46f4f5 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/client.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.deploy_v1 import gapic_version as package_version @@ -63,13 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.deploy_v1.services.cloud_deploy import pagers from google.cloud.deploy_v1.types import cloud_deploy @@ -1002,11 +1004,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudDeployClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudDeployClient._read_environment_variables() + ) self._client_cert_source = CloudDeployClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1041,8 +1041,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudDeployTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/pagers.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/pagers.py index 8c609f326fc9..cf159cfb7ba9 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/pagers.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1159,7 +1159,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1235,7 +1235,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1315,7 +1315,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1391,7 +1391,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/base.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/base.py index 5b0c13edbf44..99a4a8bd2b1b 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/base.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.deploy_v1 import gapic_version as package_version from google.cloud.deploy_v1.types import cloud_deploy @@ -1076,13 +1078,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc.py index 0166f7bc283a..2161aa0933ce 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.deploy_v1.types import cloud_deploy diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc_asyncio.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc_asyncio.py index 7f8e1fc43295..eb8be0f3cc37 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc_asyncio.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.deploy_v1.types import cloud_deploy diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest.py index d130d098075a..bb575f017df2 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -3494,9 +3496,7 @@ def __call__( The response object from ``CancelAutomationRun``. """ - http_options = ( - _BaseCloudDeployRestTransport._BaseCancelAutomationRun._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseCancelAutomationRun._get_http_options() request, metadata = self._interceptor.pre_cancel_automation_run( request, metadata @@ -3960,9 +3960,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseCreateCustomTargetType._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseCreateCustomTargetType._get_http_options() request, metadata = self._interceptor.pre_create_custom_target_type( request, metadata @@ -4113,9 +4111,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseCreateDeliveryPipeline._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseCreateDeliveryPipeline._get_http_options() request, metadata = self._interceptor.pre_create_delivery_pipeline( request, metadata @@ -4266,9 +4262,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseCreateDeployPolicy._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseCreateDeployPolicy._get_http_options() request, metadata = self._interceptor.pre_create_deploy_policy( request, metadata @@ -5033,9 +5027,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseDeleteCustomTargetType._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseDeleteCustomTargetType._get_http_options() request, metadata = self._interceptor.pre_delete_custom_target_type( request, metadata @@ -5180,9 +5172,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseDeleteDeliveryPipeline._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseDeleteDeliveryPipeline._get_http_options() request, metadata = self._interceptor.pre_delete_delivery_pipeline( request, metadata @@ -5327,9 +5317,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseDeleteDeployPolicy._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseDeleteDeployPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_deploy_policy( request, metadata @@ -6076,9 +6064,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseGetCustomTargetType._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseGetCustomTargetType._get_http_options() request, metadata = self._interceptor.pre_get_custom_target_type( request, metadata @@ -6226,9 +6212,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseGetDeliveryPipeline._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseGetDeliveryPipeline._get_http_options() request, metadata = self._interceptor.pre_get_delivery_pipeline( request, metadata @@ -7280,9 +7264,7 @@ def __call__( The response object from ``ListAutomationRuns``. """ - http_options = ( - _BaseCloudDeployRestTransport._BaseListAutomationRuns._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseListAutomationRuns._get_http_options() request, metadata = self._interceptor.pre_list_automation_runs( request, metadata @@ -7576,9 +7558,7 @@ def __call__( The response object from ``ListCustomTargetTypes.`` """ - http_options = ( - _BaseCloudDeployRestTransport._BaseListCustomTargetTypes._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseListCustomTargetTypes._get_http_options() request, metadata = self._interceptor.pre_list_custom_target_types( request, metadata @@ -7724,9 +7704,7 @@ def __call__( The response object from ``ListDeliveryPipelines``. """ - http_options = ( - _BaseCloudDeployRestTransport._BaseListDeliveryPipelines._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseListDeliveryPipelines._get_http_options() request, metadata = self._interceptor.pre_list_delivery_pipelines( request, metadata @@ -7872,9 +7850,7 @@ def __call__( The response object from ``ListDeployPolicies``. """ - http_options = ( - _BaseCloudDeployRestTransport._BaseListDeployPolicies._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseListDeployPolicies._get_http_options() request, metadata = self._interceptor.pre_list_deploy_policies( request, metadata @@ -9242,9 +9218,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseUpdateCustomTargetType._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseUpdateCustomTargetType._get_http_options() request, metadata = self._interceptor.pre_update_custom_target_type( request, metadata @@ -9395,9 +9369,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseUpdateDeliveryPipeline._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseUpdateDeliveryPipeline._get_http_options() request, metadata = self._interceptor.pre_update_delivery_pipeline( request, metadata @@ -9548,9 +9520,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseUpdateDeployPolicy._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseUpdateDeployPolicy._get_http_options() request, metadata = self._interceptor.pre_update_deploy_policy( request, metadata @@ -9867,7 +9837,9 @@ def create_custom_target_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateCustomTargetType(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCustomTargetType( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_delivery_pipeline( @@ -9877,7 +9849,9 @@ def create_delivery_pipeline( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateDeliveryPipeline(self._session, self._host, self._interceptor) # type: ignore + return self._CreateDeliveryPipeline( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_deploy_policy( @@ -9927,7 +9901,9 @@ def delete_custom_target_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteCustomTargetType(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteCustomTargetType( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_delivery_pipeline( @@ -9937,7 +9913,9 @@ def delete_delivery_pipeline( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteDeliveryPipeline(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteDeliveryPipeline( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_deploy_policy( @@ -10181,7 +10159,9 @@ def update_custom_target_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateCustomTargetType(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCustomTargetType( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_delivery_pipeline( @@ -10191,7 +10171,9 @@ def update_delivery_pipeline( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateDeliveryPipeline(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDeliveryPipeline( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_deploy_policy( @@ -10849,9 +10831,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseCloudDeployRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest_base.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest_base.py index c2eb5269439b..d3d20b383149 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest_base.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/__init__.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/__init__.py index bcb894522cff..bc236a320825 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/__init__.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/__init__.py @@ -13,8 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .automation_payload import AutomationEvent -from .automationrun_payload import AutomationRunEvent +from .automation_payload import ( + AutomationEvent, +) +from .automationrun_payload import ( + AutomationRunEvent, +) from .cloud_deploy import ( AbandonReleaseRequest, AbandonReleaseResponse, @@ -180,17 +184,39 @@ VerifyJobRun, WeeklyWindow, ) -from .customtargettype_notification_payload import CustomTargetTypeNotificationEvent -from .deliverypipeline_notification_payload import DeliveryPipelineNotificationEvent -from .deploypolicy_evaluation_payload import DeployPolicyEvaluationEvent -from .deploypolicy_notification_payload import DeployPolicyNotificationEvent -from .jobrun_notification_payload import JobRunNotificationEvent -from .log_enums import Type -from .release_notification_payload import ReleaseNotificationEvent -from .release_render_payload import ReleaseRenderEvent -from .rollout_notification_payload import RolloutNotificationEvent -from .rollout_update_payload import RolloutUpdateEvent -from .target_notification_payload import TargetNotificationEvent +from .customtargettype_notification_payload import ( + CustomTargetTypeNotificationEvent, +) +from .deliverypipeline_notification_payload import ( + DeliveryPipelineNotificationEvent, +) +from .deploypolicy_evaluation_payload import ( + DeployPolicyEvaluationEvent, +) +from .deploypolicy_notification_payload import ( + DeployPolicyNotificationEvent, +) +from .jobrun_notification_payload import ( + JobRunNotificationEvent, +) +from .log_enums import ( + Type, +) +from .release_notification_payload import ( + ReleaseNotificationEvent, +) +from .release_render_payload import ( + ReleaseRenderEvent, +) +from .rollout_notification_payload import ( + RolloutNotificationEvent, +) +from .rollout_update_payload import ( + RolloutUpdateEvent, +) +from .target_notification_payload import ( + TargetNotificationEvent, +) __all__ = ( "AutomationEvent", diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/cloud_deploy.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/cloud_deploy.py index dc78df56a2d0..273c8729f29a 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/cloud_deploy.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/cloud_deploy.py @@ -208,6 +208,7 @@ class SkaffoldSupportState(proto.Enum): SKAFFOLD_SUPPORT_STATE_UNSUPPORTED (3): This Skaffold version is no longer supported. """ + SKAFFOLD_SUPPORT_STATE_UNSPECIFIED = 0 SKAFFOLD_SUPPORT_STATE_SUPPORTED = 1 SKAFFOLD_SUPPORT_STATE_MAINTENANCE_MODE = 2 @@ -225,6 +226,7 @@ class BackoffMode(proto.Enum): BACKOFF_MODE_EXPONENTIAL (2): Increases the wait time exponentially. """ + BACKOFF_MODE_UNSPECIFIED = 0 BACKOFF_MODE_LINEAR = 1 BACKOFF_MODE_EXPONENTIAL = 2 @@ -249,6 +251,7 @@ class RepairState(proto.Enum): REPAIR_STATE_ABORTED (7): The ``repair`` action was aborted. """ + REPAIR_STATE_UNSPECIFIED = 0 REPAIR_STATE_SUCCEEDED = 1 REPAIR_STATE_CANCELLED = 2 @@ -1790,6 +1793,7 @@ class ExecutionEnvironmentUsage(proto.Enum): POSTDEPLOY (5): Use for postdeploy job execution. """ + EXECUTION_ENVIRONMENT_USAGE_UNSPECIFIED = 0 RENDER = 1 DEPLOY = 2 @@ -2990,6 +2994,7 @@ class Invoker(proto.Enum): DEPLOY_AUTOMATION (2): Automated action by Cloud Deploy. """ + INVOKER_UNSPECIFIED = 0 USER = 1 DEPLOY_AUTOMATION = 2 @@ -3188,6 +3193,7 @@ class RolloutActions(proto.Enum): TERMINATE_JOBRUN (8): Terminate a jobrun. """ + ROLLOUT_ACTIONS_UNSPECIFIED = 0 ADVANCE = 1 APPROVE = 2 @@ -3341,12 +3347,12 @@ class PolicyViolation(proto.Message): Policy violation details. """ - policy_violation_details: MutableSequence[ - "PolicyViolationDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="PolicyViolationDetails", + policy_violation_details: MutableSequence["PolicyViolationDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="PolicyViolationDetails", + ) ) @@ -3493,6 +3499,7 @@ class RenderState(proto.Enum): IN_PROGRESS (3): Rendering has started and is not complete. """ + RENDER_STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -3536,6 +3543,7 @@ class TargetRenderState(proto.Enum): IN_PROGRESS (3): The render operation is in progress. """ + TARGET_RENDER_STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -3576,6 +3584,7 @@ class FailureCause(proto.Enum): The render operation had a feature configured that is not supported. """ + FAILURE_CAUSE_UNSPECIFIED = 0 CLOUD_BUILD_UNAVAILABLE = 1 EXECUTION_FAILED = 2 @@ -3756,12 +3765,12 @@ class ReleaseCondition(proto.Message): number=12, message="Target", ) - custom_target_type_snapshots: MutableSequence[ - "CustomTargetType" - ] = proto.RepeatedField( - proto.MESSAGE, - number=27, - message="CustomTargetType", + custom_target_type_snapshots: MutableSequence["CustomTargetType"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=27, + message="CustomTargetType", + ) ) render_state: RenderState = proto.Field( proto.ENUM, @@ -4536,6 +4545,7 @@ class ApprovalState(proto.Enum): REJECTED (4): The ``Rollout`` has been rejected. """ + APPROVAL_STATE_UNSPECIFIED = 0 NEEDS_APPROVAL = 1 DOES_NOT_NEED_APPROVAL = 2 @@ -4571,6 +4581,7 @@ class State(proto.Enum): HALTED (10): The ``Rollout`` is halted. """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -4613,6 +4624,7 @@ class FailureCause(proto.Enum): A Rollout operation had a feature configured that is not supported. """ + FAILURE_CAUSE_UNSPECIFIED = 0 CLOUD_BUILD_UNAVAILABLE = 1 EXECUTION_FAILED = 2 @@ -4946,6 +4958,7 @@ class State(proto.Enum): SKIPPED (6): The Phase was skipped. """ + STATE_UNSPECIFIED = 0 PENDING = 1 IN_PROGRESS = 2 @@ -5114,6 +5127,7 @@ class State(proto.Enum): IGNORED (8): The Job was ignored. """ + STATE_UNSPECIFIED = 0 PENDING = 1 DISABLED = 2 @@ -5737,6 +5751,7 @@ class State(proto.Enum): TERMINATED (5): The ``JobRun`` was terminated. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 SUCCEEDED = 2 @@ -5873,6 +5888,7 @@ class FailureCause(proto.Enum): The deploy operation had a feature configured that is not supported. """ + FAILURE_CAUSE_UNSPECIFIED = 0 CLOUD_BUILD_UNAVAILABLE = 1 EXECUTION_FAILED = 2 @@ -5953,6 +5969,7 @@ class FailureCause(proto.Enum): Cloud Build failed to fulfill Cloud Deploy's request. See failure_message for additional details. """ + FAILURE_CAUSE_UNSPECIFIED = 0 CLOUD_BUILD_UNAVAILABLE = 1 EXECUTION_FAILED = 2 @@ -6023,6 +6040,7 @@ class FailureCause(proto.Enum): Cloud Build failed to fulfill Cloud Deploy's request. See failure_message for additional details. """ + FAILURE_CAUSE_UNSPECIFIED = 0 CLOUD_BUILD_UNAVAILABLE = 1 EXECUTION_FAILED = 2 @@ -6085,6 +6103,7 @@ class FailureCause(proto.Enum): Cloud Build failed to fulfill Cloud Deploy's request. See failure_message for additional details. """ + FAILURE_CAUSE_UNSPECIFIED = 0 CLOUD_BUILD_UNAVAILABLE = 1 EXECUTION_FAILED = 2 @@ -7354,6 +7373,7 @@ class State(proto.Enum): ABORTED (6): The ``AutomationRun`` was aborted. """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 CANCELLED = 2 diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/deploypolicy_evaluation_payload.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/deploypolicy_evaluation_payload.py index eed416cc7bf8..ce6ec1a04ef6 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/deploypolicy_evaluation_payload.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/deploypolicy_evaluation_payload.py @@ -90,6 +90,7 @@ class PolicyVerdict(proto.Enum): DENIED_BY_POLICY (2): Denied by policy. """ + POLICY_VERDICT_UNSPECIFIED = 0 ALLOWED_BY_POLICY = 1 DENIED_BY_POLICY = 2 @@ -107,6 +108,7 @@ class PolicyVerdictOverride(proto.Enum): POLICY_SUSPENDED (2): The policy was suspended. """ + POLICY_VERDICT_OVERRIDE_UNSPECIFIED = 0 POLICY_OVERRIDDEN = 1 POLICY_SUSPENDED = 2 diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/log_enums.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/log_enums.py index ffecfb3ab6ca..4e62d205a053 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/log_enums.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/log_enums.py @@ -52,6 +52,7 @@ class Type(proto.Enum): Deprecated: This field is never used. Use release_render log type instead. """ + TYPE_UNSPECIFIED = 0 TYPE_PUBSUB_NOTIFICATION_FAILURE = 1 TYPE_RESOURCE_STATE_CHANGE = 3 diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/rollout_update_payload.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/rollout_update_payload.py index 636ebfe134bc..1257e495aaaf 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/rollout_update_payload.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/rollout_update_payload.py @@ -89,6 +89,7 @@ class RolloutUpdateType(proto.Enum): ADVANCED (13): Rollout has been advanced. """ + ROLLOUT_UPDATE_TYPE_UNSPECIFIED = 0 PENDING = 1 PENDING_RELEASE = 2 diff --git a/packages/google-cloud-deploy/mypy.ini b/packages/google-cloud-deploy/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-deploy/mypy.ini +++ b/packages/google-cloud-deploy/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-deploy/noxfile.py b/packages/google-cloud-deploy/noxfile.py index bd9102e3feb9..9de965ea0d66 100644 --- a/packages/google-cloud-deploy/noxfile.py +++ b/packages/google-cloud-deploy/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-deploy/tests/unit/gapic/deploy_v1/test_cloud_deploy.py b/packages/google-cloud-deploy/tests/unit/gapic/deploy_v1/test_cloud_deploy.py index b01a03ad0c1e..b7c26bfdee73 100644 --- a/packages/google-cloud-deploy/tests/unit/gapic/deploy_v1/test_cloud_deploy.py +++ b/packages/google-cloud-deploy/tests/unit/gapic/deploy_v1/test_cloud_deploy.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,17 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,26 +62,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore -import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore -import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.cloud.deploy_v1.services.cloud_deploy import ( CloudDeployAsyncClient, @@ -943,10 +945,9 @@ def test_cloud_deploy_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -991,10 +992,9 @@ def test_cloud_deploy_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1030,9 @@ def test_cloud_deploy_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1266,9 +1265,7 @@ def test_cloud_deploy_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1945,9 +1942,9 @@ def test_get_delivery_pipeline_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_delivery_pipeline - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_delivery_pipeline] = ( + mock_rpc + ) request = {} client.get_delivery_pipeline(request) @@ -6168,9 +6165,9 @@ def test_get_custom_target_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_target_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_target_type] = ( + mock_rpc + ) request = {} client.get_custom_target_type(request) @@ -9148,9 +9145,9 @@ def test_create_deploy_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deploy_policy] = ( + mock_rpc + ) request = {} client.create_deploy_policy(request) @@ -9513,9 +9510,9 @@ def test_update_deploy_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_deploy_policy] = ( + mock_rpc + ) request = {} client.update_deploy_policy(request) @@ -9872,9 +9869,9 @@ def test_delete_deploy_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deploy_policy] = ( + mock_rpc + ) request = {} client.delete_deploy_policy(request) @@ -10228,9 +10225,9 @@ def test_list_deploy_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deploy_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deploy_policies] = ( + mock_rpc + ) request = {} client.list_deploy_policies(request) @@ -10779,9 +10776,9 @@ def test_get_deploy_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_deploy_policy] = ( + mock_rpc + ) request = {} client.get_deploy_policy(request) @@ -14891,9 +14888,9 @@ def test_terminate_job_run_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.terminate_job_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.terminate_job_run] = ( + mock_rpc + ) request = {} client.terminate_job_run(request) @@ -15549,9 +15546,9 @@ def test_create_automation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_automation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_automation] = ( + mock_rpc + ) request = {} client.create_automation(request) @@ -15912,9 +15909,9 @@ def test_update_automation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_automation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_automation] = ( + mock_rpc + ) request = {} client.update_automation(request) @@ -16269,9 +16266,9 @@ def test_delete_automation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_automation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_automation] = ( + mock_rpc + ) request = {} client.delete_automation(request) @@ -16962,9 +16959,9 @@ def test_list_automations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_automations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_automations] = ( + mock_rpc + ) request = {} client.list_automations(request) @@ -17503,9 +17500,9 @@ def test_get_automation_run_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_automation_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_automation_run] = ( + mock_rpc + ) request = {} client.get_automation_run(request) @@ -17866,9 +17863,9 @@ def test_list_automation_runs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_automation_runs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_automation_runs] = ( + mock_rpc + ) request = {} client.list_automation_runs(request) @@ -18409,9 +18406,9 @@ def test_cancel_automation_run_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_automation_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_automation_run] = ( + mock_rpc + ) request = {} client.cancel_automation_run(request) @@ -18946,9 +18943,9 @@ def test_get_delivery_pipeline_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_delivery_pipeline - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_delivery_pipeline] = ( + mock_rpc + ) request = {} client.get_delivery_pipeline(request) @@ -21281,9 +21278,9 @@ def test_get_custom_target_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_target_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_target_type] = ( + mock_rpc + ) request = {} client.get_custom_target_type(request) @@ -22944,9 +22941,9 @@ def test_create_deploy_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deploy_policy] = ( + mock_rpc + ) request = {} client.create_deploy_policy(request) @@ -23166,9 +23163,9 @@ def test_update_deploy_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_deploy_policy] = ( + mock_rpc + ) request = {} client.update_deploy_policy(request) @@ -23373,9 +23370,9 @@ def test_delete_deploy_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deploy_policy] = ( + mock_rpc + ) request = {} client.delete_deploy_policy(request) @@ -23575,9 +23572,9 @@ def test_list_deploy_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deploy_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deploy_policies] = ( + mock_rpc + ) request = {} client.list_deploy_policies(request) @@ -23837,9 +23834,9 @@ def test_get_deploy_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_deploy_policy] = ( + mock_rpc + ) request = {} client.get_deploy_policy(request) @@ -26092,9 +26089,9 @@ def test_terminate_job_run_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.terminate_job_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.terminate_job_run] = ( + mock_rpc + ) request = {} client.terminate_job_run(request) @@ -26450,9 +26447,9 @@ def test_create_automation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_automation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_automation] = ( + mock_rpc + ) request = {} client.create_automation(request) @@ -26672,9 +26669,9 @@ def test_update_automation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_automation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_automation] = ( + mock_rpc + ) request = {} client.update_automation(request) @@ -26877,9 +26874,9 @@ def test_delete_automation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_automation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_automation] = ( + mock_rpc + ) request = {} client.delete_automation(request) @@ -27257,9 +27254,9 @@ def test_list_automations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_automations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_automations] = ( + mock_rpc + ) request = {} client.list_automations(request) @@ -27525,9 +27522,9 @@ def test_get_automation_run_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_automation_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_automation_run] = ( + mock_rpc + ) request = {} client.get_automation_run(request) @@ -27709,9 +27706,9 @@ def test_list_automation_runs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_automation_runs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_automation_runs] = ( + mock_rpc + ) request = {} client.list_automation_runs(request) @@ -27978,9 +27975,9 @@ def test_cancel_automation_run_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_automation_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_automation_run] = ( + mock_rpc + ) request = {} client.cancel_automation_run(request) diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/__init__.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/__init__.py index aa777a853f23..11f54507b0ee 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/__init__.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.developer_connect import ( DeveloperConnectAsyncClient, DeveloperConnectClient, diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/async_client.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/async_client.py index 7049eb94772a..b99695d0e7d9 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/async_client.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.developerconnect_v1 import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.developerconnect_v1.services.developer_connect import pagers from google.cloud.developerconnect_v1.types import developer_connect @@ -141,7 +141,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DeveloperConnectAsyncClient: The constructed client. """ - return DeveloperConnectClient.from_service_account_info.__func__(DeveloperConnectAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DeveloperConnectClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DeveloperConnectAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +160,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DeveloperConnectAsyncClient: The constructed client. """ - return DeveloperConnectClient.from_service_account_file.__func__(DeveloperConnectAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DeveloperConnectClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DeveloperConnectAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/client.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/client.py index 1693ff43f790..9fd1fe8e1aee 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/client.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.developerconnect_v1 import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.developerconnect_v1.services.developer_connect import pagers from google.cloud.developerconnect_v1.types import developer_connect @@ -86,9 +86,7 @@ class DeveloperConnectClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DeveloperConnectTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DeveloperConnectTransport]] _transport_registry["grpc"] = DeveloperConnectGrpcTransport _transport_registry["grpc_asyncio"] = DeveloperConnectGrpcAsyncIOTransport _transport_registry["rest"] = DeveloperConnectRestTransport @@ -772,11 +770,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DeveloperConnectClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DeveloperConnectClient._read_environment_variables() + ) self._client_cert_source = DeveloperConnectClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -811,8 +807,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DeveloperConnectTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/pagers.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/pagers.py index 4c7860568f00..747d2285e58b 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/pagers.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -461,7 +461,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -543,7 +543,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -619,7 +619,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -699,7 +699,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -777,7 +777,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -859,7 +859,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -935,7 +935,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/base.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/base.py index ee00c41429e8..907ab2c8749f 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/base.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.developerconnect_v1 import gapic_version as package_version from google.cloud.developerconnect_v1.types import developer_connect @@ -688,13 +688,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc.py index f9be3f0e7882..296ad956beaf 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.developerconnect_v1.types import developer_connect @@ -508,12 +508,12 @@ def create_git_repository_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_git_repository_link" not in self._stubs: - self._stubs[ - "create_git_repository_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/CreateGitRepositoryLink", - request_serializer=developer_connect.CreateGitRepositoryLinkRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_git_repository_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/CreateGitRepositoryLink", + request_serializer=developer_connect.CreateGitRepositoryLinkRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_git_repository_link"] @@ -538,12 +538,12 @@ def delete_git_repository_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_git_repository_link" not in self._stubs: - self._stubs[ - "delete_git_repository_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/DeleteGitRepositoryLink", - request_serializer=developer_connect.DeleteGitRepositoryLinkRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_git_repository_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/DeleteGitRepositoryLink", + request_serializer=developer_connect.DeleteGitRepositoryLinkRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_git_repository_link"] @@ -690,12 +690,12 @@ def fetch_linkable_git_repositories( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_linkable_git_repositories" not in self._stubs: - self._stubs[ - "fetch_linkable_git_repositories" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/FetchLinkableGitRepositories", - request_serializer=developer_connect.FetchLinkableGitRepositoriesRequest.serialize, - response_deserializer=developer_connect.FetchLinkableGitRepositoriesResponse.deserialize, + self._stubs["fetch_linkable_git_repositories"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/FetchLinkableGitRepositories", + request_serializer=developer_connect.FetchLinkableGitRepositoriesRequest.serialize, + response_deserializer=developer_connect.FetchLinkableGitRepositoriesResponse.deserialize, + ) ) return self._stubs["fetch_linkable_git_repositories"] @@ -725,12 +725,12 @@ def fetch_git_hub_installations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_git_hub_installations" not in self._stubs: - self._stubs[ - "fetch_git_hub_installations" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/FetchGitHubInstallations", - request_serializer=developer_connect.FetchGitHubInstallationsRequest.serialize, - response_deserializer=developer_connect.FetchGitHubInstallationsResponse.deserialize, + self._stubs["fetch_git_hub_installations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/FetchGitHubInstallations", + request_serializer=developer_connect.FetchGitHubInstallationsRequest.serialize, + response_deserializer=developer_connect.FetchGitHubInstallationsResponse.deserialize, + ) ) return self._stubs["fetch_git_hub_installations"] diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc_asyncio.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc_asyncio.py index 11aeef9c6806..eed54b5ed658 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc_asyncio.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.developerconnect_v1.types import developer_connect @@ -518,12 +518,12 @@ def create_git_repository_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_git_repository_link" not in self._stubs: - self._stubs[ - "create_git_repository_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/CreateGitRepositoryLink", - request_serializer=developer_connect.CreateGitRepositoryLinkRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_git_repository_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/CreateGitRepositoryLink", + request_serializer=developer_connect.CreateGitRepositoryLinkRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_git_repository_link"] @@ -549,12 +549,12 @@ def delete_git_repository_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_git_repository_link" not in self._stubs: - self._stubs[ - "delete_git_repository_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/DeleteGitRepositoryLink", - request_serializer=developer_connect.DeleteGitRepositoryLinkRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_git_repository_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/DeleteGitRepositoryLink", + request_serializer=developer_connect.DeleteGitRepositoryLinkRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_git_repository_link"] @@ -701,12 +701,12 @@ def fetch_linkable_git_repositories( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_linkable_git_repositories" not in self._stubs: - self._stubs[ - "fetch_linkable_git_repositories" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/FetchLinkableGitRepositories", - request_serializer=developer_connect.FetchLinkableGitRepositoriesRequest.serialize, - response_deserializer=developer_connect.FetchLinkableGitRepositoriesResponse.deserialize, + self._stubs["fetch_linkable_git_repositories"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/FetchLinkableGitRepositories", + request_serializer=developer_connect.FetchLinkableGitRepositoriesRequest.serialize, + response_deserializer=developer_connect.FetchLinkableGitRepositoriesResponse.deserialize, + ) ) return self._stubs["fetch_linkable_git_repositories"] @@ -736,12 +736,12 @@ def fetch_git_hub_installations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_git_hub_installations" not in self._stubs: - self._stubs[ - "fetch_git_hub_installations" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/FetchGitHubInstallations", - request_serializer=developer_connect.FetchGitHubInstallationsRequest.serialize, - response_deserializer=developer_connect.FetchGitHubInstallationsResponse.deserialize, + self._stubs["fetch_git_hub_installations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/FetchGitHubInstallations", + request_serializer=developer_connect.FetchGitHubInstallationsRequest.serialize, + response_deserializer=developer_connect.FetchGitHubInstallationsResponse.deserialize, + ) ) return self._stubs["fetch_git_hub_installations"] diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/rest.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/rest.py index 3a33a9c0a01a..f8fa4a824919 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/rest.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1820,9 +1820,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseCreateAccountConnector._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseCreateAccountConnector._get_http_options() request, metadata = self._interceptor.pre_create_account_connector( request, metadata @@ -1976,9 +1974,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseCreateConnection._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseCreateConnection._get_http_options() request, metadata = self._interceptor.pre_create_connection( request, metadata @@ -2132,9 +2128,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseCreateGitRepositoryLink._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseCreateGitRepositoryLink._get_http_options() request, metadata = self._interceptor.pre_create_git_repository_link( request, metadata @@ -2288,9 +2282,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseDeleteAccountConnector._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseDeleteAccountConnector._get_http_options() request, metadata = self._interceptor.pre_delete_account_connector( request, metadata @@ -2438,9 +2430,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseDeleteConnection._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseDeleteConnection._get_http_options() request, metadata = self._interceptor.pre_delete_connection( request, metadata @@ -2588,9 +2578,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseDeleteGitRepositoryLink._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseDeleteGitRepositoryLink._get_http_options() request, metadata = self._interceptor.pre_delete_git_repository_link( request, metadata @@ -3030,9 +3018,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseFetchAccessToken._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseFetchAccessToken._get_http_options() request, metadata = self._interceptor.pre_fetch_access_token( request, metadata @@ -3188,9 +3174,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseFetchGitHubInstallations._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseFetchGitHubInstallations._get_http_options() request, metadata = self._interceptor.pre_fetch_git_hub_installations( request, metadata @@ -3491,9 +3475,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseFetchLinkableGitRepositories._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseFetchLinkableGitRepositories._get_http_options() request, metadata = self._interceptor.pre_fetch_linkable_git_repositories( request, metadata @@ -3557,11 +3539,10 @@ def __call__( resp = self._interceptor.post_fetch_linkable_git_repositories(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_linkable_git_repositories_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_linkable_git_repositories_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3647,9 +3628,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseFetchReadToken._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseFetchReadToken._get_http_options() request, metadata = self._interceptor.pre_fetch_read_token( request, metadata @@ -3805,9 +3784,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseFetchReadWriteToken._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseFetchReadWriteToken._get_http_options() request, metadata = self._interceptor.pre_fetch_read_write_token( request, metadata @@ -4115,9 +4092,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseGetAccountConnector._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseGetAccountConnector._get_http_options() request, metadata = self._interceptor.pre_get_account_connector( request, metadata @@ -4263,9 +4238,7 @@ def __call__( Message describing Connection object """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseGetConnection._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseGetConnection._get_http_options() request, metadata = self._interceptor.pre_get_connection(request, metadata) transcoded_request = _BaseDeveloperConnectRestTransport._BaseGetConnection._get_transcoded_request( @@ -4411,9 +4384,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseGetGitRepositoryLink._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseGetGitRepositoryLink._get_http_options() request, metadata = self._interceptor.pre_get_git_repository_link( request, metadata @@ -4565,9 +4536,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseListAccountConnectors._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseListAccountConnectors._get_http_options() request, metadata = self._interceptor.pre_list_account_connectors( request, metadata @@ -4721,9 +4690,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseListConnections._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseListConnections._get_http_options() request, metadata = self._interceptor.pre_list_connections( request, metadata @@ -4873,9 +4840,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseListGitRepositoryLinks._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseListGitRepositoryLinks._get_http_options() request, metadata = self._interceptor.pre_list_git_repository_links( request, metadata @@ -5178,9 +5143,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseUpdateAccountConnector._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseUpdateAccountConnector._get_http_options() request, metadata = self._interceptor.pre_update_account_connector( request, metadata @@ -5334,9 +5297,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseUpdateConnection._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseUpdateConnection._get_http_options() request, metadata = self._interceptor.pre_update_connection( request, metadata @@ -5437,7 +5398,9 @@ def create_account_connector( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateAccountConnector(self._session, self._host, self._interceptor) # type: ignore + return self._CreateAccountConnector( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_connection( @@ -5457,7 +5420,9 @@ def create_git_repository_link( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateGitRepositoryLink(self._session, self._host, self._interceptor) # type: ignore + return self._CreateGitRepositoryLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_account_connector( @@ -5467,7 +5432,9 @@ def delete_account_connector( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteAccountConnector(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteAccountConnector( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_connection( @@ -5487,7 +5454,9 @@ def delete_git_repository_link( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteGitRepositoryLink(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteGitRepositoryLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_self( @@ -5525,7 +5494,9 @@ def fetch_git_hub_installations( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchGitHubInstallations(self._session, self._host, self._interceptor) # type: ignore + return self._FetchGitHubInstallations( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_git_refs( @@ -5546,7 +5517,9 @@ def fetch_linkable_git_repositories( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchLinkableGitRepositories(self._session, self._host, self._interceptor) # type: ignore + return self._FetchLinkableGitRepositories( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_read_token( @@ -5641,7 +5614,9 @@ def list_git_repository_links( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListGitRepositoryLinks(self._session, self._host, self._interceptor) # type: ignore + return self._ListGitRepositoryLinks( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_users( @@ -5661,7 +5636,9 @@ def update_account_connector( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateAccountConnector(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAccountConnector( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_connection( @@ -5870,9 +5847,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDeveloperConnectRestTransport._BaseListLocations._get_transcoded_request( @@ -6009,9 +5984,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -6129,9 +6102,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -6386,9 +6357,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDeveloperConnectRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/async_client.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/async_client.py index 7bf1eeaf7508..e1d38b8a61cf 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/async_client.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.developerconnect_v1 import gapic_version as package_version @@ -46,18 +46,17 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.developerconnect_v1.services.insights_config_service import pagers +from google.cloud.developerconnect_v1.types import developer_connect, insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import developer_connect -from google.cloud.developerconnect_v1.types import insights_config from .client import InsightsConfigServiceClient from .transports.base import DEFAULT_CLIENT_INFO, InsightsConfigServiceTransport @@ -141,7 +140,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: InsightsConfigServiceAsyncClient: The constructed client. """ - return InsightsConfigServiceClient.from_service_account_info.__func__(InsightsConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + InsightsConfigServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(InsightsConfigServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +159,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: InsightsConfigServiceAsyncClient: The constructed client. """ - return InsightsConfigServiceClient.from_service_account_file.__func__(InsightsConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + InsightsConfigServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(InsightsConfigServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -195,7 +200,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return InsightsConfigServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return InsightsConfigServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> InsightsConfigServiceTransport: diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/client.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/client.py index fde7e7a4c70a..9e70f5554b1b 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/client.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.developerconnect_v1 import gapic_version as package_version @@ -63,18 +63,17 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.developerconnect_v1.services.insights_config_service import pagers +from google.cloud.developerconnect_v1.types import developer_connect, insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import developer_connect -from google.cloud.developerconnect_v1.types import insights_config from .transports.base import DEFAULT_CLIENT_INFO, InsightsConfigServiceTransport from .transports.grpc import InsightsConfigServiceGrpcTransport @@ -90,9 +89,7 @@ class InsightsConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InsightsConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InsightsConfigServiceTransport]] _transport_registry["grpc"] = InsightsConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = InsightsConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = InsightsConfigServiceRestTransport @@ -648,11 +645,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InsightsConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InsightsConfigServiceClient._read_environment_variables() + ) self._client_cert_source = InsightsConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -687,8 +682,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InsightsConfigServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/pagers.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/pagers.py index 4410381dfe1e..67d078aa1704 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/pagers.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/__init__.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/__init__.py index c0c4565b394b..79e16206791b 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/__init__.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InsightsConfigServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InsightsConfigServiceTransport]] _transport_registry["grpc"] = InsightsConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = InsightsConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = InsightsConfigServiceRestTransport diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/base.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/base.py index a91821d93a31..d47f27135b6c 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/base.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/base.py @@ -17,21 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.developerconnect_v1 import gapic_version as package_version +from google.cloud.developerconnect_v1.types import insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import insights_config DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -286,13 +286,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc.py index 4fcaeb0e1b44..b02a5c7d7461 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc.py @@ -16,24 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.developerconnect_v1.types import insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import insights_config from .base import DEFAULT_CLIENT_INFO, InsightsConfigServiceTransport diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc_asyncio.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc_asyncio.py index f5f7f2b2b23a..3a4a39233091 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,15 +31,12 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.developerconnect_v1.types import insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import insights_config from .base import DEFAULT_CLIENT_INFO, InsightsConfigServiceTransport from .grpc import InsightsConfigServiceGrpcTransport diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest.py index 392a451d08f3..7c39ec2dcac5 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest.py @@ -16,24 +16,24 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.developerconnect_v1.types import insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import insights_config from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseInsightsConfigServiceRestTransport @@ -728,9 +728,7 @@ def __call__( """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseCreateInsightsConfig._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseCreateInsightsConfig._get_http_options() request, metadata = self._interceptor.pre_create_insights_config( request, metadata @@ -884,9 +882,7 @@ def __call__( """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseDeleteInsightsConfig._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseDeleteInsightsConfig._get_http_options() request, metadata = self._interceptor.pre_delete_insights_config( request, metadata @@ -1040,9 +1036,7 @@ def __call__( """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseGetInsightsConfig._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseGetInsightsConfig._get_http_options() request, metadata = self._interceptor.pre_get_insights_config( request, metadata @@ -1192,9 +1186,7 @@ def __call__( """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseListInsightsConfigs._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseListInsightsConfigs._get_http_options() request, metadata = self._interceptor.pre_list_insights_configs( request, metadata @@ -1348,9 +1340,7 @@ def __call__( """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseUpdateInsightsConfig._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseUpdateInsightsConfig._get_http_options() request, metadata = self._interceptor.pre_update_insights_config( request, metadata @@ -1554,9 +1544,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseInsightsConfigServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1695,9 +1683,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseInsightsConfigServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1834,9 +1820,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1956,9 +1940,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2076,9 +2058,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseInsightsConfigServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2217,9 +2197,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseInsightsConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest_base.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest_base.py index ed878a13c558..5dbf10bdaf8c 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest_base.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest_base.py @@ -22,10 +22,10 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.developerconnect_v1.types import insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import insights_config from .base import DEFAULT_CLIENT_INFO, InsightsConfigServiceTransport diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/developer_connect.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/developer_connect.py index 494e0baa320b..307a524f0b5b 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/developer_connect.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/developer_connect.py @@ -119,6 +119,7 @@ class SystemProvider(proto.Enum): DYNATRACE (8): Dynatrace provider. """ + SYSTEM_PROVIDER_UNSPECIFIED = 0 GITHUB = 1 GITLAB = 2 @@ -460,6 +461,7 @@ class Stage(proto.Enum): COMPLETE (10): Installation process has been completed. """ + STAGE_UNSPECIFIED = 0 PENDING_CREATE_APP = 1 PENDING_USER_OAUTH = 2 @@ -516,6 +518,7 @@ class GitHubApp(proto.Enum): FIREBASE (2): The Firebase GitHub Application. """ + GIT_HUB_APP_UNSPECIFIED = 0 DEVELOPER_CONNECT = 1 FIREBASE = 2 @@ -2138,12 +2141,12 @@ class FetchLinkableGitRepositoriesResponse(proto.Message): def raw_page(self): return self - linkable_git_repositories: MutableSequence[ - "LinkableGitRepository" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="LinkableGitRepository", + linkable_git_repositories: MutableSequence["LinkableGitRepository"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="LinkableGitRepository", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -2252,6 +2255,7 @@ class RefType(proto.Enum): BRANCH (2): To fetch branches. """ + REF_TYPE_UNSPECIFIED = 0 TAG = 1 BRANCH = 2 diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/insights_config.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/insights_config.py index 8b1ea3d2e730..1af3cf6ca1ec 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/insights_config.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/insights_config.py @@ -115,6 +115,7 @@ class State(proto.Enum): ERROR (4): The InsightsConfig is in an error state. """ + STATE_UNSPECIFIED = 0 PENDING = 5 COMPLETE = 3 @@ -214,6 +215,7 @@ class State(proto.Enum): The runtime configuration has been unlinked to the InsightsConfig. """ + STATE_UNSPECIFIED = 0 LINKED = 1 UNLINKED = 2 diff --git a/packages/google-cloud-developerconnect/mypy.ini b/packages/google-cloud-developerconnect/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-developerconnect/mypy.ini +++ b/packages/google-cloud-developerconnect/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-developerconnect/noxfile.py b/packages/google-cloud-developerconnect/noxfile.py index 4053f3537c41..79d388d27c91 100644 --- a/packages/google-cloud-developerconnect/noxfile.py +++ b/packages/google-cloud-developerconnect/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_developer_connect.py b/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_developer_connect.py index dc26d4f43ab1..7ea7c99daaba 100644 --- a/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_developer_connect.py +++ b/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_developer_connect.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.developerconnect_v1.services.developer_connect import ( DeveloperConnectAsyncClient, @@ -984,10 +984,9 @@ def test_developer_connect_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1031,9 @@ def test_developer_connect_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1071,10 +1069,9 @@ def test_developer_connect_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1326,9 +1323,7 @@ def test_developer_connect_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1443,9 +1438,9 @@ def test_list_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -2307,9 +2302,9 @@ def test_create_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -2691,9 +2686,9 @@ def test_update_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) @@ -3071,9 +3066,9 @@ def test_delete_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -5067,9 +5062,9 @@ def test_fetch_read_write_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_write_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_write_token] = ( + mock_rpc + ) request = {} client.fetch_read_write_token(request) @@ -5407,9 +5402,9 @@ def test_fetch_read_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_token] = ( + mock_rpc + ) request = {} client.fetch_read_token(request) @@ -7724,9 +7719,9 @@ def test_get_account_connector_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_account_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_account_connector] = ( + mock_rpc + ) request = {} client.get_account_connector(request) @@ -9191,9 +9186,9 @@ def test_fetch_access_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_access_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_access_token] = ( + mock_rpc + ) request = {} client.fetch_access_token(request) @@ -10971,9 +10966,9 @@ def test_list_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -11413,9 +11408,9 @@ def test_create_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -11641,9 +11636,9 @@ def test_update_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) @@ -11854,9 +11849,9 @@ def test_delete_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -12941,9 +12936,9 @@ def test_fetch_read_write_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_write_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_write_token] = ( + mock_rpc + ) request = {} client.fetch_read_write_token(request) @@ -13126,9 +13121,9 @@ def test_fetch_read_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_token] = ( + mock_rpc + ) request = {} client.fetch_read_token(request) @@ -14313,9 +14308,9 @@ def test_get_account_connector_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_account_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_account_connector] = ( + mock_rpc + ) request = {} client.get_account_connector(request) @@ -15144,9 +15139,9 @@ def test_fetch_access_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_access_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_access_token] = ( + mock_rpc + ) request = {} client.fetch_access_token(request) diff --git a/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_insights_config_service.py b/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_insights_config_service.py index 2a90915b4623..d5d5f2a44221 100644 --- a/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_insights_config_service.py +++ b/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_insights_config_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.developerconnect_v1.services.insights_config_service import ( InsightsConfigServiceAsyncClient, @@ -73,11 +73,10 @@ pagers, transports, ) +from google.cloud.developerconnect_v1.types import developer_connect, insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import developer_connect -from google.cloud.developerconnect_v1.types import insights_config CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1013,10 +1012,9 @@ def test_insights_config_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_insights_config_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1097,9 @@ def test_insights_config_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1363,9 +1359,7 @@ def test_insights_config_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1487,9 +1481,9 @@ def test_list_insights_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_insights_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_insights_configs] = ( + mock_rpc + ) request = {} client.list_insights_configs(request) @@ -2033,9 +2027,9 @@ def test_create_insights_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_insights_config] = ( + mock_rpc + ) request = {} client.create_insights_config(request) @@ -2419,9 +2413,9 @@ def test_get_insights_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_insights_config] = ( + mock_rpc + ) request = {} client.get_insights_config(request) @@ -2759,9 +2753,9 @@ def test_update_insights_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_insights_config] = ( + mock_rpc + ) request = {} client.update_insights_config(request) @@ -3022,9 +3016,9 @@ def test_delete_insights_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_insights_config] = ( + mock_rpc + ) request = {} client.delete_insights_config(request) @@ -3304,9 +3298,9 @@ def test_list_insights_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_insights_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_insights_configs] = ( + mock_rpc + ) request = {} client.list_insights_configs(request) @@ -3569,9 +3563,9 @@ def test_create_insights_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_insights_config] = ( + mock_rpc + ) request = {} client.create_insights_config(request) @@ -3793,9 +3787,9 @@ def test_get_insights_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_insights_config] = ( + mock_rpc + ) request = {} client.get_insights_config(request) @@ -3978,9 +3972,9 @@ def test_update_insights_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_insights_config] = ( + mock_rpc + ) request = {} client.update_insights_config(request) @@ -4117,9 +4111,9 @@ def test_delete_insights_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_insights_config] = ( + mock_rpc + ) request = {} client.delete_insights_config(request) diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/__init__.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/__init__.py index 51d72d1b5407..fdf77b600aed 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/__init__.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.direct_access_service import ( DirectAccessServiceAsyncClient, DirectAccessServiceClient, diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/async_client.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/async_client.py index 0d349aa1c249..0b11f5f21450 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/async_client.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devicestreaming_v1 import gapic_version as package_version @@ -133,7 +133,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DirectAccessServiceAsyncClient: The constructed client. """ - return DirectAccessServiceClient.from_service_account_info.__func__(DirectAccessServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DirectAccessServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DirectAccessServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +152,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DirectAccessServiceAsyncClient: The constructed client. """ - return DirectAccessServiceClient.from_service_account_file.__func__(DirectAccessServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DirectAccessServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DirectAccessServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -187,7 +193,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DirectAccessServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DirectAccessServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DirectAccessServiceTransport: diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/client.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/client.py index 4e0af30494ed..dad0087218a4 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/client.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devicestreaming_v1 import gapic_version as package_version @@ -84,9 +84,7 @@ class DirectAccessServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DirectAccessServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DirectAccessServiceTransport]] _transport_registry["grpc"] = DirectAccessServiceGrpcTransport _transport_registry["grpc_asyncio"] = DirectAccessServiceGrpcAsyncIOTransport _transport_registry["rest"] = DirectAccessServiceRestTransport @@ -638,11 +636,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DirectAccessServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DirectAccessServiceClient._read_environment_variables() + ) self._client_cert_source = DirectAccessServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +673,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DirectAccessServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/pagers.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/pagers.py index 3a9ad8f29d5a..c0660e6891ef 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/pagers.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/__init__.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/__init__.py index 44959cda490a..d93a293d17f0 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/__init__.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import DirectAccessServiceRestInterceptor, DirectAccessServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DirectAccessServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DirectAccessServiceTransport]] _transport_registry["grpc"] = DirectAccessServiceGrpcTransport _transport_registry["grpc_asyncio"] = DirectAccessServiceGrpcAsyncIOTransport _transport_registry["rest"] = DirectAccessServiceRestTransport diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/base.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/base.py index fd991189ab40..0c1fc2113cd5 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/base.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.devicestreaming_v1 import gapic_version as package_version from google.cloud.devicestreaming_v1.types import adb_service, service diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc.py index 5644de2ea882..0c23abc7fca7 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.devicestreaming_v1.types import adb_service, service diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc_asyncio.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc_asyncio.py index 250246d0dc40..78e8b79b1fd3 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.devicestreaming_v1.types import adb_service, service diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest.py index 24f5471492ec..e3089c97401b 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.devicestreaming_v1.types import adb_service, service @@ -493,9 +493,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDirectAccessServiceRestTransport._BaseCancelDeviceSession._get_http_options() - ) + http_options = _BaseDirectAccessServiceRestTransport._BaseCancelDeviceSession._get_http_options() request, metadata = self._interceptor.pre_cancel_device_session( request, metadata @@ -617,9 +615,7 @@ def __call__( """ - http_options = ( - _BaseDirectAccessServiceRestTransport._BaseCreateDeviceSession._get_http_options() - ) + http_options = _BaseDirectAccessServiceRestTransport._BaseCreateDeviceSession._get_http_options() request, metadata = self._interceptor.pre_create_device_session( request, metadata @@ -774,9 +770,7 @@ def __call__( """ - http_options = ( - _BaseDirectAccessServiceRestTransport._BaseGetDeviceSession._get_http_options() - ) + http_options = _BaseDirectAccessServiceRestTransport._BaseGetDeviceSession._get_http_options() request, metadata = self._interceptor.pre_get_device_session( request, metadata @@ -924,9 +918,7 @@ def __call__( """ - http_options = ( - _BaseDirectAccessServiceRestTransport._BaseListDeviceSessions._get_http_options() - ) + http_options = _BaseDirectAccessServiceRestTransport._BaseListDeviceSessions._get_http_options() request, metadata = self._interceptor.pre_list_device_sessions( request, metadata @@ -1079,9 +1071,7 @@ def __call__( """ - http_options = ( - _BaseDirectAccessServiceRestTransport._BaseUpdateDeviceSession._get_http_options() - ) + http_options = _BaseDirectAccessServiceRestTransport._BaseUpdateDeviceSession._get_http_options() request, metadata = self._interceptor.pre_update_device_session( request, metadata diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest_base.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest_base.py index d7e72ea83026..51f34526291d 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest_base.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.devicestreaming_v1.types import adb_service, service diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/adb_service.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/adb_service.py index 8dfa40c49173..691ff082d62a 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/adb_service.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/adb_service.py @@ -158,6 +158,7 @@ class DeviceState(proto.Enum): CONNECTING (14): The ADB device is in the "connecting" status. """ + DEVICE_STATE_UNSPECIFIED = 0 DEVICE = 1 RECOVERY = 2 diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/service.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/service.py index c0110cc28f2a..88abc51f41d1 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/service.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/service.py @@ -275,6 +275,7 @@ class SessionState(proto.Enum): internal reason, such as an infrastructure failure. """ + SESSION_STATE_UNSPECIFIED = 0 REQUESTED = 1 PENDING = 2 diff --git a/packages/google-cloud-devicestreaming/mypy.ini b/packages/google-cloud-devicestreaming/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-devicestreaming/mypy.ini +++ b/packages/google-cloud-devicestreaming/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-devicestreaming/noxfile.py b/packages/google-cloud-devicestreaming/noxfile.py index a09da8362ff7..80f8eaffb7a5 100644 --- a/packages/google-cloud-devicestreaming/noxfile.py +++ b/packages/google-cloud-devicestreaming/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-devicestreaming/tests/unit/gapic/devicestreaming_v1/test_direct_access_service.py b/packages/google-cloud-devicestreaming/tests/unit/gapic/devicestreaming_v1/test_direct_access_service.py index af6c093af1fc..70aff890f92e 100644 --- a/packages/google-cloud-devicestreaming/tests/unit/gapic/devicestreaming_v1/test_direct_access_service.py +++ b/packages/google-cloud-devicestreaming/tests/unit/gapic/devicestreaming_v1/test_direct_access_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -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 google.cloud.devicestreaming_v1.services.direct_access_service import ( DirectAccessServiceAsyncClient, @@ -995,10 +1000,9 @@ def test_direct_access_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1047,9 @@ def test_direct_access_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1085,9 @@ def test_direct_access_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1345,9 +1347,7 @@ def test_direct_access_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1467,9 +1467,9 @@ def test_create_device_session_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_device_session] = ( + mock_rpc + ) request = {} client.create_device_session(request) @@ -1836,9 +1836,9 @@ def test_list_device_sessions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_device_sessions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_device_sessions] = ( + mock_rpc + ) request = {} client.list_device_sessions(request) @@ -2383,9 +2383,9 @@ def test_get_device_session_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_device_session] = ( + mock_rpc + ) request = {} client.get_device_session(request) @@ -2726,9 +2726,9 @@ def test_cancel_device_session_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_device_session] = ( + mock_rpc + ) request = {} client.cancel_device_session(request) @@ -2975,9 +2975,9 @@ def test_update_device_session_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_device_session] = ( + mock_rpc + ) request = {} client.update_device_session(request) @@ -3412,9 +3412,9 @@ def test_create_device_session_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_device_session] = ( + mock_rpc + ) request = {} client.create_device_session(request) @@ -3607,9 +3607,9 @@ def test_list_device_sessions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_device_sessions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_device_sessions] = ( + mock_rpc + ) request = {} client.list_device_sessions(request) @@ -3867,9 +3867,9 @@ def test_get_device_session_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_device_session] = ( + mock_rpc + ) request = {} client.get_device_session(request) @@ -4048,9 +4048,9 @@ def test_cancel_device_session_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_device_session] = ( + mock_rpc + ) request = {} client.cancel_device_session(request) @@ -4171,9 +4171,9 @@ def test_update_device_session_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_device_session] = ( + mock_rpc + ) request = {} client.update_device_session(request) diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/__init__.py index ddec0d64e06c..4739d9dd5b74 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.agents import AgentsAsyncClient, AgentsClient from .services.changelogs import ChangelogsAsyncClient, ChangelogsClient from .services.deployments import DeploymentsAsyncClient, DeploymentsClient diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/async_client.py index 660b97a7d6bf..c07cccd45931 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -46,22 +46,25 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.agents import pagers from google.cloud.dialogflowcx_v3.types import ( - generative_settings as gcdc_generative_settings, + advanced_settings, + agent, + audio_config, + flow, + generative_settings, + safety_settings, ) -from google.cloud.dialogflowcx_v3.types import advanced_settings -from google.cloud.dialogflowcx_v3.types import agent from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import audio_config, flow -from google.cloud.dialogflowcx_v3.types import generative_settings -from google.cloud.dialogflowcx_v3.types import safety_settings +from google.cloud.dialogflowcx_v3.types import ( + generative_settings as gcdc_generative_settings, +) from .client import AgentsClient from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport @@ -147,7 +150,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_info.__func__(AgentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AgentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AgentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -163,7 +169,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_file.__func__(AgentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AgentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AgentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/client.py index a8feac490dbc..b9aab25d3a37 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -63,22 +63,25 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.agents import pagers from google.cloud.dialogflowcx_v3.types import ( - generative_settings as gcdc_generative_settings, + advanced_settings, + agent, + audio_config, + flow, + generative_settings, + safety_settings, ) -from google.cloud.dialogflowcx_v3.types import advanced_settings -from google.cloud.dialogflowcx_v3.types import agent from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import audio_config, flow -from google.cloud.dialogflowcx_v3.types import generative_settings -from google.cloud.dialogflowcx_v3.types import safety_settings +from google.cloud.dialogflowcx_v3.types import ( + generative_settings as gcdc_generative_settings, +) from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport from .transports.grpc import AgentsGrpcTransport @@ -818,11 +821,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AgentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AgentsClient._read_environment_variables() + ) self._client_cert_source = AgentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -857,8 +858,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AgentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/pagers.py index dff514a6dcf0..e8c99473d946 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/base.py index 85de16630508..94c88041f574 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/base.py @@ -17,24 +17,23 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version +from google.cloud.dialogflowcx_v3.types import agent, generative_settings +from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3.types import agent -from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import generative_settings DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -377,7 +376,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc.py index 07dbddad8977..77d18bb72f8b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc.py @@ -16,27 +16,26 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import agent, generative_settings +from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3.types import agent -from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import generative_settings from .base import DEFAULT_CLIENT_INFO, AgentsTransport @@ -610,12 +609,12 @@ def get_agent_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_agent_validation_result" not in self._stubs: - self._stubs[ - "get_agent_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Agents/GetAgentValidationResult", - request_serializer=agent.GetAgentValidationResultRequest.serialize, - response_deserializer=agent.AgentValidationResult.deserialize, + self._stubs["get_agent_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Agents/GetAgentValidationResult", + request_serializer=agent.GetAgentValidationResultRequest.serialize, + response_deserializer=agent.AgentValidationResult.deserialize, + ) ) return self._stubs["get_agent_validation_result"] @@ -669,12 +668,12 @@ def update_generative_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_generative_settings" not in self._stubs: - self._stubs[ - "update_generative_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Agents/UpdateGenerativeSettings", - request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, - response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + self._stubs["update_generative_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Agents/UpdateGenerativeSettings", + request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, + response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + ) ) return self._stubs["update_generative_settings"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc_asyncio.py index 61a41a43dee6..492a770d696a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,19 +31,14 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import agent, generative_settings +from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3.types import agent -from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import generative_settings from .base import DEFAULT_CLIENT_INFO, AgentsTransport from .grpc import AgentsGrpcTransport @@ -622,12 +621,12 @@ def get_agent_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_agent_validation_result" not in self._stubs: - self._stubs[ - "get_agent_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Agents/GetAgentValidationResult", - request_serializer=agent.GetAgentValidationResultRequest.serialize, - response_deserializer=agent.AgentValidationResult.deserialize, + self._stubs["get_agent_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Agents/GetAgentValidationResult", + request_serializer=agent.GetAgentValidationResultRequest.serialize, + response_deserializer=agent.AgentValidationResult.deserialize, + ) ) return self._stubs["get_agent_validation_result"] @@ -682,12 +681,12 @@ def update_generative_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_generative_settings" not in self._stubs: - self._stubs[ - "update_generative_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Agents/UpdateGenerativeSettings", - request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, - response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + self._stubs["update_generative_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Agents/UpdateGenerativeSettings", + request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, + response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + ) ) return self._stubs["update_generative_settings"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest.py index 50ee3dd6a960..fba0b7ef8455 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest.py @@ -16,27 +16,26 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3.types import agent, generative_settings +from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3.types import agent -from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import generative_settings from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAgentsRestTransport @@ -1556,9 +1555,7 @@ def __call__( """ - http_options = ( - _BaseAgentsRestTransport._BaseGetAgentValidationResult._get_http_options() - ) + http_options = _BaseAgentsRestTransport._BaseGetAgentValidationResult._get_http_options() request, metadata = self._interceptor.pre_get_agent_validation_result( request, metadata @@ -2322,9 +2319,7 @@ def __call__( Settings for Generative AI. """ - http_options = ( - _BaseAgentsRestTransport._BaseUpdateGenerativeSettings._get_http_options() - ) + http_options = _BaseAgentsRestTransport._BaseUpdateGenerativeSettings._get_http_options() request, metadata = self._interceptor.pre_update_generative_settings( request, metadata @@ -2610,7 +2605,9 @@ def get_agent_validation_result( ) -> Callable[[agent.GetAgentValidationResultRequest], agent.AgentValidationResult]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetAgentValidationResult(self._session, self._host, self._interceptor) # type: ignore + return self._GetAgentValidationResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_generative_settings( @@ -2655,7 +2652,9 @@ def update_generative_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateGenerativeSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateGenerativeSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def validate_agent( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest_base.py index b49d8e29dd40..3d9405c6ced0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest_base.py @@ -17,18 +17,17 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.dialogflowcx_v3.types import agent, generative_settings +from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3.types import agent -from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import generative_settings from .base import DEFAULT_CLIENT_INFO, AgentsTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/async_client.py index ac36db2fce33..954638a046e3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.changelogs import pagers from google.cloud.dialogflowcx_v3.types import changelog @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ChangelogsAsyncClient: The constructed client. """ - return ChangelogsClient.from_service_account_info.__func__(ChangelogsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ChangelogsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ChangelogsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ChangelogsAsyncClient: The constructed client. """ - return ChangelogsClient.from_service_account_file.__func__(ChangelogsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ChangelogsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ChangelogsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/client.py index ae6e1af62e8e..631b4a61f702 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.changelogs import pagers from google.cloud.dialogflowcx_v3.types import changelog @@ -626,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ChangelogsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ChangelogsClient._read_environment_variables() + ) self._client_cert_source = ChangelogsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ChangelogsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/pagers.py index e21b31c602e8..f6488805d6d8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/base.py index 894b66fd307c..53206bc08cbb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import changelog @@ -232,7 +232,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc.py index 58241b31ee79..e8174678815b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import changelog diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc_asyncio.py index 7da99b3d4f87..088e4b1d1eb3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import changelog diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/rest.py index 2fa84c36f376..d7a8e158da3f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/async_client.py index 5be4d0c76363..ddebd1f8dcfc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.deployments import pagers from google.cloud.dialogflowcx_v3.types import deployment @@ -123,7 +123,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DeploymentsAsyncClient: The constructed client. """ - return DeploymentsClient.from_service_account_info.__func__(DeploymentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DeploymentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DeploymentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +142,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DeploymentsAsyncClient: The constructed client. """ - return DeploymentsClient.from_service_account_file.__func__(DeploymentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DeploymentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DeploymentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/client.py index 6fd6f3632306..e9d3598c34fd 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.deployments import pagers from google.cloud.dialogflowcx_v3.types import deployment @@ -706,11 +706,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DeploymentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DeploymentsClient._read_environment_variables() + ) self._client_cert_source = DeploymentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -745,8 +743,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DeploymentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/pagers.py index f8b5d5a0bc48..7784521dce44 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/base.py index 1d160fe01748..743ed6f1c38b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import deployment @@ -232,7 +232,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc.py index 7592685c943f..9edb32fc68c2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import deployment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc_asyncio.py index 9ef797757fcd..2ed79d2f9415 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import deployment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/rest.py index f7066ecca9e6..d5cecf258fc9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/async_client.py index 48f5a0f6df92..94b66691766d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -46,9 +46,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.entity_types import pagers from google.cloud.dialogflowcx_v3.types import entity_type @@ -118,7 +118,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_info.__func__(EntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EntityTypesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +137,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_file.__func__(EntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EntityTypesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/client.py index 480db221ff75..544032bb44f9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -63,9 +63,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.entity_types import pagers from google.cloud.dialogflowcx_v3.types import entity_type @@ -629,11 +629,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EntityTypesClient._read_environment_variables() + ) self._client_cert_source = EntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -668,8 +666,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/pagers.py index daf261c076a4..c3394c7461d6 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/base.py index 53864e21c1cb..987a9db06d96 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import entity_type @@ -309,7 +309,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc.py index 988ee5302a51..72faf23bec22 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import entity_type from google.cloud.dialogflowcx_v3.types import entity_type as gcdc_entity_type diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc_asyncio.py index 41760182edf6..081bbc261411 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import entity_type from google.cloud.dialogflowcx_v3.types import entity_type as gcdc_entity_type diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest.py index a6c9e9e72df1..0210957a0c8e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3.types import entity_type diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest_base.py index 31463a35c0ee..9e7e39200bcc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3.types import entity_type from google.cloud.dialogflowcx_v3.types import entity_type as gcdc_entity_type diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/async_client.py index 4fd8a834b6b4..a4c22541118c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.environments import pagers from google.cloud.dialogflowcx_v3.types import environment @@ -142,7 +142,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_info.__func__(EnvironmentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EnvironmentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EnvironmentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +161,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_file.__func__(EnvironmentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EnvironmentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EnvironmentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/client.py index 6293c8e8a614..96b0ae805299 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.environments import pagers from google.cloud.dialogflowcx_v3.types import environment @@ -803,11 +803,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EnvironmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EnvironmentsClient._read_environment_variables() + ) self._client_cert_source = EnvironmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -842,8 +840,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EnvironmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/pagers.py index 36095196311d..bb84731a7540 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -381,7 +381,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -457,7 +457,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/base.py index 45299ce28c86..8b910cdc4968 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import environment @@ -343,7 +343,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc.py index 62772231f36b..b97583ce4310 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import environment from google.cloud.dialogflowcx_v3.types import environment as gcdc_environment @@ -528,12 +528,12 @@ def lookup_environment_history( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_environment_history" not in self._stubs: - self._stubs[ - "lookup_environment_history" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Environments/LookupEnvironmentHistory", - request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, - response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + self._stubs["lookup_environment_history"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Environments/LookupEnvironmentHistory", + request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, + response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + ) ) return self._stubs["lookup_environment_history"] @@ -597,12 +597,12 @@ def list_continuous_test_results( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_continuous_test_results" not in self._stubs: - self._stubs[ - "list_continuous_test_results" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Environments/ListContinuousTestResults", - request_serializer=environment.ListContinuousTestResultsRequest.serialize, - response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + self._stubs["list_continuous_test_results"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Environments/ListContinuousTestResults", + request_serializer=environment.ListContinuousTestResultsRequest.serialize, + response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + ) ) return self._stubs["list_continuous_test_results"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc_asyncio.py index f0afa8c90989..5ce0489e34e6 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import environment from google.cloud.dialogflowcx_v3.types import environment as gcdc_environment @@ -539,12 +539,12 @@ def lookup_environment_history( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_environment_history" not in self._stubs: - self._stubs[ - "lookup_environment_history" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Environments/LookupEnvironmentHistory", - request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, - response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + self._stubs["lookup_environment_history"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Environments/LookupEnvironmentHistory", + request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, + response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + ) ) return self._stubs["lookup_environment_history"] @@ -610,12 +610,12 @@ def list_continuous_test_results( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_continuous_test_results" not in self._stubs: - self._stubs[ - "list_continuous_test_results" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Environments/ListContinuousTestResults", - request_serializer=environment.ListContinuousTestResultsRequest.serialize, - response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + self._stubs["list_continuous_test_results"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Environments/ListContinuousTestResults", + request_serializer=environment.ListContinuousTestResultsRequest.serialize, + response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + ) ) return self._stubs["list_continuous_test_results"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest.py index b400e47662a9..98f1890728ac 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3.types import environment @@ -888,9 +888,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() request, metadata = self._interceptor.pre_create_environment( request, metadata @@ -1034,9 +1032,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() request, metadata = self._interceptor.pre_delete_environment( request, metadata @@ -1469,9 +1465,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseListContinuousTestResults._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseListContinuousTestResults._get_http_options() request, metadata = self._interceptor.pre_list_continuous_test_results( request, metadata @@ -1775,9 +1769,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseLookupEnvironmentHistory._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseLookupEnvironmentHistory._get_http_options() request, metadata = self._interceptor.pre_lookup_environment_history( request, metadata @@ -1930,9 +1922,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseRunContinuousTest._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseRunContinuousTest._get_http_options() request, metadata = self._interceptor.pre_run_continuous_test( request, metadata @@ -2084,9 +2074,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() request, metadata = self._interceptor.pre_update_environment( request, metadata @@ -2222,7 +2210,9 @@ def list_continuous_test_results( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListContinuousTestResults(self._session, self._host, self._interceptor) # type: ignore + return self._ListContinuousTestResults( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_environments( @@ -2243,7 +2233,9 @@ def lookup_environment_history( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._LookupEnvironmentHistory(self._session, self._host, self._interceptor) # type: ignore + return self._LookupEnvironmentHistory( + self._session, self._host, self._interceptor + ) # type: ignore @property def run_continuous_test( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest_base.py index 78787cf39ad8..4cb4f1830871 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3.types import environment from google.cloud.dialogflowcx_v3.types import environment as gcdc_environment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/async_client.py index a27eec812e2d..2e6d6ae94022 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,15 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.examples import pagers -from google.cloud.dialogflowcx_v3.types import example +from google.cloud.dialogflowcx_v3.types import example, trace from google.cloud.dialogflowcx_v3.types import example as gcdc_example -from google.cloud.dialogflowcx_v3.types import trace from .client import ExamplesClient from .transports.base import DEFAULT_CLIENT_INFO, ExamplesTransport @@ -120,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ExamplesAsyncClient: The constructed client. """ - return ExamplesClient.from_service_account_info.__func__(ExamplesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ExamplesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ExamplesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ExamplesAsyncClient: The constructed client. """ - return ExamplesClient.from_service_account_file.__func__(ExamplesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ExamplesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ExamplesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/client.py index 2856b32699cf..1046636963fd 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,15 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.examples import pagers -from google.cloud.dialogflowcx_v3.types import example +from google.cloud.dialogflowcx_v3.types import example, trace from google.cloud.dialogflowcx_v3.types import example as gcdc_example -from google.cloud.dialogflowcx_v3.types import trace from .transports.base import DEFAULT_CLIENT_INFO, ExamplesTransport from .transports.grpc import ExamplesGrpcTransport @@ -703,11 +702,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ExamplesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ExamplesClient._read_environment_variables() + ) self._client_cert_source = ExamplesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -742,8 +739,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ExamplesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/pagers.py index 165405921244..c077654c8764 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/base.py index 4bc6b5b72eaa..9f005358afbf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import example @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc.py index 8975708be289..f3b2957dd3d9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import example from google.cloud.dialogflowcx_v3.types import example as gcdc_example diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc_asyncio.py index b99132df4753..b4785d153875 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import example from google.cloud.dialogflowcx_v3.types import example as gcdc_example diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest.py index 158785032e59..f89ea829156e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3.types import example diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest_base.py index 2a4c08fb4dff..8e251839cd7b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3.types import example from google.cloud.dialogflowcx_v3.types import example as gcdc_example diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/async_client.py index b9d8f3a2a174..821f44231910 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,11 +44,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore 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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.experiments import pagers from google.cloud.dialogflowcx_v3.types import experiment @@ -120,7 +120,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ExperimentsAsyncClient: The constructed client. """ - return ExperimentsClient.from_service_account_info.__func__(ExperimentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ExperimentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ExperimentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +139,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ExperimentsAsyncClient: The constructed client. """ - return ExperimentsClient.from_service_account_file.__func__(ExperimentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ExperimentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ExperimentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/client.py index 7a4012f811d8..338eda572f15 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore 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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.experiments import pagers from google.cloud.dialogflowcx_v3.types import experiment @@ -657,11 +657,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ExperimentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ExperimentsClient._read_environment_variables() + ) self._client_cert_source = ExperimentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -696,8 +694,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ExperimentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/pagers.py index acba2705a329..75e10ad999cf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/base.py index b584eba6700a..42b3036e30a8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import experiment @@ -304,7 +304,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc.py index 2b3fcb993802..a070fcb76d84 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import experiment from google.cloud.dialogflowcx_v3.types import experiment as gcdc_experiment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc_asyncio.py index 579ef881aaaf..68a50153c3ca 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import experiment from google.cloud.dialogflowcx_v3.types import experiment as gcdc_experiment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest.py index 7f7ad05aa509..4eaa4b0f7ffd 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3.types import experiment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest_base.py index 203614c6d768..ad048d425e5f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3.types import experiment from google.cloud.dialogflowcx_v3.types import experiment as gcdc_experiment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/async_client.py index f53e2578cb71..b8cd941dc6d0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -46,21 +46,21 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.flows import pagers from google.cloud.dialogflowcx_v3.types import ( + advanced_settings, + flow, page, parameter_definition, validation_message, ) -from google.cloud.dialogflowcx_v3.types import advanced_settings -from google.cloud.dialogflowcx_v3.types import flow from google.cloud.dialogflowcx_v3.types import flow as gcdc_flow from .client import FlowsClient @@ -139,7 +139,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FlowsAsyncClient: The constructed client. """ - return FlowsClient.from_service_account_info.__func__(FlowsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + FlowsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(FlowsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +158,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FlowsAsyncClient: The constructed client. """ - return FlowsClient.from_service_account_file.__func__(FlowsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + FlowsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(FlowsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/client.py index 95d33a15db76..004e0fc40bd8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -63,21 +63,21 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.flows import pagers from google.cloud.dialogflowcx_v3.types import ( + advanced_settings, + flow, page, parameter_definition, validation_message, ) -from google.cloud.dialogflowcx_v3.types import advanced_settings -from google.cloud.dialogflowcx_v3.types import flow from google.cloud.dialogflowcx_v3.types import flow as gcdc_flow from .transports.base import DEFAULT_CLIENT_INFO, FlowsTransport @@ -832,11 +832,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FlowsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FlowsClient._read_environment_variables() + ) self._client_cert_source = FlowsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -871,8 +869,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FlowsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/pagers.py index 998d471c1b39..8a257458a14f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/base.py index bc7e1f4483f5..a81c06297556 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import flow @@ -342,7 +342,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc.py index 1772e5b3bb4b..90ab9be654e8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import flow from google.cloud.dialogflowcx_v3.types import flow as gcdc_flow @@ -558,12 +558,12 @@ def get_flow_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_flow_validation_result" not in self._stubs: - self._stubs[ - "get_flow_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Flows/GetFlowValidationResult", - request_serializer=flow.GetFlowValidationResultRequest.serialize, - response_deserializer=flow.FlowValidationResult.deserialize, + self._stubs["get_flow_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Flows/GetFlowValidationResult", + request_serializer=flow.GetFlowValidationResultRequest.serialize, + response_deserializer=flow.FlowValidationResult.deserialize, + ) ) return self._stubs["get_flow_validation_result"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc_asyncio.py index 42eb67b1803d..8f24ea95f159 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import flow from google.cloud.dialogflowcx_v3.types import flow as gcdc_flow @@ -578,12 +578,12 @@ def get_flow_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_flow_validation_result" not in self._stubs: - self._stubs[ - "get_flow_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Flows/GetFlowValidationResult", - request_serializer=flow.GetFlowValidationResultRequest.serialize, - response_deserializer=flow.FlowValidationResult.deserialize, + self._stubs["get_flow_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Flows/GetFlowValidationResult", + request_serializer=flow.GetFlowValidationResultRequest.serialize, + response_deserializer=flow.FlowValidationResult.deserialize, + ) ) return self._stubs["get_flow_validation_result"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest.py index f946a41438d8..b1779ec7193a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3.types import flow @@ -2407,7 +2407,9 @@ def get_flow_validation_result( ) -> Callable[[flow.GetFlowValidationResultRequest], flow.FlowValidationResult]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetFlowValidationResult(self._session, self._host, self._interceptor) # type: ignore + return self._GetFlowValidationResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_flow( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest_base.py index 9847129bf536..d60f4ba020e0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3.types import flow from google.cloud.dialogflowcx_v3.types import flow as gcdc_flow diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/async_client.py index 5dba8e53211e..622f120f148c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,13 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.generators import pagers -from google.cloud.dialogflowcx_v3.types import generative_settings -from google.cloud.dialogflowcx_v3.types import generator +from google.cloud.dialogflowcx_v3.types import generative_settings, generator from google.cloud.dialogflowcx_v3.types import generator as gcdc_generator from .client import GeneratorsClient @@ -115,7 +114,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_info.__func__(GeneratorsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GeneratorsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GeneratorsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +133,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_file.__func__(GeneratorsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GeneratorsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(GeneratorsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/client.py index b14f92f020fc..f41c3ec83e82 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,13 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.generators import pagers -from google.cloud.dialogflowcx_v3.types import generative_settings -from google.cloud.dialogflowcx_v3.types import generator +from google.cloud.dialogflowcx_v3.types import generative_settings, generator from google.cloud.dialogflowcx_v3.types import generator as gcdc_generator from .transports.base import DEFAULT_CLIENT_INFO, GeneratorsTransport @@ -628,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GeneratorsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GeneratorsClient._read_environment_variables() + ) self._client_cert_source = GeneratorsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GeneratorsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/pagers.py index e7b8cb79b5b6..1ff74a99d953 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/base.py index d1e956ce2892..8476d0061327 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import generator @@ -276,7 +276,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc.py index d8d41b33d80b..4a2e6efc6419 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import generator from google.cloud.dialogflowcx_v3.types import generator as gcdc_generator diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc_asyncio.py index dc4ddb5c65fc..e091aa6e6311 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import generator from google.cloud.dialogflowcx_v3.types import generator as gcdc_generator diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest.py index 841cf0e0b387..79fa7f13003d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3.types import generator diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest_base.py index 9a525c2e5963..aaa0d0e971c0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3.types import generator from google.cloud.dialogflowcx_v3.types import generator as gcdc_generator diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/async_client.py index d103690ba3d5..5a17c56c4578 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -46,9 +46,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.intents import pagers from google.cloud.dialogflowcx_v3.types import intent @@ -116,7 +116,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_info.__func__(IntentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + IntentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(IntentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +135,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_file.__func__(IntentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + IntentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(IntentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/client.py index 22df264c7e15..46b03517e279 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -63,9 +63,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.intents import pagers from google.cloud.dialogflowcx_v3.types import intent @@ -653,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IntentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IntentsClient._read_environment_variables() + ) self._client_cert_source = IntentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -692,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IntentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/pagers.py index 8e7830e630b3..549b5c1fca40 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/base.py index 1a44e160b05b..ae0c822f2b64 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import intent @@ -304,7 +304,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc.py index b907cdfa5655..1dfe7fd1c37e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import intent from google.cloud.dialogflowcx_v3.types import intent as gcdc_intent diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc_asyncio.py index 27a6f0f8de03..48b99b5f1d5b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import intent from google.cloud.dialogflowcx_v3.types import intent as gcdc_intent diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest.py index 9e995ca85148..c24477b46457 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3.types import intent diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest_base.py index 6869df22a777..9a707f44ea70 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3.types import intent from google.cloud.dialogflowcx_v3.types import intent as gcdc_intent diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/async_client.py index 211b135cf411..61ed1dd0a1a9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,13 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.pages import pagers -from google.cloud.dialogflowcx_v3.types import advanced_settings, fulfillment -from google.cloud.dialogflowcx_v3.types import page +from google.cloud.dialogflowcx_v3.types import advanced_settings, fulfillment, page from google.cloud.dialogflowcx_v3.types import page as gcdc_page from .client import PagesClient @@ -127,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PagesAsyncClient: The constructed client. """ - return PagesClient.from_service_account_info.__func__(PagesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PagesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PagesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +145,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PagesAsyncClient: The constructed client. """ - return PagesClient.from_service_account_file.__func__(PagesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PagesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PagesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/client.py index 0e6282c1018a..c2d25e68f0e6 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,13 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.pages import pagers -from google.cloud.dialogflowcx_v3.types import advanced_settings, fulfillment -from google.cloud.dialogflowcx_v3.types import page +from google.cloud.dialogflowcx_v3.types import advanced_settings, fulfillment, page from google.cloud.dialogflowcx_v3.types import page as gcdc_page from .transports.base import DEFAULT_CLIENT_INFO, PagesTransport @@ -822,11 +821,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PagesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PagesClient._read_environment_variables() + ) self._client_cert_source = PagesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -861,8 +858,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PagesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/pagers.py index afa52530268b..39e778dc5a1a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/base.py index 92892dc165a0..8a2bc8fba0d7 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import page @@ -267,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc.py index 30916537ca32..7c41c9d8ef98 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import page from google.cloud.dialogflowcx_v3.types import page as gcdc_page diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc_asyncio.py index bb034f877b6a..18f5746584e2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import page from google.cloud.dialogflowcx_v3.types import page as gcdc_page diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest.py index d972e808e74b..889bd08712d2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3.types import page diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest_base.py index c06db5b02bd7..9c7699ed462c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3.types import page from google.cloud.dialogflowcx_v3.types import page as gcdc_page diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/async_client.py index 76bebfa25ae6..8f823c1d5820 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.playbooks import pagers from google.cloud.dialogflowcx_v3.types import ( @@ -58,8 +58,8 @@ example, generative_settings, parameter_definition, + playbook, ) -from google.cloud.dialogflowcx_v3.types import playbook from google.cloud.dialogflowcx_v3.types import playbook as gcdc_playbook from .client import PlaybooksClient @@ -138,7 +138,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PlaybooksAsyncClient: The constructed client. """ - return PlaybooksClient.from_service_account_info.__func__(PlaybooksAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PlaybooksClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PlaybooksAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +157,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PlaybooksAsyncClient: The constructed client. """ - return PlaybooksClient.from_service_account_file.__func__(PlaybooksAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PlaybooksClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PlaybooksAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/client.py index b4c3ebb04c8b..2b7d8832261d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.playbooks import pagers from google.cloud.dialogflowcx_v3.types import ( @@ -75,8 +75,8 @@ example, generative_settings, parameter_definition, + playbook, ) -from google.cloud.dialogflowcx_v3.types import playbook from google.cloud.dialogflowcx_v3.types import playbook as gcdc_playbook from .transports.base import DEFAULT_CLIENT_INFO, PlaybooksTransport @@ -785,11 +785,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PlaybooksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PlaybooksClient._read_environment_variables() + ) self._client_cert_source = PlaybooksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -824,8 +822,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PlaybooksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/pagers.py index 992ec0b013c7..c1e201deb4cb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/base.py index a7655b6e1020..b2eab4acc75e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import playbook @@ -384,7 +384,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc.py index 429b0539c37c..a6366604502a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import playbook from google.cloud.dialogflowcx_v3.types import playbook as gcdc_playbook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc_asyncio.py index fd2eacd9d5ed..e9d20c4fecdd 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import playbook from google.cloud.dialogflowcx_v3.types import playbook as gcdc_playbook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest.py index 41da500a50bb..0346cd2bed0f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3.types import playbook @@ -1169,9 +1169,7 @@ def __call__( """ - http_options = ( - _BasePlaybooksRestTransport._BaseCreatePlaybookVersion._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseCreatePlaybookVersion._get_http_options() request, metadata = self._interceptor.pre_create_playbook_version( request, metadata @@ -1428,9 +1426,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePlaybooksRestTransport._BaseDeletePlaybookVersion._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseDeletePlaybookVersion._get_http_options() request, metadata = self._interceptor.pre_delete_playbook_version( request, metadata @@ -2319,9 +2315,7 @@ def __call__( """ - http_options = ( - _BasePlaybooksRestTransport._BaseListPlaybookVersions._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseListPlaybookVersions._get_http_options() request, metadata = self._interceptor.pre_list_playbook_versions( request, metadata @@ -2471,9 +2465,7 @@ def __call__( """ - http_options = ( - _BasePlaybooksRestTransport._BaseRestorePlaybookVersion._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseRestorePlaybookVersion._get_http_options() request, metadata = self._interceptor.pre_restore_playbook_version( request, metadata @@ -2831,7 +2823,9 @@ def restore_playbook_version( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RestorePlaybookVersion(self._session, self._host, self._interceptor) # type: ignore + return self._RestorePlaybookVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_playbook( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest_base.py index e26c38639389..533d2e2df072 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3.types import playbook from google.cloud.dialogflowcx_v3.types import playbook as gcdc_playbook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/async_client.py index db9ddf1ce3eb..a4c64ab4a061 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,15 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.security_settings_service import pagers +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings from .client import SecuritySettingsServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport @@ -142,7 +142,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SecuritySettingsServiceAsyncClient: The constructed client. """ - return SecuritySettingsServiceClient.from_service_account_info.__func__(SecuritySettingsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SecuritySettingsServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SecuritySettingsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +161,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SecuritySettingsServiceAsyncClient: The constructed client. """ - return SecuritySettingsServiceClient.from_service_account_file.__func__(SecuritySettingsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SecuritySettingsServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + SecuritySettingsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -196,7 +204,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SecuritySettingsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SecuritySettingsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SecuritySettingsServiceTransport: diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/client.py index f5d223777e5b..9b87a961ebbf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,15 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.security_settings_service import pagers +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings from .transports.base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport from .transports.grpc import SecuritySettingsServiceGrpcTransport @@ -85,9 +85,7 @@ class SecuritySettingsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SecuritySettingsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SecuritySettingsServiceTransport]] _transport_registry["grpc"] = SecuritySettingsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SecuritySettingsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SecuritySettingsServiceRestTransport @@ -677,11 +675,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SecuritySettingsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SecuritySettingsServiceClient._read_environment_variables() + ) self._client_cert_source = ( SecuritySettingsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -718,8 +714,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SecuritySettingsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/pagers.py index 5640610c65b0..ca371dd4f344 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/__init__.py index 3a4ddec2334f..00bac1766862 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SecuritySettingsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SecuritySettingsServiceTransport]] _transport_registry["grpc"] = SecuritySettingsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SecuritySettingsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SecuritySettingsServiceRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/base.py index 671e0295b591..bbd821d66e0f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc.py index 824d135faf33..3c63df28735d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings from .base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc_asyncio.py index 13c4c8ca0904..a2985ad373ff 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings from .base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport from .grpc import SecuritySettingsServiceGrpcTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest.py index b360ce69dad4..064b33984345 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSecuritySettingsServiceRestTransport @@ -614,9 +614,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseCreateSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseCreateSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_create_security_settings( request, metadata @@ -765,9 +763,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseDeleteSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseDeleteSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_delete_security_settings( request, metadata @@ -885,9 +881,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseGetSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseGetSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_get_security_settings( request, metadata @@ -1039,9 +1033,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseListSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseListSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_list_security_settings( request, metadata @@ -1196,9 +1188,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseUpdateSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseUpdateSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_update_security_settings( request, metadata @@ -1304,7 +1294,9 @@ def create_security_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSecuritySettings(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecuritySettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_security_settings( @@ -1312,7 +1304,9 @@ def delete_security_settings( ) -> Callable[[security_settings.DeleteSecuritySettingsRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteSecuritySettings(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSecuritySettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_security_settings( @@ -1345,7 +1339,9 @@ def update_security_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateSecuritySettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSecuritySettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1405,9 +1401,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1546,9 +1540,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1686,9 +1678,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1806,9 +1796,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1947,9 +1935,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest_base.py index c28eb94a000c..1412b130fcb1 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings from .base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/async_client.py index 097f0122fb55..9f3ef40b10d4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.session_entity_types import pagers +from google.cloud.dialogflowcx_v3.types import entity_type, session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import entity_type -from google.cloud.dialogflowcx_v3.types import session_entity_type from .client import SessionEntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -127,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_info.__func__(SessionEntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SessionEntityTypesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SessionEntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +145,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_file.__func__(SessionEntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SessionEntityTypesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SessionEntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +186,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SessionEntityTypesTransport: diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/client.py index 90aebe642fa7..942449624303 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.session_entity_types import pagers +from google.cloud.dialogflowcx_v3.types import entity_type, session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import entity_type -from google.cloud.dialogflowcx_v3.types import session_entity_type from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .transports.grpc import SessionEntityTypesGrpcTransport @@ -86,9 +85,7 @@ class SessionEntityTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionEntityTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport @@ -638,11 +635,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionEntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionEntityTypesClient._read_environment_variables() + ) self._client_cert_source = SessionEntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +672,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionEntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/pagers.py index 9f313c583dcb..534fad82c769 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/__init__.py index f94244b2aec5..4e711301d110 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SessionEntityTypesRestInterceptor, SessionEntityTypesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SessionEntityTypesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/base.py index c1c50749df8b..e9aa268639e9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version +from google.cloud.dialogflowcx_v3.types import session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import session_entity_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc.py index c637c6374891..9f44bdb50d59 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -409,12 +409,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -440,12 +440,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -470,12 +470,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc_asyncio.py index d28cf89cd01d..eeb0424838c7 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .grpc import SessionEntityTypesGrpcTransport @@ -417,12 +417,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -448,12 +448,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -478,12 +478,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest.py index 82833959c148..88122a082d30 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3.types import session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import session_entity_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionEntityTypesRestTransport @@ -629,9 +629,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_create_session_entity_type( request, metadata @@ -783,9 +781,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_delete_session_entity_type( request, metadata @@ -916,9 +912,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_get_session_entity_type( request, metadata @@ -1070,9 +1064,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() request, metadata = self._interceptor.pre_list_session_entity_types( request, metadata @@ -1243,9 +1235,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_update_session_entity_type( request, metadata @@ -1353,7 +1343,9 @@ def create_session_entity_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_session_entity_type( @@ -1363,7 +1355,9 @@ def delete_session_entity_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_session_entity_type( @@ -1385,7 +1379,9 @@ def list_session_entity_types( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListSessionEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._ListSessionEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_session_entity_type( @@ -1396,7 +1392,9 @@ def update_session_entity_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1456,9 +1454,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_transcoded_request( @@ -1597,9 +1593,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_transcoded_request( @@ -1735,9 +1729,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1853,9 +1845,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_transcoded_request( @@ -1994,9 +1984,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest_base.py index 8bc6332069de..e70405106f2f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.dialogflowcx_v3.types import session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/async_client.py index 85dc4065918a..2ccb055f8b8f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -144,7 +144,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_info.__func__(SessionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SessionsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SessionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -160,7 +163,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_file.__func__(SessionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SessionsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SessionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/client.py index 3e5803bd3002..e7a3cc1dab07 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -922,11 +922,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionsClient._read_environment_variables() + ) self._client_cert_source = SessionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -961,8 +959,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/base.py index 77d645e290f5..cc4fa9bbd54d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import session @@ -297,7 +297,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc.py index 734ed5393ea5..ebde39da383f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import session @@ -382,12 +382,12 @@ def server_streaming_detect_intent( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "server_streaming_detect_intent" not in self._stubs: - self._stubs[ - "server_streaming_detect_intent" - ] = self._logged_channel.unary_stream( - "/google.cloud.dialogflow.cx.v3.Sessions/ServerStreamingDetectIntent", - request_serializer=session.DetectIntentRequest.serialize, - response_deserializer=session.DetectIntentResponse.deserialize, + self._stubs["server_streaming_detect_intent"] = ( + self._logged_channel.unary_stream( + "/google.cloud.dialogflow.cx.v3.Sessions/ServerStreamingDetectIntent", + request_serializer=session.DetectIntentRequest.serialize, + response_deserializer=session.DetectIntentResponse.deserialize, + ) ) return self._stubs["server_streaming_detect_intent"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc_asyncio.py index 0cab69d5d27d..78eec4e382d2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import session @@ -394,12 +394,12 @@ def server_streaming_detect_intent( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "server_streaming_detect_intent" not in self._stubs: - self._stubs[ - "server_streaming_detect_intent" - ] = self._logged_channel.unary_stream( - "/google.cloud.dialogflow.cx.v3.Sessions/ServerStreamingDetectIntent", - request_serializer=session.DetectIntentRequest.serialize, - response_deserializer=session.DetectIntentResponse.deserialize, + self._stubs["server_streaming_detect_intent"] = ( + self._logged_channel.unary_stream( + "/google.cloud.dialogflow.cx.v3.Sessions/ServerStreamingDetectIntent", + request_serializer=session.DetectIntentRequest.serialize, + response_deserializer=session.DetectIntentResponse.deserialize, + ) ) return self._stubs["server_streaming_detect_intent"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/rest.py index 1abb06645c40..6aee02e55a50 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1087,9 +1087,7 @@ def __call__( """ - http_options = ( - _BaseSessionsRestTransport._BaseServerStreamingDetectIntent._get_http_options() - ) + http_options = _BaseSessionsRestTransport._BaseServerStreamingDetectIntent._get_http_options() request, metadata = self._interceptor.pre_server_streaming_detect_intent( request, metadata @@ -1157,11 +1155,10 @@ def __call__( resp = self._interceptor.post_server_streaming_detect_intent(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_server_streaming_detect_intent_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_server_streaming_detect_intent_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1384,7 +1381,9 @@ def server_streaming_detect_intent( ) -> Callable[[session.DetectIntentRequest], session.DetectIntentResponse]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ServerStreamingDetectIntent(self._session, self._host, self._interceptor) # type: ignore + return self._ServerStreamingDetectIntent( + self._session, self._host, self._interceptor + ) # type: ignore @property def streaming_detect_intent( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/async_client.py index 741a76139bf7..f6d6c6e47d2d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -46,10 +46,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.test_cases import pagers from google.cloud.dialogflowcx_v3.types import test_case @@ -148,7 +148,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TestCasesAsyncClient: The constructed client. """ - return TestCasesClient.from_service_account_info.__func__(TestCasesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + TestCasesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(TestCasesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -164,7 +167,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TestCasesAsyncClient: The constructed client. """ - return TestCasesClient.from_service_account_file.__func__(TestCasesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + TestCasesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(TestCasesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/client.py index b8a7f271339d..da435ad4c385 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -63,10 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.test_cases import pagers from google.cloud.dialogflowcx_v3.types import test_case @@ -923,11 +923,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TestCasesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TestCasesClient._read_environment_variables() + ) self._client_cert_source = TestCasesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -962,8 +960,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TestCasesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/pagers.py index 284820dbff69..6fbb90fc583c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/base.py index 0798a7fb3933..7e8699a2957e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import test_case @@ -384,7 +384,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc.py index bfc80b457752..0d3e72072a6a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import test_case from google.cloud.dialogflowcx_v3.types import test_case as gcdc_test_case diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc_asyncio.py index da0f65de0f07..0f7fa802cf92 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import test_case from google.cloud.dialogflowcx_v3.types import test_case as gcdc_test_case diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest.py index 2ac261891c1e..3db2670ed780 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3.types import test_case @@ -1038,9 +1038,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseTestCasesRestTransport._BaseBatchDeleteTestCases._get_http_options() - ) + http_options = _BaseTestCasesRestTransport._BaseBatchDeleteTestCases._get_http_options() request, metadata = self._interceptor.pre_batch_delete_test_cases( request, metadata diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest_base.py index 2ba38435a64c..135140cdfdff 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3.types import test_case from google.cloud.dialogflowcx_v3.types import test_case as gcdc_test_case diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/async_client.py index 11af5b1a45f7..db64aa322c05 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.tools import pagers from google.cloud.dialogflowcx_v3.types import tool @@ -115,7 +115,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_info.__func__(ToolsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ToolsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ToolsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +134,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_file.__func__(ToolsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ToolsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ToolsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/client.py index bc1e3c982c5f..6d781b4181bd 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.tools import pagers from google.cloud.dialogflowcx_v3.types import tool @@ -698,11 +698,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ToolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ToolsClient._read_environment_variables() + ) self._client_cert_source = ToolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -737,8 +735,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ToolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/pagers.py index b535f268cbd7..20ee4e505833 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/base.py index 33d314e69d3a..f62b9bd3db32 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import tool @@ -339,7 +339,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc.py index 12ab9d045f29..ae15340fe7cf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import tool from google.cloud.dialogflowcx_v3.types import tool as gcdc_tool diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc_asyncio.py index be72837f48cd..e0ec6ee558c2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import tool from google.cloud.dialogflowcx_v3.types import tool as gcdc_tool diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest.py index cea522a3ee7d..42057f0b1179 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3.types import tool diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest_base.py index 3ce322dc6a49..bdac9bcad218 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3.types import tool from google.cloud.dialogflowcx_v3.types import tool as gcdc_tool diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/async_client.py index f91648201238..2aab6423c767 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.transition_route_groups import pagers +from google.cloud.dialogflowcx_v3.types import page, transition_route_group from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import page -from google.cloud.dialogflowcx_v3.types import transition_route_group from .client import TransitionRouteGroupsClient from .transports.base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport @@ -143,7 +142,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TransitionRouteGroupsAsyncClient: The constructed client. """ - return TransitionRouteGroupsClient.from_service_account_info.__func__(TransitionRouteGroupsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + TransitionRouteGroupsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(TransitionRouteGroupsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +161,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TransitionRouteGroupsAsyncClient: The constructed client. """ - return TransitionRouteGroupsClient.from_service_account_file.__func__(TransitionRouteGroupsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + TransitionRouteGroupsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(TransitionRouteGroupsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -197,7 +202,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return TransitionRouteGroupsClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return TransitionRouteGroupsClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> TransitionRouteGroupsTransport: diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/client.py index 2d53059d3be4..e16fbcdeb618 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.transition_route_groups import pagers +from google.cloud.dialogflowcx_v3.types import page, transition_route_group from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import page -from google.cloud.dialogflowcx_v3.types import transition_route_group from .transports.base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport from .transports.grpc import TransitionRouteGroupsGrpcTransport @@ -86,9 +85,7 @@ class TransitionRouteGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TransitionRouteGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TransitionRouteGroupsTransport]] _transport_registry["grpc"] = TransitionRouteGroupsGrpcTransport _transport_registry["grpc_asyncio"] = TransitionRouteGroupsGrpcAsyncIOTransport _transport_registry["rest"] = TransitionRouteGroupsRestTransport @@ -786,11 +783,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TransitionRouteGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TransitionRouteGroupsClient._read_environment_variables() + ) self._client_cert_source = TransitionRouteGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -825,8 +820,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TransitionRouteGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/pagers.py index 5b7142e74e50..86867e9ad779 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -147,7 +147,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/__init__.py index ae6220640bc0..c3a4dc341788 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[TransitionRouteGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[TransitionRouteGroupsTransport]] _transport_registry["grpc"] = TransitionRouteGroupsGrpcTransport _transport_registry["grpc_asyncio"] = TransitionRouteGroupsGrpcAsyncIOTransport _transport_registry["rest"] = TransitionRouteGroupsRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/base.py index 70942a597ffa..02d5e10677b8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version +from google.cloud.dialogflowcx_v3.types import transition_route_group from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import transition_route_group DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc.py index 7f51da2d144a..9c9038076655 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import transition_route_group from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import transition_route_group from .base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport @@ -351,12 +351,12 @@ def list_transition_route_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_transition_route_groups" not in self._stubs: - self._stubs[ - "list_transition_route_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/ListTransitionRouteGroups", - request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, - response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + self._stubs["list_transition_route_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/ListTransitionRouteGroups", + request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, + response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + ) ) return self._stubs["list_transition_route_groups"] @@ -383,12 +383,12 @@ def get_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_transition_route_group" not in self._stubs: - self._stubs[ - "get_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/GetTransitionRouteGroup", - request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, - response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["get_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/GetTransitionRouteGroup", + request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, + response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["get_transition_route_group"] @@ -420,12 +420,12 @@ def create_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_transition_route_group" not in self._stubs: - self._stubs[ - "create_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/CreateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["create_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/CreateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["create_transition_route_group"] @@ -456,12 +456,12 @@ def update_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_transition_route_group" not in self._stubs: - self._stubs[ - "update_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/UpdateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["update_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/UpdateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["update_transition_route_group"] @@ -491,12 +491,12 @@ def delete_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_transition_route_group" not in self._stubs: - self._stubs[ - "delete_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/DeleteTransitionRouteGroup", - request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/DeleteTransitionRouteGroup", + request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_transition_route_group"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc_asyncio.py index bea1d07491bd..537f7ae66b9d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import transition_route_group from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import transition_route_group from .base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport from .grpc import TransitionRouteGroupsGrpcTransport @@ -359,12 +359,12 @@ def list_transition_route_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_transition_route_groups" not in self._stubs: - self._stubs[ - "list_transition_route_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/ListTransitionRouteGroups", - request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, - response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + self._stubs["list_transition_route_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/ListTransitionRouteGroups", + request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, + response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + ) ) return self._stubs["list_transition_route_groups"] @@ -391,12 +391,12 @@ def get_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_transition_route_group" not in self._stubs: - self._stubs[ - "get_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/GetTransitionRouteGroup", - request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, - response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["get_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/GetTransitionRouteGroup", + request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, + response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["get_transition_route_group"] @@ -428,12 +428,12 @@ def create_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_transition_route_group" not in self._stubs: - self._stubs[ - "create_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/CreateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["create_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/CreateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["create_transition_route_group"] @@ -464,12 +464,12 @@ def update_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_transition_route_group" not in self._stubs: - self._stubs[ - "update_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/UpdateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["update_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/UpdateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["update_transition_route_group"] @@ -500,12 +500,12 @@ def delete_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_transition_route_group" not in self._stubs: - self._stubs[ - "delete_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/DeleteTransitionRouteGroup", - request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/DeleteTransitionRouteGroup", + request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_transition_route_group"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest.py index f63cd2d6c338..841b040a5ef8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3.types import transition_route_group from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import transition_route_group from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseTransitionRouteGroupsRestTransport @@ -617,9 +617,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseCreateTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseCreateTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_create_transition_route_group( request, metadata @@ -688,11 +686,10 @@ def __call__( resp = self._interceptor.post_create_transition_route_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_transition_route_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_transition_route_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -774,9 +771,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseDeleteTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseDeleteTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_delete_transition_route_group( request, metadata @@ -893,9 +888,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseGetTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseGetTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_get_transition_route_group( request, metadata @@ -1046,9 +1039,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseListTransitionRouteGroups._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseListTransitionRouteGroups._get_http_options() request, metadata = self._interceptor.pre_list_transition_route_groups( request, metadata @@ -1202,9 +1193,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseUpdateTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseUpdateTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_update_transition_route_group( request, metadata @@ -1273,11 +1262,10 @@ def __call__( resp = self._interceptor.post_update_transition_route_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_transition_route_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_transition_route_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1315,7 +1303,9 @@ def create_transition_route_group( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._CreateTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_transition_route_group( @@ -1325,7 +1315,9 @@ def delete_transition_route_group( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_transition_route_group( @@ -1336,7 +1328,9 @@ def get_transition_route_group( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._GetTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_transition_route_groups( @@ -1347,7 +1341,9 @@ def list_transition_route_groups( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListTransitionRouteGroups(self._session, self._host, self._interceptor) # type: ignore + return self._ListTransitionRouteGroups( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_transition_route_group( @@ -1358,7 +1354,9 @@ def update_transition_route_group( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1418,9 +1416,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseGetLocation._get_transcoded_request( @@ -1559,9 +1555,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseListLocations._get_transcoded_request( @@ -1697,9 +1691,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1817,9 +1809,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseGetOperation._get_transcoded_request( @@ -1958,9 +1948,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest_base.py index 2c6d922f756f..3b2ef4fe0359 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.dialogflowcx_v3.types import transition_route_group from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import transition_route_group from .base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/async_client.py index e87f21112739..b4ec25e963b3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -46,16 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.versions import pagers -from google.cloud.dialogflowcx_v3.types import flow -from google.cloud.dialogflowcx_v3.types import version +from google.cloud.dialogflowcx_v3.types import flow, version from google.cloud.dialogflowcx_v3.types import version as gcdc_version from .client import VersionsClient @@ -118,7 +117,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_info.__func__(VersionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + VersionsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(VersionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +136,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_file.__func__(VersionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + VersionsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(VersionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/client.py index 165ede5df999..a79a8435b407 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -63,16 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.versions import pagers -from google.cloud.dialogflowcx_v3.types import flow -from google.cloud.dialogflowcx_v3.types import version +from google.cloud.dialogflowcx_v3.types import flow, version from google.cloud.dialogflowcx_v3.types import version as gcdc_version from .transports.base import DEFAULT_CLIENT_INFO, VersionsTransport @@ -635,11 +634,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VersionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VersionsClient._read_environment_variables() + ) self._client_cert_source = VersionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -674,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VersionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/pagers.py index a387eab8cad0..7d053d07a929 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/base.py index 379f4f3c8a3a..5db4d1a0b08e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import version @@ -307,7 +307,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc.py index 9ceb153c8364..2a6cf92aa365 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import version from google.cloud.dialogflowcx_v3.types import version as gcdc_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc_asyncio.py index 53e45c255aaa..daebfe08b83a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import version from google.cloud.dialogflowcx_v3.types import version as gcdc_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest.py index fe05af04a919..d219921a0dca 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3.types import version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest_base.py index 7c18213828d6..d622708aea98 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3.types import version from google.cloud.dialogflowcx_v3.types import version as gcdc_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/async_client.py index dab023198ed1..53ef48355e97 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.webhooks import pagers from google.cloud.dialogflowcx_v3.types import webhook @@ -117,7 +117,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: WebhooksAsyncClient: The constructed client. """ - return WebhooksClient.from_service_account_info.__func__(WebhooksAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + WebhooksClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(WebhooksAsyncClient, 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: WebhooksAsyncClient: The constructed client. """ - return WebhooksClient.from_service_account_file.__func__(WebhooksAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + WebhooksClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(WebhooksAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/client.py index e8c66b035801..1a7730bdb4aa 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.webhooks import pagers from google.cloud.dialogflowcx_v3.types import webhook @@ -674,11 +674,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = WebhooksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + WebhooksClient._read_environment_variables() + ) self._client_cert_source = WebhooksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -713,8 +711,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(WebhooksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/pagers.py index 46b5442d732a..206f0a1e898b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/base.py index 925d61a5ffe9..b695b1c354f2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import webhook @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc.py index 220f8411eece..93fe520edbfd 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import webhook from google.cloud.dialogflowcx_v3.types import webhook as gcdc_webhook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc_asyncio.py index afa2a96b1623..f714a22134d4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import webhook from google.cloud.dialogflowcx_v3.types import webhook as gcdc_webhook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest.py index 5a80f9b677e1..67b5c24bdebf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3.types import webhook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest_base.py index 5ee57ead7080..24e9274b3acb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3.types import webhook from google.cloud.dialogflowcx_v3.types import webhook as gcdc_webhook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/__init__.py index a13971240d2e..f2b7b89c36dc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .advanced_settings import AdvancedSettings +from .advanced_settings import ( + AdvancedSettings, +) from .agent import ( Agent, AgentValidationResult, @@ -51,7 +53,9 @@ ListChangelogsRequest, ListChangelogsResponse, ) -from .code_block import CodeBlock +from .code_block import ( + CodeBlock, +) from .data_store_connection import ( DataStoreConnection, DataStoreConnectionSignals, @@ -142,9 +146,16 @@ UpdateFlowRequest, ValidateFlowRequest, ) -from .fulfillment import Fulfillment -from .gcs import GcsDestination -from .generative_settings import GenerativeSettings, LlmModelSettings +from .fulfillment import ( + Fulfillment, +) +from .gcs import ( + GcsDestination, +) +from .generative_settings import ( + GenerativeSettings, + LlmModelSettings, +) from .generator import ( CreateGeneratorRequest, DeleteGeneratorRequest, @@ -155,8 +166,13 @@ Phrase, UpdateGeneratorRequest, ) -from .import_strategy import ImportStrategy -from .inline import InlineDestination, InlineSource +from .import_strategy import ( + ImportStrategy, +) +from .inline import ( + InlineDestination, + InlineSource, +) from .intent import ( CreateIntentRequest, DeleteIntentRequest, @@ -215,8 +231,12 @@ RestorePlaybookVersionResponse, UpdatePlaybookRequest, ) -from .response_message import ResponseMessage -from .safety_settings import SafetySettings +from .response_message import ( + ResponseMessage, +) +from .safety_settings import ( + SafetySettings, +) from .security_settings import ( CreateSecuritySettingsRequest, DeleteSecuritySettingsRequest, @@ -317,7 +337,10 @@ ToolVersion, UpdateToolRequest, ) -from .tool_call import ToolCall, ToolCallResult +from .tool_call import ( + ToolCall, + ToolCallResult, +) from .trace import ( Action, AgentUtterance, @@ -340,7 +363,10 @@ TransitionRouteGroup, UpdateTransitionRouteGroupRequest, ) -from .validation_message import ResourceName, ValidationMessage +from .validation_message import ( + ResourceName, + ValidationMessage, +) from .version import ( CompareVersionsRequest, CompareVersionsResponse, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/agent.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/agent.py index 898fec11569f..4deb7c1cddd7 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/agent.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/agent.py @@ -24,10 +24,10 @@ from google.cloud.dialogflowcx_v3.types import ( advanced_settings as gcdc_advanced_settings, ) +from google.cloud.dialogflowcx_v3.types import audio_config, flow from google.cloud.dialogflowcx_v3.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3.types import audio_config, flow __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3", @@ -648,6 +648,7 @@ class DataFormat(proto.Enum): Agent content will be exported in JSON Package format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON_PACKAGE = 4 @@ -804,6 +805,7 @@ class RestoreOption(proto.Enum): Fallback to default settings if some settings are not supported in the target agent. """ + RESTORE_OPTION_UNSPECIFIED = 0 KEEP = 1 FALLBACK = 2 @@ -911,12 +913,12 @@ class AgentValidationResult(proto.Message): proto.STRING, number=1, ) - flow_validation_results: MutableSequence[ - flow.FlowValidationResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=flow.FlowValidationResult, + flow_validation_results: MutableSequence[flow.FlowValidationResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=flow.FlowValidationResult, + ) ) diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/audio_config.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/audio_config.py index a3871fff910a..08adc64909da 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/audio_config.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/audio_config.py @@ -91,6 +91,7 @@ class AudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + AUDIO_ENCODING_UNSPECIFIED = 0 AUDIO_ENCODING_LINEAR_16 = 1 AUDIO_ENCODING_FLAC = 2 @@ -138,6 +139,7 @@ class SpeechModelVariant(proto.Enum): documentation `__ describes which models have enhanced variants. """ + SPEECH_MODEL_VARIANT_UNSPECIFIED = 0 USE_BEST_AVAILABLE = 1 USE_STANDARD = 2 @@ -160,6 +162,7 @@ class SsmlVoiceGender(proto.Enum): SSML_VOICE_GENDER_NEUTRAL (3): A gender-neutral voice. """ + SSML_VOICE_GENDER_UNSPECIFIED = 0 SSML_VOICE_GENDER_MALE = 1 SSML_VOICE_GENDER_FEMALE = 2 @@ -194,6 +197,7 @@ class OutputAudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + OUTPUT_AUDIO_ENCODING_UNSPECIFIED = 0 OUTPUT_AUDIO_ENCODING_LINEAR_16 = 1 OUTPUT_AUDIO_ENCODING_MP3 = 2 @@ -557,13 +561,13 @@ class TextToSpeechSettings(proto.Message): is not specified. """ - synthesize_speech_configs: MutableMapping[ - str, "SynthesizeSpeechConfig" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=1, - message="SynthesizeSpeechConfig", + synthesize_speech_configs: MutableMapping[str, "SynthesizeSpeechConfig"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=1, + message="SynthesizeSpeechConfig", + ) ) diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/data_store_connection.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/data_store_connection.py index a53c7691aecf..79422e0795e3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/data_store_connection.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/data_store_connection.py @@ -50,6 +50,7 @@ class DataStoreType(proto.Enum): A data store that contains structured data (for example FAQ). """ + DATA_STORE_TYPE_UNSPECIFIED = 0 PUBLIC_WEB = 1 UNSTRUCTURED = 2 @@ -69,6 +70,7 @@ class DocumentProcessingMode(proto.Enum): CHUNKS (2): Documents are converted to chunks. """ + DOCUMENT_PROCESSING_MODE_UNSPECIFIED = 0 DOCUMENTS = 1 CHUNKS = 2 @@ -295,6 +297,7 @@ class GroundingDecision(proto.Enum): REJECTED_BY_GROUNDING (2): Grounding have rejected the answer. """ + GROUNDING_DECISION_UNSPECIFIED = 0 ACCEPTED_BY_GROUNDING = 1 REJECTED_BY_GROUNDING = 2 @@ -321,6 +324,7 @@ class GroundingScoreBucket(proto.Enum): We have very high confidence that the answer is grounded. """ + GROUNDING_SCORE_BUCKET_UNSPECIFIED = 0 VERY_LOW = 1 LOW = 3 @@ -369,6 +373,7 @@ class SafetyDecision(proto.Enum): REJECTED_BY_SAFETY_CHECK (2): One ore more safety checks fired. """ + SAFETY_DECISION_UNSPECIFIED = 0 ACCEPTED_BY_SAFETY_CHECK = 1 REJECTED_BY_SAFETY_CHECK = 2 @@ -386,6 +391,7 @@ class BannedPhraseMatch(proto.Enum): BANNED_PHRASE_MATCH_RESPONSE (3): A banned phrase matched the response. """ + BANNED_PHRASE_MATCH_UNSPECIFIED = 0 BANNED_PHRASE_MATCH_NONE = 1 BANNED_PHRASE_MATCH_QUERY = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/deployment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/deployment.py index 566e756ac259..e1b1be2123d1 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/deployment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/deployment.py @@ -72,6 +72,7 @@ class State(proto.Enum): FAILED (3): The deployment failed. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/entity_type.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/entity_type.py index 3194a4217d05..b32ccd852349 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/entity_type.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/entity_type.py @@ -129,6 +129,7 @@ class Kind(proto.Enum): Regexp entity types allow to specify regular expressions in entries values. """ + KIND_UNSPECIFIED = 0 KIND_MAP = 1 KIND_LIST = 2 @@ -147,6 +148,7 @@ class AutoExpansionMode(proto.Enum): Allows an agent to recognize values that have not been explicitly listed in the entity. """ + AUTO_EXPANSION_MODE_UNSPECIFIED = 0 AUTO_EXPANSION_MODE_DEFAULT = 1 @@ -305,6 +307,7 @@ class DataFormat(proto.Enum): EntityTypes will be exported in JSON Package format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON_PACKAGE = 5 @@ -461,6 +464,7 @@ class MergeOption(proto.Enum): conflicting new entity type when display name conflicts exist. """ + MERGE_OPTION_UNSPECIFIED = 0 REPLACE = 1 MERGE = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/environment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/environment.py index 90e2586eeeb8..1eaf98768eb5 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/environment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/environment.py @@ -434,6 +434,7 @@ class AggregatedTestResult(proto.Enum): FAILED (2): At least one test did not pass. """ + AGGREGATED_TEST_RESULT_UNSPECIFIED = 0 PASSED = 1 FAILED = 2 @@ -553,12 +554,12 @@ class ListContinuousTestResultsResponse(proto.Message): def raw_page(self): return self - continuous_test_results: MutableSequence[ - "ContinuousTestResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ContinuousTestResult", + continuous_test_results: MutableSequence["ContinuousTestResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ContinuousTestResult", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/experiment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/experiment.py index a34f10a1bdb4..b64475cc8a0f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/experiment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/experiment.py @@ -119,6 +119,7 @@ class State(proto.Enum): The experiment with auto-rollout enabled has failed. """ + STATE_UNSPECIFIED = 0 DRAFT = 1 RUNNING = 2 @@ -189,6 +190,7 @@ class MetricType(proto.Enum): Percentage of sessions reached Dialogflow 'END_PAGE' or 'END_SESSION'. """ + METRIC_UNSPECIFIED = 0 CONTAINED_SESSION_NO_CALLBACK_RATE = 1 LIVE_AGENT_HANDOFF_RATE = 2 @@ -209,6 +211,7 @@ class CountType(proto.Enum): AVERAGE_TURN_COUNT (3): Average turn count in a session. """ + COUNT_TYPE_UNSPECIFIED = 0 TOTAL_NO_MATCH_COUNT = 1 TOTAL_TURN_COUNT = 2 @@ -335,12 +338,12 @@ class VersionMetrics(proto.Message): number=3, ) - version_metrics: MutableSequence[ - "Experiment.Result.VersionMetrics" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Experiment.Result.VersionMetrics", + version_metrics: MutableSequence["Experiment.Result.VersionMetrics"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Experiment.Result.VersionMetrics", + ) ) last_update_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/flow.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/flow.py index 8d397ac9f9b1..f61a24c37c5f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/flow.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/flow.py @@ -21,15 +21,15 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import ( + advanced_settings as gcdc_advanced_settings, +) from google.cloud.dialogflowcx_v3.types import ( import_strategy, page, parameter_definition, validation_message, ) -from google.cloud.dialogflowcx_v3.types import ( - advanced_settings as gcdc_advanced_settings, -) __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3", @@ -88,6 +88,7 @@ class ModelType(proto.Enum): MODEL_TYPE_ADVANCED (3): Use advanced NLU model. """ + MODEL_TYPE_UNSPECIFIED = 0 MODEL_TYPE_STANDARD = 1 MODEL_TYPE_ADVANCED = 3 @@ -108,6 +109,7 @@ class ModelTrainingMode(proto.Enum): training. Best for large flows whose models take long time to train. """ + MODEL_TRAINING_MODE_UNSPECIFIED = 0 MODEL_TRAINING_MODE_AUTOMATIC = 1 MODEL_TRAINING_MODE_MANUAL = 2 @@ -630,12 +632,12 @@ class FlowValidationResult(proto.Message): proto.STRING, number=1, ) - validation_messages: MutableSequence[ - validation_message.ValidationMessage - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=validation_message.ValidationMessage, + validation_messages: MutableSequence[validation_message.ValidationMessage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=validation_message.ValidationMessage, + ) ) update_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, @@ -700,6 +702,7 @@ class ImportOption(proto.Enum): E.g. Standard NLU will be used if custom NLU is not available. """ + IMPORT_OPTION_UNSPECIFIED = 0 KEEP = 1 FALLBACK = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/fulfillment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/fulfillment.py index f924c0ad7b5e..8af21074ce82 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/fulfillment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/fulfillment.py @@ -201,12 +201,12 @@ class CaseContent(proto.Message): message="Fulfillment.ConditionalCases.Case.CaseContent", ) - cases: MutableSequence[ - "Fulfillment.ConditionalCases.Case" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Fulfillment.ConditionalCases.Case", + cases: MutableSequence["Fulfillment.ConditionalCases.Case"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Fulfillment.ConditionalCases.Case", + ) ) class GeneratorSettings(proto.Message): diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/import_strategy.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/import_strategy.py index 4f1e6f57ba08..3a03a815a4fe 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/import_strategy.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/import_strategy.py @@ -51,6 +51,7 @@ class ImportStrategy(proto.Enum): IMPORT_STRATEGY_THROW_ERROR (5): Throw error if a conflict is encountered. """ + IMPORT_STRATEGY_UNSPECIFIED = 0 IMPORT_STRATEGY_CREATE_NEW = 1 IMPORT_STRATEGY_REPLACE = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/intent.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/intent.py index 1c67a5b0a2c6..81a05401734a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/intent.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/intent.py @@ -58,6 +58,7 @@ class IntentView(proto.Enum): INTENT_VIEW_FULL (2): All fields are populated. """ + INTENT_VIEW_UNSPECIFIED = 0 INTENT_VIEW_PARTIAL = 1 INTENT_VIEW_FULL = 2 @@ -560,6 +561,7 @@ class MergeOption(proto.Enum): conflicting new intent when display name conflicts exist. """ + MERGE_OPTION_UNSPECIFIED = 0 REJECT = 1 REPLACE = 2 @@ -699,6 +701,7 @@ class DataFormat(proto.Enum): CSV (3): Intents will be exported in CSV format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/page.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/page.py index 801bb55413c0..2b54aa262153 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/page.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/page.py @@ -21,10 +21,10 @@ import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.dialogflowcx_v3.types import data_store_connection, fulfillment from google.cloud.dialogflowcx_v3.types import ( advanced_settings as gcdc_advanced_settings, ) +from google.cloud.dialogflowcx_v3.types import data_store_connection, fulfillment __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3", @@ -304,12 +304,12 @@ class FillBehavior(proto.Message): number=3, message=fulfillment.Fulfillment, ) - reprompt_event_handlers: MutableSequence[ - "EventHandler" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="EventHandler", + reprompt_event_handlers: MutableSequence["EventHandler"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="EventHandler", + ) ) display_name: str = proto.Field( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/parameter_definition.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/parameter_definition.py index 9257157bc1d5..e234cc2489d0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/parameter_definition.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/parameter_definition.py @@ -47,6 +47,7 @@ class DataType(proto.Enum): ARRAY (6): Represents a repeated value. """ + DATA_TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -92,6 +93,7 @@ class ParameterType(proto.Enum): LIST (6): Represents a repeated value. """ + PARAMETER_TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/playbook.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/playbook.py index 804bcea4a172..b0b4083a3ac8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/playbook.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/playbook.py @@ -21,12 +21,14 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore -from google.cloud.dialogflowcx_v3.types import import_strategy as gcdc_import_strategy from google.cloud.dialogflowcx_v3.types import code_block as gcdc_code_block -from google.cloud.dialogflowcx_v3.types import example +from google.cloud.dialogflowcx_v3.types import ( + example, + generative_settings, + parameter_definition, +) from google.cloud.dialogflowcx_v3.types import fulfillment as gcdc_fulfillment -from google.cloud.dialogflowcx_v3.types import generative_settings -from google.cloud.dialogflowcx_v3.types import parameter_definition +from google.cloud.dialogflowcx_v3.types import import_strategy as gcdc_import_strategy __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3", @@ -280,6 +282,7 @@ class PlaybookType(proto.Enum): ROUTINE (3): Routine playbook. """ + PLAYBOOK_TYPE_UNSPECIFIED = 0 TASK = 1 ROUTINE = 3 @@ -651,6 +654,7 @@ class DataFormat(proto.Enum): JSON (2): Flow content will be exported in JSON format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/response_message.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/response_message.py index 214052193ed9..2a192ca5b4a0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/response_message.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/response_message.py @@ -157,6 +157,7 @@ class ResponseType(proto.Enum): [event handler][EventHandler] in the page or flow or transition route group. """ + RESPONSE_TYPE_UNSPECIFIED = 0 ENTRY_PROMPT = 1 PARAMETER_PROMPT = 2 @@ -383,12 +384,12 @@ class Segment(proto.Message): number=3, ) - segments: MutableSequence[ - "ResponseMessage.MixedAudio.Segment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ResponseMessage.MixedAudio.Segment", + segments: MutableSequence["ResponseMessage.MixedAudio.Segment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ResponseMessage.MixedAudio.Segment", + ) ) class TelephonyTransferCall(proto.Message): diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/safety_settings.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/safety_settings.py index bfe296329370..3e911d62a295 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/safety_settings.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/safety_settings.py @@ -64,6 +64,7 @@ class PhraseMatchStrategy(proto.Enum): phrase will be matched, e.g. "foo" will match "a foo bar" and "foo bar", but not "foobar". """ + PHRASE_MATCH_STRATEGY_UNSPECIFIED = 0 PARTIAL_MATCH = 1 WORD_MATCH = 2 @@ -113,6 +114,7 @@ class SafetyFilterLevel(proto.Enum): BLOCK_MOST (4): Block most suspicious texts. """ + SAFETY_FILTER_LEVEL_UNSPECIFIED = 0 BLOCK_NONE = 1 BLOCK_FEW = 2 @@ -134,6 +136,7 @@ class SafetyCategory(proto.Enum): SEXUALLY_EXPLICIT_CONTENT (4): Sexually explicit content. """ + SAFETY_CATEGORY_UNSPECIFIED = 0 DANGEROUS_CONTENT = 1 HATE_SPEECH = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/security_settings.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/security_settings.py index 3ad859f98477..4ec072852dab 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/security_settings.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/security_settings.py @@ -306,6 +306,7 @@ class RedactionStrategy(proto.Enum): Call redaction service to clean up the data to be persisted. """ + REDACTION_STRATEGY_UNSPECIFIED = 0 REDACT_WITH_SERVICE = 1 @@ -321,6 +322,7 @@ class RedactionScope(proto.Enum): power is disconnected. This includes data that are temporarily saved on disk. """ + REDACTION_SCOPE_UNSPECIFIED = 0 REDACT_DISK_STORAGE = 2 @@ -338,6 +340,7 @@ class RetentionStrategy(proto.Enum): conversation ends when the corresponding Dialogflow session ends. """ + RETENTION_STRATEGY_UNSPECIFIED = 0 REMOVE_AFTER_CONVERSATION = 1 @@ -353,6 +356,7 @@ class PurgeDataType(proto.Enum): Cloud logging, which is owned by the user - not Dialogflow. """ + PURGE_DATA_TYPE_UNSPECIFIED = 0 DIALOGFLOW_HISTORY = 1 @@ -400,6 +404,7 @@ class AudioFormat(proto.Enum): OGG (3): OGG Vorbis. """ + AUDIO_FORMAT_UNSPECIFIED = 0 MULAW = 1 MP3 = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session.py index 6ece32540f92..a254088e3851 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session.py @@ -24,21 +24,19 @@ import google.type.latlng_pb2 as latlng_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import ( + advanced_settings as gcdc_advanced_settings, +) from google.cloud.dialogflowcx_v3.types import ( audio_config, data_store_connection, flow, generative_settings, -) -from google.cloud.dialogflowcx_v3.types import ( page, response_message, session_entity_type, tool_call, ) -from google.cloud.dialogflowcx_v3.types import ( - advanced_settings as gcdc_advanced_settings, -) from google.cloud.dialogflowcx_v3.types import intent as gcdc_intent __protobuf__ = proto.module( @@ -96,6 +94,7 @@ class DetectIntentResponseView(proto.Enum): [QueryResult.trace_blocks][google.cloud.dialogflow.cx.v3.QueryResult.trace_blocks] """ + DETECT_INTENT_RESPONSE_VIEW_UNSPECIFIED = 0 DETECT_INTENT_RESPONSE_VIEW_FULL = 1 DETECT_INTENT_RESPONSE_VIEW_BASIC = 2 @@ -133,6 +132,7 @@ class Rating(proto.Enum): THUMBS_DOWN (2): Thumbs down feedback from user. """ + RATING_UNSPECIFIED = 0 THUMBS_UP = 1 THUMBS_DOWN = 2 @@ -327,6 +327,7 @@ class ResponseType(proto.Enum): FINAL (2): Final response. """ + RESPONSE_TYPE_UNSPECIFIED = 0 PARTIAL = 1 FINAL = 2 @@ -551,19 +552,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=5, ) - speech_partial_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=duration_pb2.Duration, + speech_partial_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=duration_pb2.Duration, + ) ) - speech_final_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=duration_pb2.Duration, + speech_final_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=duration_pb2.Duration, + ) ) partial_responses: int = proto.Field( proto.INT32, @@ -581,19 +582,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=11, ) - dtmf_partial_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=12, - message=duration_pb2.Duration, + dtmf_partial_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12, + message=duration_pb2.Duration, + ) ) - dtmf_final_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=13, - message=duration_pb2.Duration, + dtmf_final_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=13, + message=duration_pb2.Duration, + ) ) single_utterance_end_time_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, @@ -802,6 +803,7 @@ class MessageType(proto.Enum): [``single_utterance``][google.cloud.dialogflow.cx.v3.InputAudioConfig.single_utterance] was set to ``true``, and is not used otherwise. """ + MESSAGE_TYPE_UNSPECIFIED = 0 TRANSCRIPT = 1 END_OF_SINGLE_UTTERANCE = 2 @@ -827,12 +829,12 @@ class MessageType(proto.Enum): proto.FLOAT, number=6, ) - speech_word_info: MutableSequence[ - audio_config.SpeechWordInfo - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=audio_config.SpeechWordInfo, + speech_word_info: MutableSequence[audio_config.SpeechWordInfo] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=audio_config.SpeechWordInfo, + ) ) speech_end_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, @@ -1025,12 +1027,12 @@ class QueryParameters(proto.Message): number=2, message=latlng_pb2.LatLng, ) - session_entity_types: MutableSequence[ - session_entity_type.SessionEntityType - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=session_entity_type.SessionEntityType, + session_entity_types: MutableSequence[session_entity_type.SessionEntityType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=session_entity_type.SessionEntityType, + ) ) payload: struct_pb2.Struct = proto.Field( proto.MESSAGE, @@ -1239,6 +1241,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. E.g. ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -1255,6 +1258,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -1672,12 +1676,12 @@ class QueryResult(proto.Message): number=3, message=struct_pb2.Struct, ) - response_messages: MutableSequence[ - response_message.ResponseMessage - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=response_message.ResponseMessage, + response_messages: MutableSequence[response_message.ResponseMessage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=response_message.ResponseMessage, + ) ) webhook_statuses: MutableSequence[status_pb2.Status] = proto.RepeatedField( proto.MESSAGE, @@ -1916,6 +1920,7 @@ class MatchType(proto.Enum): The query was handled by a [``Playbook``][google.cloud.dialogflow.cx.v3.Playbook]. """ + MATCH_TYPE_UNSPECIFIED = 0 INTENT = 1 DIRECT_INTENT = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session_entity_type.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session_entity_type.py index 0c7a2991c3ab..e1fc530e60ca 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session_entity_type.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session_entity_type.py @@ -95,6 +95,7 @@ class EntityOverrideMode(proto.Enum): [EntityTypes.GetEntityType][google.cloud.dialogflow.cx.v3.EntityTypes.GetEntityType] on the custom entity type and merge. """ + ENTITY_OVERRIDE_MODE_UNSPECIFIED = 0 ENTITY_OVERRIDE_MODE_OVERRIDE = 1 ENTITY_OVERRIDE_MODE_SUPPLEMENT = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/test_case.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/test_case.py index 06eb8a0bfc14..bf8523f0a5e8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/test_case.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/test_case.py @@ -23,14 +23,14 @@ import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import flow as gcdc_flow +from google.cloud.dialogflowcx_v3.types import intent as gcdc_intent +from google.cloud.dialogflowcx_v3.types import page as gcdc_page from google.cloud.dialogflowcx_v3.types import ( response_message, session, transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import flow as gcdc_flow -from google.cloud.dialogflowcx_v3.types import intent as gcdc_intent -from google.cloud.dialogflowcx_v3.types import page as gcdc_page __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3", @@ -84,6 +84,7 @@ class TestResult(proto.Enum): FAILED (2): The test did not pass. """ + TEST_RESULT_UNSPECIFIED = 0 PASSED = 1 FAILED = 2 @@ -145,12 +146,12 @@ class TestCase(proto.Message): number=13, message="TestConfig", ) - test_case_conversation_turns: MutableSequence[ - "ConversationTurn" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="ConversationTurn", + test_case_conversation_turns: MutableSequence["ConversationTurn"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="ConversationTurn", + ) ) creation_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, @@ -361,12 +362,12 @@ class VirtualAgentOutput(proto.Message): number=8, message=gcdc_page.Page, ) - text_responses: MutableSequence[ - response_message.ResponseMessage.Text - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message=response_message.ResponseMessage.Text, + text_responses: MutableSequence[response_message.ResponseMessage.Text] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message=response_message.ResponseMessage.Text, + ) ) status: status_pb2.Status = proto.Field( proto.MESSAGE, @@ -415,6 +416,7 @@ class DiffType(proto.Enum): FLOW (5): The flow. """ + DIFF_TYPE_UNSPECIFIED = 0 INTENT = 1 PAGE = 2 @@ -705,6 +707,7 @@ class CoverageType(proto.Enum): TRANSITION_ROUTE_GROUP (3): Transition route group coverage. """ + COVERAGE_TYPE_UNSPECIFIED = 0 INTENT = 1 PAGE_TRANSITION = 2 @@ -812,6 +815,7 @@ class TestCaseView(proto.Enum): FULL (2): Include everything. """ + TEST_CASE_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -1252,6 +1256,7 @@ class DataFormat(proto.Enum): JSON (2): JSON format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/tool.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/tool.py index aeedaf6d9305..2837f7c04f6d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/tool.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/tool.py @@ -249,6 +249,7 @@ class ToolType(proto.Enum): First party built-in tool created by Dialogflow which cannot be modified. """ + TOOL_TYPE_UNSPECIFIED = 0 CUSTOMIZED_TOOL = 1 BUILTIN_TOOL = 2 @@ -405,6 +406,7 @@ class RequestLocation(proto.Enum): QUERY_STRING (2): Represents the key in query string. """ + REQUEST_LOCATION_UNSPECIFIED = 0 HEADER = 1 QUERY_STRING = 2 @@ -485,6 +487,7 @@ class OauthGrantType(proto.Enum): Represents the `client credential flow `__. """ + OAUTH_GRANT_TYPE_UNSPECIFIED = 0 CLIENT_CREDENTIAL = 1 @@ -548,6 +551,7 @@ class ServiceAgentAuth(proto.Enum): other Google Cloud APIs after you grant required roles to ``service-@gcp-sa-dialogflow.iam.gserviceaccount.com``. """ + SERVICE_AGENT_AUTH_UNSPECIFIED = 0 ID_TOKEN = 1 ACCESS_TOKEN = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/trace.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/trace.py index cee5b7895d76..c5ba0eab68ea 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/trace.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/trace.py @@ -55,6 +55,7 @@ class OutputState(proto.Enum): OUTPUT_STATE_PENDING (5): Pending. """ + OUTPUT_STATE_UNSPECIFIED = 0 OUTPUT_STATE_OK = 1 OUTPUT_STATE_CANCELLED = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/transition_route_group.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/transition_route_group.py index e29b9d7efc14..609fca05751b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/transition_route_group.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/transition_route_group.py @@ -144,12 +144,12 @@ class ListTransitionRouteGroupsResponse(proto.Message): def raw_page(self): return self - transition_route_groups: MutableSequence[ - "TransitionRouteGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="TransitionRouteGroup", + transition_route_groups: MutableSequence["TransitionRouteGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="TransitionRouteGroup", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/validation_message.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/validation_message.py index 4341aab98e7e..111275d9554b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/validation_message.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/validation_message.py @@ -82,6 +82,7 @@ class ResourceType(proto.Enum): AGENT_TRANSITION_ROUTE_GROUP (14): Agent transition route group. """ + RESOURCE_TYPE_UNSPECIFIED = 0 AGENT = 1 INTENT = 2 @@ -112,6 +113,7 @@ class Severity(proto.Enum): ERROR (3): The agent may experience failures. """ + SEVERITY_UNSPECIFIED = 0 INFO = 1 WARNING = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/version.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/version.py index cb8c05929ef2..490e655a8f7c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/version.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/version.py @@ -100,6 +100,7 @@ class State(proto.Enum): FAILED (3): Version training failed. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/webhook.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/webhook.py index 9f6bb703dbed..f3dd6d62db41 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/webhook.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/webhook.py @@ -184,6 +184,7 @@ class ServiceAgentAuth(proto.Enum): other Google Cloud APIs after you grant required roles to ``service-@gcp-sa-dialogflow.iam.gserviceaccount.com``. """ + SERVICE_AGENT_AUTH_UNSPECIFIED = 0 NONE = 1 ID_TOKEN = 2 @@ -200,6 +201,7 @@ class WebhookType(proto.Enum): FLEXIBLE (2): Represents a flexible webhook. """ + WEBHOOK_TYPE_UNSPECIFIED = 0 STANDARD = 1 FLEXIBLE = 2 @@ -225,6 +227,7 @@ class HttpMethod(proto.Enum): OPTIONS (7): HTTP OPTIONS Method. """ + HTTP_METHOD_UNSPECIFIED = 0 POST = 1 GET = 2 @@ -923,16 +926,17 @@ class MergeBehavior(proto.Enum): ``messages`` will replace the list of messages waiting to be sent to the user. """ + MERGE_BEHAVIOR_UNSPECIFIED = 0 APPEND = 1 REPLACE = 2 - messages: MutableSequence[ - response_message.ResponseMessage - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=response_message.ResponseMessage, + messages: MutableSequence[response_message.ResponseMessage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=response_message.ResponseMessage, + ) ) merge_behavior: "WebhookResponse.FulfillmentResponse.MergeBehavior" = ( proto.Field( @@ -1076,6 +1080,7 @@ class ParameterState(proto.Enum): FILLED (3): Indicates that the parameter has a value. """ + PARAMETER_STATE_UNSPECIFIED = 0 EMPTY = 1 INVALID = 2 @@ -1104,12 +1109,12 @@ class ParameterState(proto.Enum): number=5, ) - parameter_info: MutableSequence[ - "PageInfo.FormInfo.ParameterInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="PageInfo.FormInfo.ParameterInfo", + parameter_info: MutableSequence["PageInfo.FormInfo.ParameterInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="PageInfo.FormInfo.ParameterInfo", + ) ) current_page: str = proto.Field( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/__init__.py index 70c228658e6b..b10fda00803d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.agents import AgentsAsyncClient, AgentsClient from .services.changelogs import ChangelogsAsyncClient, ChangelogsClient from .services.conversation_history import ( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/async_client.py index 9172b99f285e..60c38e416819 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -46,22 +46,26 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.agents import pagers -from google.cloud.dialogflowcx_v3beta1.types import audio_config, bigquery_export, flow from google.cloud.dialogflowcx_v3beta1.types import ( - generative_settings as gcdc_generative_settings, + advanced_settings, + agent, + audio_config, + bigquery_export, + flow, + generative_settings, + safety_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings -from google.cloud.dialogflowcx_v3beta1.types import agent from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings -from google.cloud.dialogflowcx_v3beta1.types import safety_settings +from google.cloud.dialogflowcx_v3beta1.types import ( + generative_settings as gcdc_generative_settings, +) from .client import AgentsClient from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport @@ -149,7 +153,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_info.__func__(AgentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AgentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AgentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -165,7 +172,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_file.__func__(AgentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AgentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AgentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/client.py index 5e06e8ef7e08..ae097bdb12bf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -63,22 +63,26 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.agents import pagers -from google.cloud.dialogflowcx_v3beta1.types import audio_config, bigquery_export, flow from google.cloud.dialogflowcx_v3beta1.types import ( - generative_settings as gcdc_generative_settings, + advanced_settings, + agent, + audio_config, + bigquery_export, + flow, + generative_settings, + safety_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings -from google.cloud.dialogflowcx_v3beta1.types import agent from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings -from google.cloud.dialogflowcx_v3beta1.types import safety_settings +from google.cloud.dialogflowcx_v3beta1.types import ( + generative_settings as gcdc_generative_settings, +) from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport from .transports.grpc import AgentsGrpcTransport @@ -820,11 +824,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AgentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AgentsClient._read_environment_variables() + ) self._client_cert_source = AgentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -859,8 +861,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AgentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/pagers.py index 7620debb0c84..d874d85afbd9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/base.py index 907acae745b2..4c7f04e3d034 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/base.py @@ -17,24 +17,23 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version +from google.cloud.dialogflowcx_v3beta1.types import agent, generative_settings +from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3beta1.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import agent -from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -377,7 +376,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc.py index 13d884085f62..ec900c7bacf9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc.py @@ -16,27 +16,26 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import agent, generative_settings +from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3beta1.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import agent -from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings from .base import DEFAULT_CLIENT_INFO, AgentsTransport @@ -611,12 +610,12 @@ def get_agent_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_agent_validation_result" not in self._stubs: - self._stubs[ - "get_agent_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Agents/GetAgentValidationResult", - request_serializer=agent.GetAgentValidationResultRequest.serialize, - response_deserializer=agent.AgentValidationResult.deserialize, + self._stubs["get_agent_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Agents/GetAgentValidationResult", + request_serializer=agent.GetAgentValidationResultRequest.serialize, + response_deserializer=agent.AgentValidationResult.deserialize, + ) ) return self._stubs["get_agent_validation_result"] @@ -670,12 +669,12 @@ def update_generative_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_generative_settings" not in self._stubs: - self._stubs[ - "update_generative_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Agents/UpdateGenerativeSettings", - request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, - response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + self._stubs["update_generative_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Agents/UpdateGenerativeSettings", + request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, + response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + ) ) return self._stubs["update_generative_settings"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc_asyncio.py index 3f553d095176..fd7f77f553bd 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,19 +31,14 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import agent, generative_settings +from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3beta1.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import agent -from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings from .base import DEFAULT_CLIENT_INFO, AgentsTransport from .grpc import AgentsGrpcTransport @@ -623,12 +622,12 @@ def get_agent_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_agent_validation_result" not in self._stubs: - self._stubs[ - "get_agent_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Agents/GetAgentValidationResult", - request_serializer=agent.GetAgentValidationResultRequest.serialize, - response_deserializer=agent.AgentValidationResult.deserialize, + self._stubs["get_agent_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Agents/GetAgentValidationResult", + request_serializer=agent.GetAgentValidationResultRequest.serialize, + response_deserializer=agent.AgentValidationResult.deserialize, + ) ) return self._stubs["get_agent_validation_result"] @@ -683,12 +682,12 @@ def update_generative_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_generative_settings" not in self._stubs: - self._stubs[ - "update_generative_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Agents/UpdateGenerativeSettings", - request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, - response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + self._stubs["update_generative_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Agents/UpdateGenerativeSettings", + request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, + response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + ) ) return self._stubs["update_generative_settings"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest.py index b149d6a76bdc..cc7b59d5e92a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest.py @@ -16,27 +16,26 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3beta1.types import agent, generative_settings +from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3beta1.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import agent -from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAgentsRestTransport @@ -1559,9 +1558,7 @@ def __call__( """ - http_options = ( - _BaseAgentsRestTransport._BaseGetAgentValidationResult._get_http_options() - ) + http_options = _BaseAgentsRestTransport._BaseGetAgentValidationResult._get_http_options() request, metadata = self._interceptor.pre_get_agent_validation_result( request, metadata @@ -2326,9 +2323,7 @@ def __call__( Settings for Generative AI. """ - http_options = ( - _BaseAgentsRestTransport._BaseUpdateGenerativeSettings._get_http_options() - ) + http_options = _BaseAgentsRestTransport._BaseUpdateGenerativeSettings._get_http_options() request, metadata = self._interceptor.pre_update_generative_settings( request, metadata @@ -2614,7 +2609,9 @@ def get_agent_validation_result( ) -> Callable[[agent.GetAgentValidationResultRequest], agent.AgentValidationResult]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetAgentValidationResult(self._session, self._host, self._interceptor) # type: ignore + return self._GetAgentValidationResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_generative_settings( @@ -2659,7 +2656,9 @@ def update_generative_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateGenerativeSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateGenerativeSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def validate_agent( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest_base.py index 7f998b3904e8..2e043ea5adba 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest_base.py @@ -17,18 +17,17 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import agent, generative_settings +from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3beta1.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import agent -from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings from .base import DEFAULT_CLIENT_INFO, AgentsTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/async_client.py index ca62cc32ff41..726a14e79c43 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.changelogs import pagers from google.cloud.dialogflowcx_v3beta1.types import changelog @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ChangelogsAsyncClient: The constructed client. """ - return ChangelogsClient.from_service_account_info.__func__(ChangelogsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ChangelogsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ChangelogsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ChangelogsAsyncClient: The constructed client. """ - return ChangelogsClient.from_service_account_file.__func__(ChangelogsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ChangelogsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ChangelogsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/client.py index b50d448d4ec7..749f25236117 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.changelogs import pagers from google.cloud.dialogflowcx_v3beta1.types import changelog @@ -626,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ChangelogsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ChangelogsClient._read_environment_variables() + ) self._client_cert_source = ChangelogsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ChangelogsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/pagers.py index c9b0e9be9e7d..c7c479acf6fb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/base.py index 8b4b431d1d30..284acb40d404 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import changelog @@ -232,7 +232,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc.py index 6f622cb2f708..58e65fb1c0cf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import changelog diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc_asyncio.py index 9a3a00fff84c..d84040c1b6e1 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import changelog diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/rest.py index c6efae52680b..41c9b7a09cc3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/async_client.py index 4dd25633ae86..dd12a3598c88 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.conversation_history import pagers from google.cloud.dialogflowcx_v3beta1.types import ( @@ -178,7 +178,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationHistoryAsyncClient: The constructed client. """ - return ConversationHistoryClient.from_service_account_info.__func__(ConversationHistoryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConversationHistoryClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConversationHistoryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -194,7 +197,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationHistoryAsyncClient: The constructed client. """ - return ConversationHistoryClient.from_service_account_file.__func__(ConversationHistoryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConversationHistoryClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ConversationHistoryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -232,7 +238,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationHistoryClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationHistoryClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationHistoryTransport: diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/client.py index 7bb01c4f85fb..0174e06a84b2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.conversation_history import pagers from google.cloud.dialogflowcx_v3beta1.types import ( @@ -89,9 +89,7 @@ class ConversationHistoryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationHistoryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationHistoryTransport]] _transport_registry["grpc"] = ConversationHistoryGrpcTransport _transport_registry["grpc_asyncio"] = ConversationHistoryGrpcAsyncIOTransport _transport_registry["rest"] = ConversationHistoryRestTransport @@ -1075,11 +1073,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationHistoryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationHistoryClient._read_environment_variables() + ) self._client_cert_source = ConversationHistoryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1114,8 +1110,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationHistoryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/pagers.py index 4dd6f279146a..1c7aa49ed009 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/__init__.py index 43cf36e568b0..fb84dac0686c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ConversationHistoryRestInterceptor, ConversationHistoryRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationHistoryTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationHistoryTransport]] _transport_registry["grpc"] = ConversationHistoryGrpcTransport _transport_registry["grpc_asyncio"] = ConversationHistoryGrpcAsyncIOTransport _transport_registry["rest"] = ConversationHistoryRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/base.py index 646636dc5c78..655d95f123aa 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import conversation_history @@ -250,7 +250,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc.py index fbd6a19a8641..7015cba83cb1 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import conversation_history diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc_asyncio.py index 40b86ef1dada..166cda368432 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import conversation_history diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest.py index 12a25f805bea..e89d89a092fb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3beta1.types import conversation_history @@ -482,9 +482,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -598,9 +596,7 @@ def __call__( Represents a conversation. """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -750,9 +746,7 @@ def __call__( """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -933,9 +927,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseConversationHistoryRestTransport._BaseGetLocation._get_transcoded_request( @@ -1074,9 +1066,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseConversationHistoryRestTransport._BaseListLocations._get_transcoded_request( @@ -1212,9 +1202,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1330,9 +1318,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationHistoryRestTransport._BaseGetOperation._get_transcoded_request( @@ -1471,9 +1457,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationHistoryRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest_base.py index 75edfb33cb46..9cae48bb7e11 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.types import conversation_history diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/async_client.py index 600eaffcf2d5..dfb2ee0ab294 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.deployments import pagers from google.cloud.dialogflowcx_v3beta1.types import deployment @@ -123,7 +123,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DeploymentsAsyncClient: The constructed client. """ - return DeploymentsClient.from_service_account_info.__func__(DeploymentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DeploymentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DeploymentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +142,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DeploymentsAsyncClient: The constructed client. """ - return DeploymentsClient.from_service_account_file.__func__(DeploymentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DeploymentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DeploymentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/client.py index 0a23f0e43473..00040298dab9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.deployments import pagers from google.cloud.dialogflowcx_v3beta1.types import deployment @@ -706,11 +706,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DeploymentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DeploymentsClient._read_environment_variables() + ) self._client_cert_source = DeploymentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -745,8 +743,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DeploymentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/pagers.py index b9a7afbdb032..e90384def394 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/base.py index aeace332270e..5f70456d699d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import deployment @@ -232,7 +232,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc.py index 5bef153d486e..53cd18bd8be3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import deployment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc_asyncio.py index bac75ce74977..88c8ca6d17f3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import deployment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/rest.py index d34550e4763b..c3e7585dd41a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/async_client.py index 22498a4713e1..9ce05acdb2c8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -46,13 +46,13 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.entity_types import pagers -from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from google.cloud.dialogflowcx_v3beta1.types import entity_type +from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from .client import EntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, EntityTypesTransport @@ -118,7 +118,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_info.__func__(EntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EntityTypesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +137,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_file.__func__(EntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EntityTypesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/client.py index 4318a1ba8186..13ac3ce1a3c8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -63,13 +63,13 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.entity_types import pagers -from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from google.cloud.dialogflowcx_v3beta1.types import entity_type +from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from .transports.base import DEFAULT_CLIENT_INFO, EntityTypesTransport from .transports.grpc import EntityTypesGrpcTransport @@ -629,11 +629,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EntityTypesClient._read_environment_variables() + ) self._client_cert_source = EntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -668,8 +666,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/pagers.py index 21777e36d197..40fc9ba3af87 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/base.py index 15c975bf0e9f..0a7c39b7ef71 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version -from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from google.cloud.dialogflowcx_v3beta1.types import entity_type +from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -309,7 +309,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc.py index 22e4ccf59e89..acbe3cfab347 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from google.cloud.dialogflowcx_v3beta1.types import entity_type +from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc_asyncio.py index a6ff1d6fc26e..406b6155cb88 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,15 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from google.cloud.dialogflowcx_v3beta1.types import entity_type +from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport from .grpc import EntityTypesGrpcTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest.py index 31fea270ae8f..814daa600d86 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest.py @@ -16,23 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from google.cloud.dialogflowcx_v3beta1.types import entity_type +from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEntityTypesRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest_base.py index 3597e1274203..ec1d162d76db 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from google.cloud.dialogflowcx_v3beta1.types import entity_type +from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/async_client.py index b1ea4c5e5988..d4094a13d170 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -46,15 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.environments import pagers -from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from google.cloud.dialogflowcx_v3beta1.types import environment +from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from .client import EnvironmentsClient from .transports.base import DEFAULT_CLIENT_INFO, EnvironmentsTransport @@ -142,7 +142,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_info.__func__(EnvironmentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EnvironmentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EnvironmentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +161,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_file.__func__(EnvironmentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EnvironmentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EnvironmentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/client.py index d603f3a37823..cac5e853ed7e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -63,15 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.environments import pagers -from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from google.cloud.dialogflowcx_v3beta1.types import environment +from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from .transports.base import DEFAULT_CLIENT_INFO, EnvironmentsTransport from .transports.grpc import EnvironmentsGrpcTransport @@ -803,11 +803,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EnvironmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EnvironmentsClient._read_environment_variables() + ) self._client_cert_source = EnvironmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -842,8 +840,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EnvironmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/pagers.py index d93f748e3230..7b115bd3e166 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -381,7 +381,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -457,7 +457,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/base.py index be8f24534dd3..82a9bb90e814 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version -from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from google.cloud.dialogflowcx_v3beta1.types import environment +from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -343,7 +343,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc.py index 6d6120a3b119..1edbd5509d2b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from google.cloud.dialogflowcx_v3beta1.types import environment +from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from .base import DEFAULT_CLIENT_INFO, EnvironmentsTransport @@ -528,12 +528,12 @@ def lookup_environment_history( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_environment_history" not in self._stubs: - self._stubs[ - "lookup_environment_history" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Environments/LookupEnvironmentHistory", - request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, - response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + self._stubs["lookup_environment_history"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Environments/LookupEnvironmentHistory", + request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, + response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + ) ) return self._stubs["lookup_environment_history"] @@ -597,12 +597,12 @@ def list_continuous_test_results( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_continuous_test_results" not in self._stubs: - self._stubs[ - "list_continuous_test_results" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Environments/ListContinuousTestResults", - request_serializer=environment.ListContinuousTestResultsRequest.serialize, - response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + self._stubs["list_continuous_test_results"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Environments/ListContinuousTestResults", + request_serializer=environment.ListContinuousTestResultsRequest.serialize, + response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + ) ) return self._stubs["list_continuous_test_results"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc_asyncio.py index 08aa216ebcc3..f26324d425fb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,15 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from google.cloud.dialogflowcx_v3beta1.types import environment +from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from .base import DEFAULT_CLIENT_INFO, EnvironmentsTransport from .grpc import EnvironmentsGrpcTransport @@ -539,12 +539,12 @@ def lookup_environment_history( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_environment_history" not in self._stubs: - self._stubs[ - "lookup_environment_history" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Environments/LookupEnvironmentHistory", - request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, - response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + self._stubs["lookup_environment_history"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Environments/LookupEnvironmentHistory", + request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, + response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + ) ) return self._stubs["lookup_environment_history"] @@ -610,12 +610,12 @@ def list_continuous_test_results( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_continuous_test_results" not in self._stubs: - self._stubs[ - "list_continuous_test_results" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Environments/ListContinuousTestResults", - request_serializer=environment.ListContinuousTestResultsRequest.serialize, - response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + self._stubs["list_continuous_test_results"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Environments/ListContinuousTestResults", + request_serializer=environment.ListContinuousTestResultsRequest.serialize, + response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + ) ) return self._stubs["list_continuous_test_results"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest.py index d73815baf006..4fcc78e68ec8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest.py @@ -16,23 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from google.cloud.dialogflowcx_v3beta1.types import environment +from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEnvironmentsRestTransport @@ -888,9 +888,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() request, metadata = self._interceptor.pre_create_environment( request, metadata @@ -1034,9 +1032,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() request, metadata = self._interceptor.pre_delete_environment( request, metadata @@ -1469,9 +1465,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseListContinuousTestResults._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseListContinuousTestResults._get_http_options() request, metadata = self._interceptor.pre_list_continuous_test_results( request, metadata @@ -1775,9 +1769,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseLookupEnvironmentHistory._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseLookupEnvironmentHistory._get_http_options() request, metadata = self._interceptor.pre_lookup_environment_history( request, metadata @@ -1930,9 +1922,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseRunContinuousTest._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseRunContinuousTest._get_http_options() request, metadata = self._interceptor.pre_run_continuous_test( request, metadata @@ -2084,9 +2074,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() request, metadata = self._interceptor.pre_update_environment( request, metadata @@ -2222,7 +2210,9 @@ def list_continuous_test_results( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListContinuousTestResults(self._session, self._host, self._interceptor) # type: ignore + return self._ListContinuousTestResults( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_environments( @@ -2243,7 +2233,9 @@ def lookup_environment_history( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._LookupEnvironmentHistory(self._session, self._host, self._interceptor) # type: ignore + return self._LookupEnvironmentHistory( + self._session, self._host, self._interceptor + ) # type: ignore @property def run_continuous_test( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest_base.py index 799c30de5878..c40b88ce867e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from google.cloud.dialogflowcx_v3beta1.types import environment +from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from .base import DEFAULT_CLIENT_INFO, EnvironmentsTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/async_client.py index 25986907e022..1376a85c7c1d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,15 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.examples import pagers -from google.cloud.dialogflowcx_v3beta1.types import example +from google.cloud.dialogflowcx_v3beta1.types import example, trace from google.cloud.dialogflowcx_v3beta1.types import example as gcdc_example -from google.cloud.dialogflowcx_v3beta1.types import trace from .client import ExamplesClient from .transports.base import DEFAULT_CLIENT_INFO, ExamplesTransport @@ -120,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ExamplesAsyncClient: The constructed client. """ - return ExamplesClient.from_service_account_info.__func__(ExamplesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ExamplesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ExamplesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ExamplesAsyncClient: The constructed client. """ - return ExamplesClient.from_service_account_file.__func__(ExamplesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ExamplesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ExamplesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/client.py index 2ace5fc90c5b..179bf565a430 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,15 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.examples import pagers -from google.cloud.dialogflowcx_v3beta1.types import example +from google.cloud.dialogflowcx_v3beta1.types import example, trace from google.cloud.dialogflowcx_v3beta1.types import example as gcdc_example -from google.cloud.dialogflowcx_v3beta1.types import trace from .transports.base import DEFAULT_CLIENT_INFO, ExamplesTransport from .transports.grpc import ExamplesGrpcTransport @@ -703,11 +702,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ExamplesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ExamplesClient._read_environment_variables() + ) self._client_cert_source = ExamplesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -742,8 +739,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ExamplesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/pagers.py index 1a8d3aec05ba..09dbe01099d3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/base.py index e7b601304565..5e3e8fc40c82 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import example @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc.py index f6af23e7b3a6..ccadfe27856e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import example from google.cloud.dialogflowcx_v3beta1.types import example as gcdc_example diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc_asyncio.py index 4dd270b25012..bf45a919624c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import example from google.cloud.dialogflowcx_v3beta1.types import example as gcdc_example diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest.py index a37d9040a11e..1cc1095331a4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3beta1.types import example diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest_base.py index 4be501e4c3a7..b9da2efe49f5 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.types import example from google.cloud.dialogflowcx_v3beta1.types import example as gcdc_example diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/async_client.py index df97fd0c8055..b79ebec50cd4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,15 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore 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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.experiments import pagers -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from .client import ExperimentsClient from .transports.base import DEFAULT_CLIENT_INFO, ExperimentsTransport @@ -120,7 +120,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ExperimentsAsyncClient: The constructed client. """ - return ExperimentsClient.from_service_account_info.__func__(ExperimentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ExperimentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ExperimentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +139,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ExperimentsAsyncClient: The constructed client. """ - return ExperimentsClient.from_service_account_file.__func__(ExperimentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ExperimentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ExperimentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/client.py index 0ed7233c81c4..595b11a45c25 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,15 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore 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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.experiments import pagers -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from .transports.base import DEFAULT_CLIENT_INFO, ExperimentsTransport from .transports.grpc import ExperimentsGrpcTransport @@ -657,11 +657,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ExperimentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ExperimentsClient._read_environment_variables() + ) self._client_cert_source = ExperimentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -696,8 +694,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ExperimentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/pagers.py index 3d991394261a..9992f5f3328a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/base.py index b5ad1bae7f75..85b199dc68e6 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -304,7 +304,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc.py index 93fde13781db..823e0b190ecb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from .base import DEFAULT_CLIENT_INFO, ExperimentsTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc_asyncio.py index 28be7c6d0ac3..698cb834566e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,15 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from .base import DEFAULT_CLIENT_INFO, ExperimentsTransport from .grpc import ExperimentsGrpcTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest.py index 83de8c98f893..db3b051d3506 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,13 +28,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseExperimentsRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest_base.py index be27c352d21b..2fd681cfb37a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from .base import DEFAULT_CLIENT_INFO, ExperimentsTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/async_client.py index b0773a92e6f4..f438f6366ebd 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -46,21 +46,21 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.flows import pagers from google.cloud.dialogflowcx_v3beta1.types import ( + advanced_settings, + flow, page, parameter_definition, validation_message, ) -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings -from google.cloud.dialogflowcx_v3beta1.types import flow from google.cloud.dialogflowcx_v3beta1.types import flow as gcdc_flow from .client import FlowsClient @@ -141,7 +141,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FlowsAsyncClient: The constructed client. """ - return FlowsClient.from_service_account_info.__func__(FlowsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + FlowsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(FlowsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +160,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FlowsAsyncClient: The constructed client. """ - return FlowsClient.from_service_account_file.__func__(FlowsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + FlowsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(FlowsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/client.py index 0991870c8a96..3d3b2457cbb1 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -63,21 +63,21 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.flows import pagers from google.cloud.dialogflowcx_v3beta1.types import ( + advanced_settings, + flow, page, parameter_definition, validation_message, ) -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings -from google.cloud.dialogflowcx_v3beta1.types import flow from google.cloud.dialogflowcx_v3beta1.types import flow as gcdc_flow from .transports.base import DEFAULT_CLIENT_INFO, FlowsTransport @@ -834,11 +834,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FlowsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FlowsClient._read_environment_variables() + ) self._client_cert_source = FlowsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -873,8 +871,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FlowsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/pagers.py index c5a2a357fa43..34553e3d82ce 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/base.py index dd96e69cbf44..7ef8ccfe818c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import flow @@ -342,7 +342,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc.py index 85638971164c..7851c68e0c11 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import flow from google.cloud.dialogflowcx_v3beta1.types import flow as gcdc_flow @@ -559,12 +559,12 @@ def get_flow_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_flow_validation_result" not in self._stubs: - self._stubs[ - "get_flow_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Flows/GetFlowValidationResult", - request_serializer=flow.GetFlowValidationResultRequest.serialize, - response_deserializer=flow.FlowValidationResult.deserialize, + self._stubs["get_flow_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Flows/GetFlowValidationResult", + request_serializer=flow.GetFlowValidationResultRequest.serialize, + response_deserializer=flow.FlowValidationResult.deserialize, + ) ) return self._stubs["get_flow_validation_result"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc_asyncio.py index 19023ee61242..d0deaa56fa12 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import flow from google.cloud.dialogflowcx_v3beta1.types import flow as gcdc_flow @@ -579,12 +579,12 @@ def get_flow_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_flow_validation_result" not in self._stubs: - self._stubs[ - "get_flow_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Flows/GetFlowValidationResult", - request_serializer=flow.GetFlowValidationResultRequest.serialize, - response_deserializer=flow.FlowValidationResult.deserialize, + self._stubs["get_flow_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Flows/GetFlowValidationResult", + request_serializer=flow.GetFlowValidationResultRequest.serialize, + response_deserializer=flow.FlowValidationResult.deserialize, + ) ) return self._stubs["get_flow_validation_result"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest.py index 9d9c54882c2a..f20356fe671f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3beta1.types import flow @@ -2408,7 +2408,9 @@ def get_flow_validation_result( ) -> Callable[[flow.GetFlowValidationResultRequest], flow.FlowValidationResult]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetFlowValidationResult(self._session, self._host, self._interceptor) # type: ignore + return self._GetFlowValidationResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_flow( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest_base.py index 1bc5ee5298e4..f7224c89150a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.types import flow from google.cloud.dialogflowcx_v3beta1.types import flow as gcdc_flow diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/async_client.py index 78554c1d02cb..45d5945d545c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,13 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.generators import pagers -from google.cloud.dialogflowcx_v3beta1.types import generative_settings -from google.cloud.dialogflowcx_v3beta1.types import generator +from google.cloud.dialogflowcx_v3beta1.types import generative_settings, generator from google.cloud.dialogflowcx_v3beta1.types import generator as gcdc_generator from .client import GeneratorsClient @@ -115,7 +114,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_info.__func__(GeneratorsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GeneratorsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GeneratorsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +133,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_file.__func__(GeneratorsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GeneratorsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(GeneratorsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/client.py index 261aed4b69e6..2e8a3d1b6526 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,13 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.generators import pagers -from google.cloud.dialogflowcx_v3beta1.types import generative_settings -from google.cloud.dialogflowcx_v3beta1.types import generator +from google.cloud.dialogflowcx_v3beta1.types import generative_settings, generator from google.cloud.dialogflowcx_v3beta1.types import generator as gcdc_generator from .transports.base import DEFAULT_CLIENT_INFO, GeneratorsTransport @@ -628,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GeneratorsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GeneratorsClient._read_environment_variables() + ) self._client_cert_source = GeneratorsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GeneratorsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/pagers.py index 276bc6f29b36..c346423a1152 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/base.py index cf820b99a451..ba73dd8afb9f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import generator @@ -276,7 +276,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc.py index 9ba0024c0b84..26387cbc2c68 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import generator from google.cloud.dialogflowcx_v3beta1.types import generator as gcdc_generator diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc_asyncio.py index 46b14b37dfaf..61a171191d41 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import generator from google.cloud.dialogflowcx_v3beta1.types import generator as gcdc_generator diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest.py index 1be2ca369703..d3b3f2cfd582 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3beta1.types import generator diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest_base.py index 79e6da0665aa..1d2c687496df 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.types import generator from google.cloud.dialogflowcx_v3beta1.types import generator as gcdc_generator diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/async_client.py index 4623ee2dabe9..e508735c3e76 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -46,9 +46,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.intents import pagers from google.cloud.dialogflowcx_v3beta1.types import intent @@ -116,7 +116,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_info.__func__(IntentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + IntentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(IntentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +135,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_file.__func__(IntentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + IntentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(IntentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/client.py index 89f32ea85ff5..3847450253b0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -63,9 +63,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.intents import pagers from google.cloud.dialogflowcx_v3beta1.types import intent @@ -653,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IntentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IntentsClient._read_environment_variables() + ) self._client_cert_source = IntentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -692,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IntentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/pagers.py index 72abf9bf040a..54e3bc06c299 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/base.py index c4ddd0d31100..cbb3e29a8732 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import intent @@ -304,7 +304,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc.py index 2877d3cc67af..00ba6b90a315 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import intent from google.cloud.dialogflowcx_v3beta1.types import intent as gcdc_intent diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc_asyncio.py index 1514b9fdf31d..826e9fe8e3be 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import intent from google.cloud.dialogflowcx_v3beta1.types import intent as gcdc_intent diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest.py index 11af232f5115..e5d63de54d0e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3beta1.types import intent diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest_base.py index c13085b0a347..4595806322a3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.types import intent from google.cloud.dialogflowcx_v3beta1.types import intent as gcdc_intent diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/async_client.py index 43e61a5251c5..300b3cf8bf04 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,13 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.pages import pagers -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings, fulfillment -from google.cloud.dialogflowcx_v3beta1.types import page +from google.cloud.dialogflowcx_v3beta1.types import advanced_settings, fulfillment, page from google.cloud.dialogflowcx_v3beta1.types import page as gcdc_page from .client import PagesClient @@ -129,7 +128,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PagesAsyncClient: The constructed client. """ - return PagesClient.from_service_account_info.__func__(PagesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PagesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PagesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +147,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PagesAsyncClient: The constructed client. """ - return PagesClient.from_service_account_file.__func__(PagesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PagesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PagesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/client.py index 52540d937988..d73c21680fc4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,13 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.pages import pagers -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings, fulfillment -from google.cloud.dialogflowcx_v3beta1.types import page +from google.cloud.dialogflowcx_v3beta1.types import advanced_settings, fulfillment, page from google.cloud.dialogflowcx_v3beta1.types import page as gcdc_page from .transports.base import DEFAULT_CLIENT_INFO, PagesTransport @@ -824,11 +823,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PagesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PagesClient._read_environment_variables() + ) self._client_cert_source = PagesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -863,8 +860,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PagesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/pagers.py index bd8398c44aef..76e664b15317 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/base.py index 254f06b95821..2e479ee68bc0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import page @@ -267,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc.py index 15aec3da7ebe..63f72d16ac61 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import page from google.cloud.dialogflowcx_v3beta1.types import page as gcdc_page diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc_asyncio.py index bf40c2204ddb..8918238243b1 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import page from google.cloud.dialogflowcx_v3beta1.types import page as gcdc_page diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest.py index 88f0bab88864..c87f83fc0604 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3beta1.types import page diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest_base.py index 9fd3f8e47b7d..686cfde735dc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.types import page from google.cloud.dialogflowcx_v3beta1.types import page as gcdc_page diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/async_client.py index 312adb2ed42a..bab1605db31d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.playbooks import pagers from google.cloud.dialogflowcx_v3beta1.types import ( @@ -59,8 +59,8 @@ example, generative_settings, parameter_definition, + playbook, ) -from google.cloud.dialogflowcx_v3beta1.types import playbook from google.cloud.dialogflowcx_v3beta1.types import playbook as gcdc_playbook from .client import PlaybooksClient @@ -139,7 +139,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PlaybooksAsyncClient: The constructed client. """ - return PlaybooksClient.from_service_account_info.__func__(PlaybooksAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PlaybooksClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PlaybooksAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +158,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PlaybooksAsyncClient: The constructed client. """ - return PlaybooksClient.from_service_account_file.__func__(PlaybooksAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PlaybooksClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PlaybooksAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/client.py index 83f9fa18a5b3..394130e3de8a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.playbooks import pagers from google.cloud.dialogflowcx_v3beta1.types import ( @@ -76,8 +76,8 @@ example, generative_settings, parameter_definition, + playbook, ) -from google.cloud.dialogflowcx_v3beta1.types import playbook from google.cloud.dialogflowcx_v3beta1.types import playbook as gcdc_playbook from .transports.base import DEFAULT_CLIENT_INFO, PlaybooksTransport @@ -786,11 +786,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PlaybooksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PlaybooksClient._read_environment_variables() + ) self._client_cert_source = PlaybooksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -825,8 +823,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PlaybooksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/pagers.py index 1dd3efe7cb05..5990d28e28dc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/base.py index d8e241587f8d..e32aafd61bc0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import playbook @@ -384,7 +384,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc.py index ee90770b824c..64bf760de090 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import playbook from google.cloud.dialogflowcx_v3beta1.types import playbook as gcdc_playbook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc_asyncio.py index 7a7ec05504be..57d80a3ce277 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import playbook from google.cloud.dialogflowcx_v3beta1.types import playbook as gcdc_playbook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest.py index a732791da729..82e26c57faeb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3beta1.types import playbook @@ -1169,9 +1169,7 @@ def __call__( """ - http_options = ( - _BasePlaybooksRestTransport._BaseCreatePlaybookVersion._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseCreatePlaybookVersion._get_http_options() request, metadata = self._interceptor.pre_create_playbook_version( request, metadata @@ -1428,9 +1426,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePlaybooksRestTransport._BaseDeletePlaybookVersion._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseDeletePlaybookVersion._get_http_options() request, metadata = self._interceptor.pre_delete_playbook_version( request, metadata @@ -2319,9 +2315,7 @@ def __call__( """ - http_options = ( - _BasePlaybooksRestTransport._BaseListPlaybookVersions._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseListPlaybookVersions._get_http_options() request, metadata = self._interceptor.pre_list_playbook_versions( request, metadata @@ -2471,9 +2465,7 @@ def __call__( """ - http_options = ( - _BasePlaybooksRestTransport._BaseRestorePlaybookVersion._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseRestorePlaybookVersion._get_http_options() request, metadata = self._interceptor.pre_restore_playbook_version( request, metadata @@ -2831,7 +2823,9 @@ def restore_playbook_version( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RestorePlaybookVersion(self._session, self._host, self._interceptor) # type: ignore + return self._RestorePlaybookVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_playbook( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest_base.py index dd953aaf0260..e251304b60ec 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.types import playbook from google.cloud.dialogflowcx_v3beta1.types import playbook as gcdc_playbook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/async_client.py index 69b0a81507b1..f5dd1336723c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,15 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.security_settings_service import pagers +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings from .client import SecuritySettingsServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport @@ -142,7 +142,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SecuritySettingsServiceAsyncClient: The constructed client. """ - return SecuritySettingsServiceClient.from_service_account_info.__func__(SecuritySettingsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SecuritySettingsServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SecuritySettingsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +161,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SecuritySettingsServiceAsyncClient: The constructed client. """ - return SecuritySettingsServiceClient.from_service_account_file.__func__(SecuritySettingsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SecuritySettingsServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + SecuritySettingsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -196,7 +204,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SecuritySettingsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SecuritySettingsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SecuritySettingsServiceTransport: diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/client.py index 259438f589e0..beb2d4c0d7dc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,15 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.security_settings_service import pagers +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings from .transports.base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport from .transports.grpc import SecuritySettingsServiceGrpcTransport @@ -85,9 +85,7 @@ class SecuritySettingsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SecuritySettingsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SecuritySettingsServiceTransport]] _transport_registry["grpc"] = SecuritySettingsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SecuritySettingsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SecuritySettingsServiceRestTransport @@ -677,11 +675,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SecuritySettingsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SecuritySettingsServiceClient._read_environment_variables() + ) self._client_cert_source = ( SecuritySettingsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -718,8 +714,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SecuritySettingsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/pagers.py index 8a88184b770d..560786944e94 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/__init__.py index 3a4ddec2334f..00bac1766862 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SecuritySettingsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SecuritySettingsServiceTransport]] _transport_registry["grpc"] = SecuritySettingsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SecuritySettingsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SecuritySettingsServiceRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/base.py index 7a4ff7129fc2..af1713953505 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc.py index d34481ff38f0..a0536e762d2c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings from .base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc_asyncio.py index f71a2844b9b9..51c0155b552f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings from .base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport from .grpc import SecuritySettingsServiceGrpcTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest.py index 3f2a637b27e4..ae2bbdab1320 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSecuritySettingsServiceRestTransport @@ -614,9 +614,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseCreateSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseCreateSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_create_security_settings( request, metadata @@ -765,9 +763,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseDeleteSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseDeleteSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_delete_security_settings( request, metadata @@ -885,9 +881,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseGetSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseGetSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_get_security_settings( request, metadata @@ -1039,9 +1033,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseListSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseListSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_list_security_settings( request, metadata @@ -1196,9 +1188,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseUpdateSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseUpdateSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_update_security_settings( request, metadata @@ -1304,7 +1294,9 @@ def create_security_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSecuritySettings(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecuritySettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_security_settings( @@ -1312,7 +1304,9 @@ def delete_security_settings( ) -> Callable[[security_settings.DeleteSecuritySettingsRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteSecuritySettings(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSecuritySettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_security_settings( @@ -1345,7 +1339,9 @@ def update_security_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateSecuritySettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSecuritySettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1405,9 +1401,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1546,9 +1540,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1686,9 +1678,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1806,9 +1796,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1947,9 +1935,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest_base.py index 7c3de123c129..85775752ec1b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings from .base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/async_client.py index 3c0ed8c5b059..8486d075e1fe 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.session_entity_types import pagers +from google.cloud.dialogflowcx_v3beta1.types import entity_type, session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import entity_type -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from .client import SessionEntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -127,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_info.__func__(SessionEntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SessionEntityTypesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SessionEntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +145,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_file.__func__(SessionEntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SessionEntityTypesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SessionEntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +186,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SessionEntityTypesTransport: diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/client.py index 3cc79f82e3c7..fda7b9d1d59c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.session_entity_types import pagers +from google.cloud.dialogflowcx_v3beta1.types import entity_type, session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import entity_type -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .transports.grpc import SessionEntityTypesGrpcTransport @@ -86,9 +85,7 @@ class SessionEntityTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionEntityTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport @@ -638,11 +635,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionEntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionEntityTypesClient._read_environment_variables() + ) self._client_cert_source = SessionEntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +672,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionEntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/pagers.py index fba3eb0efcc7..9f262bc88ea0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/__init__.py index f94244b2aec5..4e711301d110 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SessionEntityTypesRestInterceptor, SessionEntityTypesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SessionEntityTypesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/base.py index d490b0741624..827d66f6d036 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version +from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc.py index ab0d50c42e1a..0884f496ddfb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -409,12 +409,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -440,12 +440,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -470,12 +470,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc_asyncio.py index 91921c21b523..6ccba3a258c7 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .grpc import SessionEntityTypesGrpcTransport @@ -417,12 +417,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -448,12 +448,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -478,12 +478,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest.py index 5dc44e5b0aee..d597bb4e391a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionEntityTypesRestTransport @@ -629,9 +629,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_create_session_entity_type( request, metadata @@ -783,9 +781,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_delete_session_entity_type( request, metadata @@ -916,9 +912,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_get_session_entity_type( request, metadata @@ -1070,9 +1064,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() request, metadata = self._interceptor.pre_list_session_entity_types( request, metadata @@ -1243,9 +1235,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_update_session_entity_type( request, metadata @@ -1353,7 +1343,9 @@ def create_session_entity_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_session_entity_type( @@ -1363,7 +1355,9 @@ def delete_session_entity_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_session_entity_type( @@ -1385,7 +1379,9 @@ def list_session_entity_types( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListSessionEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._ListSessionEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_session_entity_type( @@ -1396,7 +1392,9 @@ def update_session_entity_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1456,9 +1454,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_transcoded_request( @@ -1597,9 +1593,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_transcoded_request( @@ -1735,9 +1729,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1853,9 +1845,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_transcoded_request( @@ -1994,9 +1984,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest_base.py index c206653f0854..53cd583a0f0f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/async_client.py index 907af0939f39..a7b68fcf7a1e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -146,7 +146,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_info.__func__(SessionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SessionsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SessionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -162,7 +165,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_file.__func__(SessionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SessionsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SessionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/client.py index 11f2e3262e12..fd0e67126a52 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -948,11 +948,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionsClient._read_environment_variables() + ) self._client_cert_source = SessionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -987,8 +985,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/base.py index bcd1a3c86aca..35f7162d6a62 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import session @@ -297,7 +297,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc.py index b5d34c2247fc..f5c5f1a2383f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import session @@ -382,12 +382,12 @@ def server_streaming_detect_intent( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "server_streaming_detect_intent" not in self._stubs: - self._stubs[ - "server_streaming_detect_intent" - ] = self._logged_channel.unary_stream( - "/google.cloud.dialogflow.cx.v3beta1.Sessions/ServerStreamingDetectIntent", - request_serializer=session.DetectIntentRequest.serialize, - response_deserializer=session.DetectIntentResponse.deserialize, + self._stubs["server_streaming_detect_intent"] = ( + self._logged_channel.unary_stream( + "/google.cloud.dialogflow.cx.v3beta1.Sessions/ServerStreamingDetectIntent", + request_serializer=session.DetectIntentRequest.serialize, + response_deserializer=session.DetectIntentResponse.deserialize, + ) ) return self._stubs["server_streaming_detect_intent"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc_asyncio.py index 22449c5e0d83..e58cbe92c04a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import session @@ -394,12 +394,12 @@ def server_streaming_detect_intent( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "server_streaming_detect_intent" not in self._stubs: - self._stubs[ - "server_streaming_detect_intent" - ] = self._logged_channel.unary_stream( - "/google.cloud.dialogflow.cx.v3beta1.Sessions/ServerStreamingDetectIntent", - request_serializer=session.DetectIntentRequest.serialize, - response_deserializer=session.DetectIntentResponse.deserialize, + self._stubs["server_streaming_detect_intent"] = ( + self._logged_channel.unary_stream( + "/google.cloud.dialogflow.cx.v3beta1.Sessions/ServerStreamingDetectIntent", + request_serializer=session.DetectIntentRequest.serialize, + response_deserializer=session.DetectIntentResponse.deserialize, + ) ) return self._stubs["server_streaming_detect_intent"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/rest.py index 8ba97cb30c98..0c1a47043364 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1087,9 +1087,7 @@ def __call__( """ - http_options = ( - _BaseSessionsRestTransport._BaseServerStreamingDetectIntent._get_http_options() - ) + http_options = _BaseSessionsRestTransport._BaseServerStreamingDetectIntent._get_http_options() request, metadata = self._interceptor.pre_server_streaming_detect_intent( request, metadata @@ -1157,11 +1155,10 @@ def __call__( resp = self._interceptor.post_server_streaming_detect_intent(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_server_streaming_detect_intent_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_server_streaming_detect_intent_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1384,7 +1381,9 @@ def server_streaming_detect_intent( ) -> Callable[[session.DetectIntentRequest], session.DetectIntentResponse]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ServerStreamingDetectIntent(self._session, self._host, self._interceptor) # type: ignore + return self._ServerStreamingDetectIntent( + self._session, self._host, self._interceptor + ) # type: ignore @property def streaming_detect_intent( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/async_client.py index 55b041c6aeea..d0aab20e6546 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -46,10 +46,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.test_cases import pagers from google.cloud.dialogflowcx_v3beta1.types import test_case @@ -148,7 +148,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TestCasesAsyncClient: The constructed client. """ - return TestCasesClient.from_service_account_info.__func__(TestCasesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + TestCasesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(TestCasesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -164,7 +167,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TestCasesAsyncClient: The constructed client. """ - return TestCasesClient.from_service_account_file.__func__(TestCasesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + TestCasesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(TestCasesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/client.py index dc7f90c88dc4..090a5c40d854 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -63,10 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.test_cases import pagers from google.cloud.dialogflowcx_v3beta1.types import test_case @@ -923,11 +923,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TestCasesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TestCasesClient._read_environment_variables() + ) self._client_cert_source = TestCasesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -962,8 +960,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TestCasesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/pagers.py index 242ab3429392..be10b85149ab 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/base.py index 0adf24584375..39d7b71776be 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import test_case @@ -384,7 +384,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc.py index c10137675650..64cc557ce417 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import test_case from google.cloud.dialogflowcx_v3beta1.types import test_case as gcdc_test_case diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc_asyncio.py index e08c06542b2d..6e4ef7ebe2eb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import test_case from google.cloud.dialogflowcx_v3beta1.types import test_case as gcdc_test_case diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest.py index 0a8a5830695b..eb035adff9b3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3beta1.types import test_case @@ -1038,9 +1038,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseTestCasesRestTransport._BaseBatchDeleteTestCases._get_http_options() - ) + http_options = _BaseTestCasesRestTransport._BaseBatchDeleteTestCases._get_http_options() request, metadata = self._interceptor.pre_batch_delete_test_cases( request, metadata diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest_base.py index e49b0b00af35..01389b46574a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.types import test_case from google.cloud.dialogflowcx_v3beta1.types import test_case as gcdc_test_case diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/async_client.py index a84bbb244c65..4bed48adf836 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -46,10 +46,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.tools import pagers from google.cloud.dialogflowcx_v3beta1.types import tool @@ -119,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_info.__func__(ToolsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ToolsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ToolsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_file.__func__(ToolsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ToolsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ToolsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/client.py index 259e4efcff57..fb78e475f2f5 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -63,10 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.tools import pagers from google.cloud.dialogflowcx_v3beta1.types import tool @@ -702,11 +702,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ToolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ToolsClient._read_environment_variables() + ) self._client_cert_source = ToolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -741,8 +739,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ToolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/pagers.py index d87d223091a6..e1027691ee08 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/base.py index 279475542534..897f578fa396 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import tool @@ -358,7 +358,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc.py index 85cfe7a197ec..953aa5d9c6e4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import tool from google.cloud.dialogflowcx_v3beta1.types import tool as gcdc_tool diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc_asyncio.py index 975e178243ed..e49c228f34c3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import tool from google.cloud.dialogflowcx_v3beta1.types import tool as gcdc_tool diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest.py index 6af1c1dd4fc3..2f7f69e4d539 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3beta1.types import tool diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest_base.py index bf5b2e1f4c31..2a91882f0133 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.types import tool from google.cloud.dialogflowcx_v3beta1.types import tool as gcdc_tool diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/async_client.py index 6fd0dba69f4f..07dc740760bf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.transition_route_groups import pagers +from google.cloud.dialogflowcx_v3beta1.types import page, transition_route_group from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import page -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from .client import TransitionRouteGroupsClient from .transports.base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport @@ -143,7 +142,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TransitionRouteGroupsAsyncClient: The constructed client. """ - return TransitionRouteGroupsClient.from_service_account_info.__func__(TransitionRouteGroupsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + TransitionRouteGroupsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(TransitionRouteGroupsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +161,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TransitionRouteGroupsAsyncClient: The constructed client. """ - return TransitionRouteGroupsClient.from_service_account_file.__func__(TransitionRouteGroupsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + TransitionRouteGroupsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(TransitionRouteGroupsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -197,7 +202,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return TransitionRouteGroupsClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return TransitionRouteGroupsClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> TransitionRouteGroupsTransport: diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/client.py index 87f961027656..638197df594c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.transition_route_groups import pagers +from google.cloud.dialogflowcx_v3beta1.types import page, transition_route_group from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import page -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from .transports.base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport from .transports.grpc import TransitionRouteGroupsGrpcTransport @@ -86,9 +85,7 @@ class TransitionRouteGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TransitionRouteGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TransitionRouteGroupsTransport]] _transport_registry["grpc"] = TransitionRouteGroupsGrpcTransport _transport_registry["grpc_asyncio"] = TransitionRouteGroupsGrpcAsyncIOTransport _transport_registry["rest"] = TransitionRouteGroupsRestTransport @@ -786,11 +783,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TransitionRouteGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TransitionRouteGroupsClient._read_environment_variables() + ) self._client_cert_source = TransitionRouteGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -825,8 +820,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TransitionRouteGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/pagers.py index 377c9f34e5fa..4d4c30788e3a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -147,7 +147,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/__init__.py index ae6220640bc0..c3a4dc341788 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[TransitionRouteGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[TransitionRouteGroupsTransport]] _transport_registry["grpc"] = TransitionRouteGroupsGrpcTransport _transport_registry["grpc_asyncio"] = TransitionRouteGroupsGrpcAsyncIOTransport _transport_registry["rest"] = TransitionRouteGroupsRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/base.py index fbac0988078a..6c428d51c596 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version +from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc.py index 62b2bdb34874..a9933d5dda11 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from .base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport @@ -351,12 +351,12 @@ def list_transition_route_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_transition_route_groups" not in self._stubs: - self._stubs[ - "list_transition_route_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/ListTransitionRouteGroups", - request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, - response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + self._stubs["list_transition_route_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/ListTransitionRouteGroups", + request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, + response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + ) ) return self._stubs["list_transition_route_groups"] @@ -383,12 +383,12 @@ def get_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_transition_route_group" not in self._stubs: - self._stubs[ - "get_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/GetTransitionRouteGroup", - request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, - response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["get_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/GetTransitionRouteGroup", + request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, + response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["get_transition_route_group"] @@ -420,12 +420,12 @@ def create_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_transition_route_group" not in self._stubs: - self._stubs[ - "create_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/CreateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["create_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/CreateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["create_transition_route_group"] @@ -456,12 +456,12 @@ def update_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_transition_route_group" not in self._stubs: - self._stubs[ - "update_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/UpdateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["update_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/UpdateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["update_transition_route_group"] @@ -491,12 +491,12 @@ def delete_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_transition_route_group" not in self._stubs: - self._stubs[ - "delete_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/DeleteTransitionRouteGroup", - request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/DeleteTransitionRouteGroup", + request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_transition_route_group"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc_asyncio.py index 1fc61f079854..40bb1c3f0ec0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from .base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport from .grpc import TransitionRouteGroupsGrpcTransport @@ -359,12 +359,12 @@ def list_transition_route_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_transition_route_groups" not in self._stubs: - self._stubs[ - "list_transition_route_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/ListTransitionRouteGroups", - request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, - response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + self._stubs["list_transition_route_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/ListTransitionRouteGroups", + request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, + response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + ) ) return self._stubs["list_transition_route_groups"] @@ -391,12 +391,12 @@ def get_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_transition_route_group" not in self._stubs: - self._stubs[ - "get_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/GetTransitionRouteGroup", - request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, - response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["get_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/GetTransitionRouteGroup", + request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, + response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["get_transition_route_group"] @@ -428,12 +428,12 @@ def create_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_transition_route_group" not in self._stubs: - self._stubs[ - "create_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/CreateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["create_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/CreateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["create_transition_route_group"] @@ -464,12 +464,12 @@ def update_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_transition_route_group" not in self._stubs: - self._stubs[ - "update_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/UpdateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["update_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/UpdateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["update_transition_route_group"] @@ -500,12 +500,12 @@ def delete_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_transition_route_group" not in self._stubs: - self._stubs[ - "delete_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/DeleteTransitionRouteGroup", - request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/DeleteTransitionRouteGroup", + request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_transition_route_group"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest.py index e3f9c3b5b135..9858ddb5ef9d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseTransitionRouteGroupsRestTransport @@ -617,9 +617,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseCreateTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseCreateTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_create_transition_route_group( request, metadata @@ -688,11 +686,10 @@ def __call__( resp = self._interceptor.post_create_transition_route_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_transition_route_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_transition_route_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -774,9 +771,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseDeleteTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseDeleteTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_delete_transition_route_group( request, metadata @@ -893,9 +888,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseGetTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseGetTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_get_transition_route_group( request, metadata @@ -1046,9 +1039,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseListTransitionRouteGroups._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseListTransitionRouteGroups._get_http_options() request, metadata = self._interceptor.pre_list_transition_route_groups( request, metadata @@ -1202,9 +1193,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseUpdateTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseUpdateTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_update_transition_route_group( request, metadata @@ -1273,11 +1262,10 @@ def __call__( resp = self._interceptor.post_update_transition_route_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_transition_route_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_transition_route_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1315,7 +1303,9 @@ def create_transition_route_group( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._CreateTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_transition_route_group( @@ -1325,7 +1315,9 @@ def delete_transition_route_group( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_transition_route_group( @@ -1336,7 +1328,9 @@ def get_transition_route_group( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._GetTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_transition_route_groups( @@ -1347,7 +1341,9 @@ def list_transition_route_groups( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListTransitionRouteGroups(self._session, self._host, self._interceptor) # type: ignore + return self._ListTransitionRouteGroups( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_transition_route_group( @@ -1358,7 +1354,9 @@ def update_transition_route_group( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1418,9 +1416,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseGetLocation._get_transcoded_request( @@ -1559,9 +1555,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseListLocations._get_transcoded_request( @@ -1697,9 +1691,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1817,9 +1809,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseGetOperation._get_transcoded_request( @@ -1958,9 +1948,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest_base.py index c18111cde672..b5d5627a5ffe 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from .base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/async_client.py index e2798ea94956..ff956e8c7b8e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -46,16 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.versions import pagers -from google.cloud.dialogflowcx_v3beta1.types import flow -from google.cloud.dialogflowcx_v3beta1.types import version +from google.cloud.dialogflowcx_v3beta1.types import flow, version from google.cloud.dialogflowcx_v3beta1.types import version as gcdc_version from .client import VersionsClient @@ -118,7 +117,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_info.__func__(VersionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + VersionsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(VersionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +136,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_file.__func__(VersionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + VersionsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(VersionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/client.py index 723cfa11bbf2..e0cfa86833db 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -63,16 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.versions import pagers -from google.cloud.dialogflowcx_v3beta1.types import flow -from google.cloud.dialogflowcx_v3beta1.types import version +from google.cloud.dialogflowcx_v3beta1.types import flow, version from google.cloud.dialogflowcx_v3beta1.types import version as gcdc_version from .transports.base import DEFAULT_CLIENT_INFO, VersionsTransport @@ -635,11 +634,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VersionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VersionsClient._read_environment_variables() + ) self._client_cert_source = VersionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -674,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VersionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/pagers.py index ea44c83c5103..c225d35927fe 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/base.py index 9db75380e24f..50a8395abd21 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import version @@ -307,7 +307,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc.py index dfd5d03aa3bb..d29e5061d033 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import version from google.cloud.dialogflowcx_v3beta1.types import version as gcdc_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc_asyncio.py index b73048ca2bb2..601818b71b2a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import version from google.cloud.dialogflowcx_v3beta1.types import version as gcdc_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest.py index e120553f2caa..c0b493a173c5 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3beta1.types import version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest_base.py index 7ded2f9dd5cb..4f664dcb9cc0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.types import version from google.cloud.dialogflowcx_v3beta1.types import version as gcdc_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/async_client.py index 59143a8b36dd..8e9c70890a58 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.webhooks import pagers from google.cloud.dialogflowcx_v3beta1.types import webhook @@ -117,7 +117,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: WebhooksAsyncClient: The constructed client. """ - return WebhooksClient.from_service_account_info.__func__(WebhooksAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + WebhooksClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(WebhooksAsyncClient, 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: WebhooksAsyncClient: The constructed client. """ - return WebhooksClient.from_service_account_file.__func__(WebhooksAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + WebhooksClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(WebhooksAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/client.py index b94b7e2eb89d..43266452a1c9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.webhooks import pagers from google.cloud.dialogflowcx_v3beta1.types import webhook @@ -674,11 +674,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = WebhooksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + WebhooksClient._read_environment_variables() + ) self._client_cert_source = WebhooksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -713,8 +711,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(WebhooksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/pagers.py index 1a64130c1c37..a7fc8b68da6a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/base.py index c14ac00beaaf..f6555acd0481 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import webhook @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc.py index 105d0e33bffb..646ba3c441e2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import webhook from google.cloud.dialogflowcx_v3beta1.types import webhook as gcdc_webhook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc_asyncio.py index 65fa66da56d3..26d314aec8d8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import webhook from google.cloud.dialogflowcx_v3beta1.types import webhook as gcdc_webhook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest.py index e7d6b596d4b3..e3b90e986751 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflowcx_v3beta1.types import webhook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest_base.py index 0bdaf0a7bc1a..36b07d1170f0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.types import webhook from google.cloud.dialogflowcx_v3beta1.types import webhook as gcdc_webhook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/__init__.py index ea9e527b8595..5d38b65b5211 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .advanced_settings import AdvancedSettings +from .advanced_settings import ( + AdvancedSettings, +) from .agent import ( Agent, AgentValidationResult, @@ -45,14 +47,18 @@ TextToSpeechSettings, VoiceSelectionParams, ) -from .bigquery_export import BigQueryExportSettings +from .bigquery_export import ( + BigQueryExportSettings, +) from .changelog import ( Changelog, GetChangelogRequest, ListChangelogsRequest, ListChangelogsResponse, ) -from .code_block import CodeBlock +from .code_block import ( + CodeBlock, +) from .conversation_history import ( Conversation, DeleteConversationRequest, @@ -150,9 +156,16 @@ UpdateFlowRequest, ValidateFlowRequest, ) -from .fulfillment import Fulfillment -from .gcs import GcsDestination -from .generative_settings import GenerativeSettings, LlmModelSettings +from .fulfillment import ( + Fulfillment, +) +from .gcs import ( + GcsDestination, +) +from .generative_settings import ( + GenerativeSettings, + LlmModelSettings, +) from .generator import ( CreateGeneratorRequest, DeleteGeneratorRequest, @@ -163,8 +176,13 @@ Phrase, UpdateGeneratorRequest, ) -from .import_strategy import ImportStrategy -from .inline import InlineDestination, InlineSource +from .import_strategy import ( + ImportStrategy, +) +from .inline import ( + InlineDestination, + InlineSource, +) from .intent import ( CreateIntentRequest, DeleteIntentRequest, @@ -223,8 +241,12 @@ RestorePlaybookVersionResponse, UpdatePlaybookRequest, ) -from .response_message import ResponseMessage -from .safety_settings import SafetySettings +from .response_message import ( + ResponseMessage, +) +from .safety_settings import ( + SafetySettings, +) from .security_settings import ( CreateSecuritySettingsRequest, DeleteSecuritySettingsRequest, @@ -329,7 +351,10 @@ ToolVersion, UpdateToolRequest, ) -from .tool_call import ToolCall, ToolCallResult +from .tool_call import ( + ToolCall, + ToolCallResult, +) from .trace import ( Action, AgentUtterance, @@ -359,7 +384,10 @@ TransitionRouteGroup, UpdateTransitionRouteGroupRequest, ) -from .validation_message import ResourceName, ValidationMessage +from .validation_message import ( + ResourceName, + ValidationMessage, +) from .version import ( CompareVersionsRequest, CompareVersionsResponse, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/agent.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/agent.py index 14eea402bfeb..37ac2227b27b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/agent.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/agent.py @@ -21,10 +21,10 @@ import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import audio_config, bigquery_export, flow from google.cloud.dialogflowcx_v3beta1.types import ( advanced_settings as gcdc_advanced_settings, ) +from google.cloud.dialogflowcx_v3beta1.types import audio_config, bigquery_export, flow from google.cloud.dialogflowcx_v3beta1.types import ( generative_settings as gcdc_generative_settings, ) @@ -720,6 +720,7 @@ class DataFormat(proto.Enum): Agent content will be exported in JSON Package format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON_PACKAGE = 4 @@ -876,6 +877,7 @@ class RestoreOption(proto.Enum): Fallback to default settings if some settings are not supported in the target agent. """ + RESTORE_OPTION_UNSPECIFIED = 0 KEEP = 1 FALLBACK = 2 @@ -983,12 +985,12 @@ class AgentValidationResult(proto.Message): proto.STRING, number=1, ) - flow_validation_results: MutableSequence[ - flow.FlowValidationResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=flow.FlowValidationResult, + flow_validation_results: MutableSequence[flow.FlowValidationResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=flow.FlowValidationResult, + ) ) diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/audio_config.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/audio_config.py index 4323054ff007..d0621a7f39a9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/audio_config.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/audio_config.py @@ -91,6 +91,7 @@ class AudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + AUDIO_ENCODING_UNSPECIFIED = 0 AUDIO_ENCODING_LINEAR_16 = 1 AUDIO_ENCODING_FLAC = 2 @@ -139,6 +140,7 @@ class SpeechModelVariant(proto.Enum): documentation `__ describes which models have enhanced variants. """ + SPEECH_MODEL_VARIANT_UNSPECIFIED = 0 USE_BEST_AVAILABLE = 1 USE_STANDARD = 2 @@ -161,6 +163,7 @@ class SsmlVoiceGender(proto.Enum): SSML_VOICE_GENDER_NEUTRAL (3): A gender-neutral voice. """ + SSML_VOICE_GENDER_UNSPECIFIED = 0 SSML_VOICE_GENDER_MALE = 1 SSML_VOICE_GENDER_FEMALE = 2 @@ -195,6 +198,7 @@ class OutputAudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + OUTPUT_AUDIO_ENCODING_UNSPECIFIED = 0 OUTPUT_AUDIO_ENCODING_LINEAR_16 = 1 OUTPUT_AUDIO_ENCODING_MP3 = 2 @@ -559,13 +563,13 @@ class TextToSpeechSettings(proto.Message): is not specified. """ - synthesize_speech_configs: MutableMapping[ - str, "SynthesizeSpeechConfig" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=1, - message="SynthesizeSpeechConfig", + synthesize_speech_configs: MutableMapping[str, "SynthesizeSpeechConfig"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=1, + message="SynthesizeSpeechConfig", + ) ) diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/conversation_history.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/conversation_history.py index 0d6105838639..40b11982c665 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/conversation_history.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/conversation_history.py @@ -213,6 +213,7 @@ class Type(proto.Enum): none of the requests contain text or audio input (eg. event or intent input). """ + TYPE_UNSPECIFIED = 0 AUDIO = 1 TEXT = 2 @@ -496,12 +497,12 @@ class StepMetrics(proto.Message): number=2, message=session.DetectIntentResponse, ) - partial_responses: MutableSequence[ - session.DetectIntentResponse - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=session.DetectIntentResponse, + partial_responses: MutableSequence[session.DetectIntentResponse] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=session.DetectIntentResponse, + ) ) request_utterances: str = proto.Field( proto.STRING, @@ -526,12 +527,12 @@ class StepMetrics(proto.Message): number=8, message="Conversation.Interaction.MissingTransition", ) - step_metrics: MutableSequence[ - "Conversation.Interaction.StepMetrics" - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message="Conversation.Interaction.StepMetrics", + step_metrics: MutableSequence["Conversation.Interaction.StepMetrics"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message="Conversation.Interaction.StepMetrics", + ) ) name: str = proto.Field( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/data_store_connection.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/data_store_connection.py index 3c01dfd9f887..2e4dc872e563 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/data_store_connection.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/data_store_connection.py @@ -50,6 +50,7 @@ class DataStoreType(proto.Enum): A data store that contains structured data (for example FAQ). """ + DATA_STORE_TYPE_UNSPECIFIED = 0 PUBLIC_WEB = 1 UNSTRUCTURED = 2 @@ -69,6 +70,7 @@ class DocumentProcessingMode(proto.Enum): CHUNKS (2): Documents are converted to chunks. """ + DOCUMENT_PROCESSING_MODE_UNSPECIFIED = 0 DOCUMENTS = 1 CHUNKS = 2 @@ -295,6 +297,7 @@ class GroundingDecision(proto.Enum): REJECTED_BY_GROUNDING (2): Grounding have rejected the answer. """ + GROUNDING_DECISION_UNSPECIFIED = 0 ACCEPTED_BY_GROUNDING = 1 REJECTED_BY_GROUNDING = 2 @@ -321,6 +324,7 @@ class GroundingScoreBucket(proto.Enum): We have very high confidence that the answer is grounded. """ + GROUNDING_SCORE_BUCKET_UNSPECIFIED = 0 VERY_LOW = 1 LOW = 3 @@ -369,6 +373,7 @@ class SafetyDecision(proto.Enum): REJECTED_BY_SAFETY_CHECK (2): One ore more safety checks fired. """ + SAFETY_DECISION_UNSPECIFIED = 0 ACCEPTED_BY_SAFETY_CHECK = 1 REJECTED_BY_SAFETY_CHECK = 2 @@ -386,6 +391,7 @@ class BannedPhraseMatch(proto.Enum): BANNED_PHRASE_MATCH_RESPONSE (3): A banned phrase matched the response. """ + BANNED_PHRASE_MATCH_UNSPECIFIED = 0 BANNED_PHRASE_MATCH_NONE = 1 BANNED_PHRASE_MATCH_QUERY = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/deployment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/deployment.py index d3bdd0447e67..bc488bcb96b9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/deployment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/deployment.py @@ -72,6 +72,7 @@ class State(proto.Enum): FAILED (3): The deployment failed. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/entity_type.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/entity_type.py index 20669b1288b0..873465bbf918 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/entity_type.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/entity_type.py @@ -129,6 +129,7 @@ class Kind(proto.Enum): Regexp entity types allow to specify regular expressions in entries values. """ + KIND_UNSPECIFIED = 0 KIND_MAP = 1 KIND_LIST = 2 @@ -147,6 +148,7 @@ class AutoExpansionMode(proto.Enum): Allows an agent to recognize values that have not been explicitly listed in the entity. """ + AUTO_EXPANSION_MODE_UNSPECIFIED = 0 AUTO_EXPANSION_MODE_DEFAULT = 1 @@ -305,6 +307,7 @@ class DataFormat(proto.Enum): EntityTypes will be exported in JSON Package format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON_PACKAGE = 5 @@ -461,6 +464,7 @@ class MergeOption(proto.Enum): conflicting new entity type when display name conflicts exist. """ + MERGE_OPTION_UNSPECIFIED = 0 REPLACE = 1 MERGE = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/environment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/environment.py index c0c19fd8f947..2e17fda1d129 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/environment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/environment.py @@ -436,6 +436,7 @@ class AggregatedTestResult(proto.Enum): FAILED (2): At least one test did not pass. """ + AGGREGATED_TEST_RESULT_UNSPECIFIED = 0 PASSED = 1 FAILED = 2 @@ -555,12 +556,12 @@ class ListContinuousTestResultsResponse(proto.Message): def raw_page(self): return self - continuous_test_results: MutableSequence[ - "ContinuousTestResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ContinuousTestResult", + continuous_test_results: MutableSequence["ContinuousTestResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ContinuousTestResult", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/experiment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/experiment.py index b079ca85df92..1acac0bd4a46 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/experiment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/experiment.py @@ -119,6 +119,7 @@ class State(proto.Enum): The experiment with auto-rollout enabled has failed. """ + STATE_UNSPECIFIED = 0 DRAFT = 1 RUNNING = 2 @@ -189,6 +190,7 @@ class MetricType(proto.Enum): Percentage of sessions reached Dialogflow 'END_PAGE' or 'END_SESSION'. """ + METRIC_UNSPECIFIED = 0 CONTAINED_SESSION_NO_CALLBACK_RATE = 1 LIVE_AGENT_HANDOFF_RATE = 2 @@ -209,6 +211,7 @@ class CountType(proto.Enum): AVERAGE_TURN_COUNT (3): Average turn count in a session. """ + COUNT_TYPE_UNSPECIFIED = 0 TOTAL_NO_MATCH_COUNT = 1 TOTAL_TURN_COUNT = 2 @@ -336,12 +339,12 @@ class VersionMetrics(proto.Message): number=3, ) - version_metrics: MutableSequence[ - "Experiment.Result.VersionMetrics" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Experiment.Result.VersionMetrics", + version_metrics: MutableSequence["Experiment.Result.VersionMetrics"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Experiment.Result.VersionMetrics", + ) ) last_update_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/flow.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/flow.py index c9588074682e..4c0f60dd3c3c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/flow.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/flow.py @@ -21,15 +21,15 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import ( + advanced_settings as gcdc_advanced_settings, +) from google.cloud.dialogflowcx_v3beta1.types import ( import_strategy, page, parameter_definition, validation_message, ) -from google.cloud.dialogflowcx_v3beta1.types import ( - advanced_settings as gcdc_advanced_settings, -) __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3beta1", @@ -88,6 +88,7 @@ class ModelType(proto.Enum): MODEL_TYPE_ADVANCED (3): Use advanced NLU model. """ + MODEL_TYPE_UNSPECIFIED = 0 MODEL_TYPE_STANDARD = 1 MODEL_TYPE_ADVANCED = 3 @@ -108,6 +109,7 @@ class ModelTrainingMode(proto.Enum): training. Best for large flows whose models take long time to train. """ + MODEL_TRAINING_MODE_UNSPECIFIED = 0 MODEL_TRAINING_MODE_AUTOMATIC = 1 MODEL_TRAINING_MODE_MANUAL = 2 @@ -629,12 +631,12 @@ class FlowValidationResult(proto.Message): proto.STRING, number=1, ) - validation_messages: MutableSequence[ - validation_message.ValidationMessage - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=validation_message.ValidationMessage, + validation_messages: MutableSequence[validation_message.ValidationMessage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=validation_message.ValidationMessage, + ) ) update_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, @@ -699,6 +701,7 @@ class ImportOption(proto.Enum): E.g. Standard NLU will be used if custom NLU is not available. """ + IMPORT_OPTION_UNSPECIFIED = 0 KEEP = 1 FALLBACK = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/fulfillment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/fulfillment.py index 2659f23e3dda..a02af854f4e5 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/fulfillment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/fulfillment.py @@ -201,12 +201,12 @@ class CaseContent(proto.Message): message="Fulfillment.ConditionalCases.Case.CaseContent", ) - cases: MutableSequence[ - "Fulfillment.ConditionalCases.Case" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Fulfillment.ConditionalCases.Case", + cases: MutableSequence["Fulfillment.ConditionalCases.Case"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Fulfillment.ConditionalCases.Case", + ) ) class GeneratorSettings(proto.Message): diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/generative_settings.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/generative_settings.py index 7ffffad84dc7..9eb72bbc54d2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/generative_settings.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/generative_settings.py @@ -246,6 +246,7 @@ class InputTokenLimit(proto.Enum): INPUT_TOKEN_LIMIT_LONG (3): Input token limit up to 100k. """ + INPUT_TOKEN_LIMIT_UNSPECIFIED = 0 INPUT_TOKEN_LIMIT_SHORT = 1 INPUT_TOKEN_LIMIT_MEDIUM = 2 @@ -267,6 +268,7 @@ class OutputTokenLimit(proto.Enum): OUTPUT_TOKEN_LIMIT_LONG (3): Input token limit up to 2k. """ + OUTPUT_TOKEN_LIMIT_UNSPECIFIED = 0 OUTPUT_TOKEN_LIMIT_SHORT = 1 OUTPUT_TOKEN_LIMIT_MEDIUM = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/import_strategy.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/import_strategy.py index b3a3a6da24f6..3ade8cd9df41 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/import_strategy.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/import_strategy.py @@ -51,6 +51,7 @@ class ImportStrategy(proto.Enum): IMPORT_STRATEGY_THROW_ERROR (5): Throw error if a conflict is encountered. """ + IMPORT_STRATEGY_UNSPECIFIED = 0 IMPORT_STRATEGY_CREATE_NEW = 1 IMPORT_STRATEGY_REPLACE = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/intent.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/intent.py index ecd2bf45565e..276ea8807e7e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/intent.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/intent.py @@ -58,6 +58,7 @@ class IntentView(proto.Enum): INTENT_VIEW_FULL (2): All fields are populated. """ + INTENT_VIEW_UNSPECIFIED = 0 INTENT_VIEW_PARTIAL = 1 INTENT_VIEW_FULL = 2 @@ -560,6 +561,7 @@ class MergeOption(proto.Enum): conflicting new intent when display name conflicts exist. """ + MERGE_OPTION_UNSPECIFIED = 0 REJECT = 1 REPLACE = 2 @@ -699,6 +701,7 @@ class DataFormat(proto.Enum): CSV (3): Intents will be exported in CSV format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/page.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/page.py index 5ec4a099dcd8..b527bd56be8e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/page.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/page.py @@ -21,10 +21,10 @@ import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import data_store_connection, fulfillment from google.cloud.dialogflowcx_v3beta1.types import ( advanced_settings as gcdc_advanced_settings, ) +from google.cloud.dialogflowcx_v3beta1.types import data_store_connection, fulfillment __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3beta1", @@ -304,12 +304,12 @@ class FillBehavior(proto.Message): number=3, message=fulfillment.Fulfillment, ) - reprompt_event_handlers: MutableSequence[ - "EventHandler" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="EventHandler", + reprompt_event_handlers: MutableSequence["EventHandler"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="EventHandler", + ) ) display_name: str = proto.Field( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/parameter_definition.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/parameter_definition.py index 3e1a35e46ca3..9a99d8729ed0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/parameter_definition.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/parameter_definition.py @@ -47,6 +47,7 @@ class DataType(proto.Enum): ARRAY (6): Represents a repeated value. """ + DATA_TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -92,6 +93,7 @@ class ParameterType(proto.Enum): LIST (6): Represents a repeated value. """ + PARAMETER_TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/playbook.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/playbook.py index 5ce0c4ff1a4d..16432a599eb9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/playbook.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/playbook.py @@ -21,15 +21,17 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import ( + advanced_settings, + example, + generative_settings, + parameter_definition, +) from google.cloud.dialogflowcx_v3beta1.types import code_block as gcdc_code_block from google.cloud.dialogflowcx_v3beta1.types import fulfillment as gcdc_fulfillment from google.cloud.dialogflowcx_v3beta1.types import ( import_strategy as gcdc_import_strategy, ) -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings -from google.cloud.dialogflowcx_v3beta1.types import example -from google.cloud.dialogflowcx_v3beta1.types import generative_settings -from google.cloud.dialogflowcx_v3beta1.types import parameter_definition __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3beta1", @@ -286,6 +288,7 @@ class PlaybookType(proto.Enum): ROUTINE (3): Routine playbook. """ + PLAYBOOK_TYPE_UNSPECIFIED = 0 TASK = 1 ROUTINE = 3 @@ -662,6 +665,7 @@ class DataFormat(proto.Enum): JSON (2): Flow content will be exported in JSON format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/response_message.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/response_message.py index db976f03ff4d..e4cf2c5f2ddc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/response_message.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/response_message.py @@ -357,12 +357,12 @@ class Segment(proto.Message): number=3, ) - segments: MutableSequence[ - "ResponseMessage.MixedAudio.Segment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ResponseMessage.MixedAudio.Segment", + segments: MutableSequence["ResponseMessage.MixedAudio.Segment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ResponseMessage.MixedAudio.Segment", + ) ) class TelephonyTransferCall(proto.Message): diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/safety_settings.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/safety_settings.py index 298d71019785..7c75da92ed56 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/safety_settings.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/safety_settings.py @@ -64,6 +64,7 @@ class PhraseMatchStrategy(proto.Enum): phrase will be matched, e.g. "foo" will match "a foo bar" and "foo bar", but not "foobar". """ + PHRASE_MATCH_STRATEGY_UNSPECIFIED = 0 PARTIAL_MATCH = 1 WORD_MATCH = 2 @@ -113,6 +114,7 @@ class SafetyFilterLevel(proto.Enum): BLOCK_MOST (4): Block most suspicious texts. """ + SAFETY_FILTER_LEVEL_UNSPECIFIED = 0 BLOCK_NONE = 1 BLOCK_FEW = 2 @@ -134,6 +136,7 @@ class SafetyCategory(proto.Enum): SEXUALLY_EXPLICIT_CONTENT (4): Sexually explicit content. """ + SAFETY_CATEGORY_UNSPECIFIED = 0 DANGEROUS_CONTENT = 1 HATE_SPEECH = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/security_settings.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/security_settings.py index 582eaa6ef4ec..af40c6d04b5b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/security_settings.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/security_settings.py @@ -309,6 +309,7 @@ class RedactionStrategy(proto.Enum): Call redaction service to clean up the data to be persisted. """ + REDACTION_STRATEGY_UNSPECIFIED = 0 REDACT_WITH_SERVICE = 1 @@ -324,6 +325,7 @@ class RedactionScope(proto.Enum): power is disconnected. This includes data that are temporarily saved on disk. """ + REDACTION_SCOPE_UNSPECIFIED = 0 REDACT_DISK_STORAGE = 2 @@ -341,6 +343,7 @@ class RetentionStrategy(proto.Enum): explicitly established, a default conversation ends when the corresponding Dialogflow session ends. """ + RETENTION_STRATEGY_UNSPECIFIED = 0 REMOVE_AFTER_CONVERSATION = 1 @@ -356,6 +359,7 @@ class PurgeDataType(proto.Enum): Cloud logging, which is owned by the user - not Dialogflow. """ + PURGE_DATA_TYPE_UNSPECIFIED = 0 DIALOGFLOW_HISTORY = 1 @@ -403,6 +407,7 @@ class AudioFormat(proto.Enum): OGG (3): OGG Vorbis. """ + AUDIO_FORMAT_UNSPECIFIED = 0 MULAW = 1 MP3 = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session.py index 9794b65edaef..cf7df84778de 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session.py @@ -24,22 +24,20 @@ import google.type.latlng_pb2 as latlng_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import ( + advanced_settings as gcdc_advanced_settings, +) from google.cloud.dialogflowcx_v3beta1.types import ( audio_config, data_store_connection, example, flow, generative_settings, -) -from google.cloud.dialogflowcx_v3beta1.types import ( page, response_message, session_entity_type, tool_call, ) -from google.cloud.dialogflowcx_v3beta1.types import ( - advanced_settings as gcdc_advanced_settings, -) from google.cloud.dialogflowcx_v3beta1.types import intent as gcdc_intent __protobuf__ = proto.module( @@ -96,6 +94,7 @@ class DetectIntentResponseView(proto.Enum): [QueryResult.generative_info][google.cloud.dialogflow.cx.v3beta1.QueryResult.generative_info] """ + DETECT_INTENT_RESPONSE_VIEW_UNSPECIFIED = 0 DETECT_INTENT_RESPONSE_VIEW_FULL = 1 DETECT_INTENT_RESPONSE_VIEW_BASIC = 2 @@ -132,6 +131,7 @@ class Rating(proto.Enum): THUMBS_DOWN (2): Thumbs down feedback from user. """ + RATING_UNSPECIFIED = 0 THUMBS_UP = 1 THUMBS_DOWN = 2 @@ -326,6 +326,7 @@ class ResponseType(proto.Enum): FINAL (2): Final response. """ + RESPONSE_TYPE_UNSPECIFIED = 0 PARTIAL = 1 FINAL = 2 @@ -550,19 +551,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=5, ) - speech_partial_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=duration_pb2.Duration, + speech_partial_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=duration_pb2.Duration, + ) ) - speech_final_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=duration_pb2.Duration, + speech_final_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=duration_pb2.Duration, + ) ) partial_responses: int = proto.Field( proto.INT32, @@ -580,19 +581,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=11, ) - dtmf_partial_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=12, - message=duration_pb2.Duration, + dtmf_partial_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12, + message=duration_pb2.Duration, + ) ) - dtmf_final_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=13, - message=duration_pb2.Duration, + dtmf_final_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=13, + message=duration_pb2.Duration, + ) ) single_utterance_end_time_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, @@ -801,6 +802,7 @@ class MessageType(proto.Enum): [``single_utterance``][google.cloud.dialogflow.cx.v3beta1.InputAudioConfig.single_utterance] was set to ``true``, and is not used otherwise. """ + MESSAGE_TYPE_UNSPECIFIED = 0 TRANSCRIPT = 1 END_OF_SINGLE_UTTERANCE = 2 @@ -826,12 +828,12 @@ class MessageType(proto.Enum): proto.FLOAT, number=6, ) - speech_word_info: MutableSequence[ - audio_config.SpeechWordInfo - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=audio_config.SpeechWordInfo, + speech_word_info: MutableSequence[audio_config.SpeechWordInfo] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=audio_config.SpeechWordInfo, + ) ) speech_end_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, @@ -1024,12 +1026,12 @@ class QueryParameters(proto.Message): number=2, message=latlng_pb2.LatLng, ) - session_entity_types: MutableSequence[ - session_entity_type.SessionEntityType - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=session_entity_type.SessionEntityType, + session_entity_types: MutableSequence[session_entity_type.SessionEntityType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=session_entity_type.SessionEntityType, + ) ) payload: struct_pb2.Struct = proto.Field( proto.MESSAGE, @@ -1238,6 +1240,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. E.g. ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -1254,6 +1257,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -1714,12 +1718,12 @@ class QueryResult(proto.Message): number=3, message=struct_pb2.Struct, ) - response_messages: MutableSequence[ - response_message.ResponseMessage - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=response_message.ResponseMessage, + response_messages: MutableSequence[response_message.ResponseMessage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=response_message.ResponseMessage, + ) ) webhook_ids: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -1981,6 +1985,7 @@ class MatchType(proto.Enum): The query was handled by a [``Playbook``][google.cloud.dialogflow.cx.v3beta1.Playbook]. """ + MATCH_TYPE_UNSPECIFIED = 0 INTENT = 1 DIRECT_INTENT = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session_entity_type.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session_entity_type.py index 2efa0e7840a0..11eecb9c1def 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session_entity_type.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session_entity_type.py @@ -95,6 +95,7 @@ class EntityOverrideMode(proto.Enum): [EntityTypes.GetEntityType][google.cloud.dialogflow.cx.v3beta1.EntityTypes.GetEntityType] on the custom entity type and merge. """ + ENTITY_OVERRIDE_MODE_UNSPECIFIED = 0 ENTITY_OVERRIDE_MODE_OVERRIDE = 1 ENTITY_OVERRIDE_MODE_SUPPLEMENT = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/test_case.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/test_case.py index 6c70b67f4ce3..7987cf7a10a0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/test_case.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/test_case.py @@ -23,14 +23,14 @@ import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import flow as gcdc_flow +from google.cloud.dialogflowcx_v3beta1.types import intent as gcdc_intent +from google.cloud.dialogflowcx_v3beta1.types import page as gcdc_page from google.cloud.dialogflowcx_v3beta1.types import ( response_message, session, transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import flow as gcdc_flow -from google.cloud.dialogflowcx_v3beta1.types import intent as gcdc_intent -from google.cloud.dialogflowcx_v3beta1.types import page as gcdc_page __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3beta1", @@ -84,6 +84,7 @@ class TestResult(proto.Enum): FAILED (2): The test did not pass. """ + TEST_RESULT_UNSPECIFIED = 0 PASSED = 1 FAILED = 2 @@ -145,12 +146,12 @@ class TestCase(proto.Message): number=13, message="TestConfig", ) - test_case_conversation_turns: MutableSequence[ - "ConversationTurn" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="ConversationTurn", + test_case_conversation_turns: MutableSequence["ConversationTurn"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="ConversationTurn", + ) ) creation_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, @@ -363,12 +364,12 @@ class VirtualAgentOutput(proto.Message): number=8, message=gcdc_page.Page, ) - text_responses: MutableSequence[ - response_message.ResponseMessage.Text - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message=response_message.ResponseMessage.Text, + text_responses: MutableSequence[response_message.ResponseMessage.Text] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message=response_message.ResponseMessage.Text, + ) ) status: status_pb2.Status = proto.Field( proto.MESSAGE, @@ -417,6 +418,7 @@ class DiffType(proto.Enum): FLOW (5): The flow. """ + DIFF_TYPE_UNSPECIFIED = 0 INTENT = 1 PAGE = 2 @@ -707,6 +709,7 @@ class CoverageType(proto.Enum): TRANSITION_ROUTE_GROUP (3): Transition route group coverage. """ + COVERAGE_TYPE_UNSPECIFIED = 0 INTENT = 1 PAGE_TRANSITION = 2 @@ -814,6 +817,7 @@ class TestCaseView(proto.Enum): FULL (2): Include everything. """ + TEST_CASE_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -1254,6 +1258,7 @@ class DataFormat(proto.Enum): JSON (2): JSON format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/tool.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/tool.py index 3825728a270f..bedc106927e4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/tool.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/tool.py @@ -197,6 +197,7 @@ class DataFormat(proto.Enum): BLOB (1): Tools will be exported as raw bytes. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 @@ -377,6 +378,7 @@ class ToolType(proto.Enum): First party built-in tool created by Dialogflow which cannot be modified. """ + TOOL_TYPE_UNSPECIFIED = 0 CUSTOMIZED_TOOL = 1 BUILTIN_TOOL = 2 @@ -583,6 +585,7 @@ class OperationType(proto.Enum): DELETE (5): Delete operation. """ + OPERATION_TYPE_UNSPECIFIED = 0 LIST = 1 GET = 2 @@ -684,6 +687,7 @@ class RequestLocation(proto.Enum): QUERY_STRING (2): Represents the key in query string. """ + REQUEST_LOCATION_UNSPECIFIED = 0 HEADER = 1 QUERY_STRING = 2 @@ -764,6 +768,7 @@ class OauthGrantType(proto.Enum): Represents the `client credential flow `__. """ + OAUTH_GRANT_TYPE_UNSPECIFIED = 0 CLIENT_CREDENTIAL = 1 @@ -827,6 +832,7 @@ class ServiceAgentAuth(proto.Enum): other Google Cloud APIs after you grant required roles to ``service-@gcp-sa-dialogflow.iam.gserviceaccount.com``. """ + SERVICE_AGENT_AUTH_UNSPECIFIED = 0 ID_TOKEN = 1 ACCESS_TOKEN = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/trace.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/trace.py index 453e4251072a..356ac6e036cc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/trace.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/trace.py @@ -65,6 +65,7 @@ class OutputState(proto.Enum): OUTPUT_STATE_PENDING (5): Pending. """ + OUTPUT_STATE_UNSPECIFIED = 0 OUTPUT_STATE_OK = 1 OUTPUT_STATE_CANCELLED = 2 @@ -89,6 +90,7 @@ class RetrievalStrategy(proto.Enum): Example will never be inserted into the prompt. """ + RETRIEVAL_STRATEGY_UNSPECIFIED = 0 DEFAULT = 1 STATIC = 2 @@ -229,12 +231,12 @@ class MatchedIntent(proto.Message): message=struct_pb2.Struct, ) - matched_intents: MutableSequence[ - "Action.IntentMatch.MatchedIntent" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Action.IntentMatch.MatchedIntent", + matched_intents: MutableSequence["Action.IntentMatch.MatchedIntent"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Action.IntentMatch.MatchedIntent", + ) ) class FlowStateUpdate(proto.Message): @@ -922,6 +924,7 @@ class State(proto.Enum): ESCALATED (4): Playbook failed due to escalation. """ + _pb_options = {"deprecated": True} STATE_UNSPECIFIED = 0 OK = 1 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/transition_route_group.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/transition_route_group.py index 777dab93a95a..52d78732b779 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/transition_route_group.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/transition_route_group.py @@ -146,12 +146,12 @@ class ListTransitionRouteGroupsResponse(proto.Message): def raw_page(self): return self - transition_route_groups: MutableSequence[ - "TransitionRouteGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="TransitionRouteGroup", + transition_route_groups: MutableSequence["TransitionRouteGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="TransitionRouteGroup", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/validation_message.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/validation_message.py index eed678fbf8c2..926b97659d21 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/validation_message.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/validation_message.py @@ -82,6 +82,7 @@ class ResourceType(proto.Enum): AGENT_TRANSITION_ROUTE_GROUP (14): Agent transition route group. """ + RESOURCE_TYPE_UNSPECIFIED = 0 AGENT = 1 INTENT = 2 @@ -112,6 +113,7 @@ class Severity(proto.Enum): ERROR (3): The agent may experience failures. """ + SEVERITY_UNSPECIFIED = 0 INFO = 1 WARNING = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/version.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/version.py index 46c53f4dce48..0cbd0233ff60 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/version.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/version.py @@ -100,6 +100,7 @@ class State(proto.Enum): FAILED (3): Version training failed. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/webhook.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/webhook.py index c1f1cb78e12e..f78ae89780e4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/webhook.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/webhook.py @@ -184,6 +184,7 @@ class ServiceAgentAuth(proto.Enum): other Google Cloud APIs after you grant required roles to ``service-@gcp-sa-dialogflow.iam.gserviceaccount.com``. """ + SERVICE_AGENT_AUTH_UNSPECIFIED = 0 NONE = 1 ID_TOKEN = 2 @@ -200,6 +201,7 @@ class WebhookType(proto.Enum): FLEXIBLE (2): Represents a flexible webhook. """ + WEBHOOK_TYPE_UNSPECIFIED = 0 STANDARD = 1 FLEXIBLE = 2 @@ -225,6 +227,7 @@ class HttpMethod(proto.Enum): OPTIONS (7): HTTP OPTIONS Method. """ + HTTP_METHOD_UNSPECIFIED = 0 POST = 1 GET = 2 @@ -926,16 +929,17 @@ class MergeBehavior(proto.Enum): ``messages`` will replace the list of messages waiting to be sent to the user. """ + MERGE_BEHAVIOR_UNSPECIFIED = 0 APPEND = 1 REPLACE = 2 - messages: MutableSequence[ - response_message.ResponseMessage - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=response_message.ResponseMessage, + messages: MutableSequence[response_message.ResponseMessage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=response_message.ResponseMessage, + ) ) merge_behavior: "WebhookResponse.FulfillmentResponse.MergeBehavior" = ( proto.Field( @@ -1079,6 +1083,7 @@ class ParameterState(proto.Enum): FILLED (3): Indicates that the parameter has a value. """ + PARAMETER_STATE_UNSPECIFIED = 0 EMPTY = 1 INVALID = 2 @@ -1107,12 +1112,12 @@ class ParameterState(proto.Enum): number=5, ) - parameter_info: MutableSequence[ - "PageInfo.FormInfo.ParameterInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="PageInfo.FormInfo.ParameterInfo", + parameter_info: MutableSequence["PageInfo.FormInfo.ParameterInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="PageInfo.FormInfo.ParameterInfo", + ) ) current_page: str = proto.Field( diff --git a/packages/google-cloud-dialogflow-cx/mypy.ini b/packages/google-cloud-dialogflow-cx/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-dialogflow-cx/mypy.ini +++ b/packages/google-cloud-dialogflow-cx/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-dialogflow-cx/noxfile.py b/packages/google-cloud-dialogflow-cx/noxfile.py index a6461ae4ced2..51b100fb7ab7 100644 --- a/packages/google-cloud-dialogflow-cx/noxfile.py +++ b/packages/google-cloud-dialogflow-cx/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_agents.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_agents.py index dcb0f60947b9..972851be2899 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_agents.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_agents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 from google.cloud.dialogflowcx_v3.services.agents import ( AgentsAsyncClient, @@ -74,14 +74,18 @@ transports, ) from google.cloud.dialogflowcx_v3.types import ( - generative_settings as gcdc_generative_settings, + advanced_settings, + agent, + audio_config, + flow, + gcs, + generative_settings, + safety_settings, ) -from google.cloud.dialogflowcx_v3.types import advanced_settings -from google.cloud.dialogflowcx_v3.types import agent from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import audio_config, flow, gcs -from google.cloud.dialogflowcx_v3.types import generative_settings -from google.cloud.dialogflowcx_v3.types import safety_settings +from google.cloud.dialogflowcx_v3.types import ( + generative_settings as gcdc_generative_settings, +) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -918,10 +922,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -966,10 +969,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1005,10 +1007,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1237,9 +1238,7 @@ def test_agents_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_changelogs.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_changelogs.py index 0f2574743692..80340b092f80 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_changelogs.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_changelogs.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.changelogs import ( ChangelogsAsyncClient, @@ -921,10 +926,9 @@ def test_changelogs_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_changelogs_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_changelogs_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1244,9 +1246,7 @@ def test_changelogs_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_deployments.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_deployments.py index d6cfa63c2e31..60d8f80ea5d8 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_deployments.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_deployments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.deployments import ( DeploymentsAsyncClient, @@ -925,10 +930,9 @@ def test_deployments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +977,9 @@ def test_deployments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1015,9 @@ def test_deployments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1248,9 +1250,7 @@ def test_deployments_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1362,9 +1362,9 @@ def test_list_deployments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -2148,9 +2148,9 @@ def test_list_deployments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_entity_types.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_entity_types.py index 06b8dbaf7f8e..b8ba951fb607 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_entity_types.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.entity_types import ( EntityTypesAsyncClient, @@ -70,9 +70,8 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import entity_type +from google.cloud.dialogflowcx_v3.types import entity_type, inline from google.cloud.dialogflowcx_v3.types import entity_type as gcdc_entity_type -from google.cloud.dialogflowcx_v3.types import inline CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -936,10 +935,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +982,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1020,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1259,9 +1255,7 @@ def test_entity_types_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1743,9 +1737,9 @@ def test_create_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -2121,9 +2115,9 @@ def test_update_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -2483,9 +2477,9 @@ def test_delete_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -2817,9 +2811,9 @@ def test_list_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -3361,9 +3355,9 @@ def test_export_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_entity_types] = ( + mock_rpc + ) request = {} client.export_entity_types(request) @@ -3624,9 +3618,9 @@ def test_import_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_entity_types] = ( + mock_rpc + ) request = {} client.import_entity_types(request) @@ -4000,9 +3994,9 @@ def test_create_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -4195,9 +4189,9 @@ def test_update_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -4394,9 +4388,9 @@ def test_delete_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -4573,9 +4567,9 @@ def test_list_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -4835,9 +4829,9 @@ def test_export_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_entity_types] = ( + mock_rpc + ) request = {} client.export_entity_types(request) @@ -4973,9 +4967,9 @@ def test_import_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_entity_types] = ( + mock_rpc + ) request = {} client.import_entity_types(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_environments.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_environments.py index 7445d4cb74fe..5034bb8397b9 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_environments.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_environments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +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.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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.struct_pb2 as struct_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.environments import ( EnvironmentsAsyncClient, @@ -73,9 +73,8 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import environment +from google.cloud.dialogflowcx_v3.types import environment, webhook from google.cloud.dialogflowcx_v3.types import environment as gcdc_environment -from google.cloud.dialogflowcx_v3.types import webhook CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -943,10 +942,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -991,10 +989,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1027,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1276,9 +1272,7 @@ def test_environments_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1394,9 +1388,9 @@ def test_list_environments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -2265,9 +2259,9 @@ def test_create_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -2617,9 +2611,9 @@ def test_update_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -2973,9 +2967,9 @@ def test_delete_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -3851,9 +3845,9 @@ def test_run_continuous_test_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_continuous_test - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_continuous_test] = ( + mock_rpc + ) request = {} client.run_continuous_test(request) @@ -4839,9 +4833,9 @@ def test_list_environments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -5279,9 +5273,9 @@ def test_create_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -5471,9 +5465,9 @@ def test_update_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -5664,9 +5658,9 @@ def test_delete_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -6108,9 +6102,9 @@ def test_run_continuous_test_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_continuous_test - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_continuous_test] = ( + mock_rpc + ) request = {} client.run_continuous_test(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_examples.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_examples.py index 6f3624a7178b..4c6e6c79cc67 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_examples.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_examples.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.dialogflowcx_v3.services.examples import ( ExamplesAsyncClient, @@ -63,9 +68,8 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import example +from google.cloud.dialogflowcx_v3.types import example, trace from google.cloud.dialogflowcx_v3.types import example as gcdc_example -from google.cloud.dialogflowcx_v3.types import trace CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -914,10 +918,9 @@ def test_examples_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -962,10 +965,9 @@ def test_examples_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1001,10 +1003,9 @@ def test_examples_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1233,9 +1234,7 @@ def test_examples_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_experiments.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_experiments.py index e20e25b7ed81..070414fe9148 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_experiments.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_experiments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 google.cloud.dialogflowcx_v3.services.experiments import ( ExperimentsAsyncClient, @@ -928,10 +933,9 @@ def test_experiments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -976,10 +980,9 @@ def test_experiments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1018,9 @@ def test_experiments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1251,9 +1253,7 @@ def test_experiments_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1365,9 +1365,9 @@ def test_list_experiments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_experiments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_experiments] = ( + mock_rpc + ) request = {} client.list_experiments(request) @@ -2235,9 +2235,9 @@ def test_create_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_experiment] = ( + mock_rpc + ) request = {} client.create_experiment(request) @@ -2597,9 +2597,9 @@ def test_update_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_experiment] = ( + mock_rpc + ) request = {} client.update_experiment(request) @@ -2952,9 +2952,9 @@ def test_delete_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_experiment] = ( + mock_rpc + ) request = {} client.delete_experiment(request) @@ -3286,9 +3286,9 @@ def test_start_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_experiment] = ( + mock_rpc + ) request = {} client.start_experiment(request) @@ -3894,9 +3894,9 @@ def test_list_experiments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_experiments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_experiments] = ( + mock_rpc + ) request = {} client.list_experiments(request) @@ -4336,9 +4336,9 @@ def test_create_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_experiment] = ( + mock_rpc + ) request = {} client.create_experiment(request) @@ -4529,9 +4529,9 @@ def test_update_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_experiment] = ( + mock_rpc + ) request = {} client.update_experiment(request) @@ -4721,9 +4721,9 @@ def test_delete_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_experiment] = ( + mock_rpc + ) request = {} client.delete_experiment(request) @@ -4898,9 +4898,9 @@ def test_start_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_experiment] = ( + mock_rpc + ) request = {} client.start_experiment(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_flows.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_flows.py index 99f5ba18a473..7a9072478e8a 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_flows.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_flows.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 from google.cloud.dialogflowcx_v3.services.flows import ( FlowsAsyncClient, @@ -74,8 +74,10 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import advanced_settings, data_store_connection from google.cloud.dialogflowcx_v3.types import ( + advanced_settings, + data_store_connection, + flow, fulfillment, gcs, import_strategy, @@ -85,7 +87,6 @@ tool_call, validation_message, ) -from google.cloud.dialogflowcx_v3.types import flow from google.cloud.dialogflowcx_v3.types import flow as gcdc_flow CRED_INFO_JSON = { @@ -919,10 +920,9 @@ def test_flows_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -967,10 +967,9 @@ def test_flows_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1005,9 @@ def test_flows_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1238,9 +1236,7 @@ def test_flows_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_generators.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_generators.py index 6291971b365f..ce0d8984bc27 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_generators.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_generators.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.generators import ( GeneratorsAsyncClient, @@ -61,8 +66,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import generative_settings -from google.cloud.dialogflowcx_v3.types import generator +from google.cloud.dialogflowcx_v3.types import generative_settings, generator from google.cloud.dialogflowcx_v3.types import generator as gcdc_generator CRED_INFO_JSON = { @@ -923,10 +927,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +974,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1012,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1246,9 +1247,7 @@ def test_generators_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2208,9 +2207,9 @@ def test_create_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -2547,9 +2546,9 @@ def test_update_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) @@ -2881,9 +2880,9 @@ def test_delete_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) @@ -3569,9 +3568,9 @@ def test_create_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -3762,9 +3761,9 @@ def test_update_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) @@ -3959,9 +3958,9 @@ def test_delete_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_intents.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_intents.py index 081466932add..c020fc2158a7 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_intents.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_intents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.intents import ( IntentsAsyncClient, @@ -70,8 +70,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import inline -from google.cloud.dialogflowcx_v3.types import intent +from google.cloud.dialogflowcx_v3.types import inline, intent from google.cloud.dialogflowcx_v3.types import intent as gcdc_intent CRED_INFO_JSON = { @@ -910,10 +909,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +956,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +994,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1229,9 +1225,7 @@ def test_intents_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_pages.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_pages.py index b97c366e314c..f9a35b85794e 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_pages.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_pages.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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.struct_pb2 as struct_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.pages import ( PagesAsyncClient, @@ -68,10 +73,11 @@ data_store_connection, fulfillment, gcs, + page, + response_message, + tool_call, ) -from google.cloud.dialogflowcx_v3.types import page from google.cloud.dialogflowcx_v3.types import page as gcdc_page -from google.cloud.dialogflowcx_v3.types import response_message, tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -904,10 +910,9 @@ def test_pages_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -952,10 +957,9 @@ def test_pages_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -991,10 +995,9 @@ def test_pages_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1223,9 +1226,7 @@ def test_pages_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_playbooks.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_playbooks.py index 751600e03b30..ddd7bd49d8f6 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_playbooks.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_playbooks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +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.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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.struct_pb2 as struct_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.playbooks import ( PlaybooksAsyncClient, @@ -82,9 +82,11 @@ generative_settings, import_strategy, parameter_definition, + playbook, + response_message, + tool_call, + trace, ) -from google.cloud.dialogflowcx_v3.types import response_message, tool_call, trace -from google.cloud.dialogflowcx_v3.types import playbook from google.cloud.dialogflowcx_v3.types import playbook as gcdc_playbook CRED_INFO_JSON = { @@ -941,10 +943,9 @@ def test_playbooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +990,9 @@ def test_playbooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1028,9 @@ def test_playbooks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1264,9 +1263,7 @@ def test_playbooks_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4141,9 +4138,9 @@ def test_get_playbook_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_playbook_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_playbook_version] = ( + mock_rpc + ) request = {} client.get_playbook_version(request) @@ -4823,9 +4820,9 @@ def test_list_playbook_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_playbook_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_playbook_versions] = ( + mock_rpc + ) request = {} client.list_playbook_versions(request) @@ -7046,9 +7043,9 @@ def test_get_playbook_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_playbook_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_playbook_version] = ( + mock_rpc + ) request = {} client.get_playbook_version(request) @@ -7417,9 +7414,9 @@ def test_list_playbook_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_playbook_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_playbook_versions] = ( + mock_rpc + ) request = {} client.list_playbook_versions(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_security_settings_service.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_security_settings_service.py index 141e09b0dbcf..8c05b320ad43 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_security_settings_service.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_security_settings_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.security_settings_service import ( SecuritySettingsServiceAsyncClient, @@ -61,10 +66,10 @@ pagers, transports, ) +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1004,10 +1009,9 @@ def test_security_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1052,10 +1056,9 @@ def test_security_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1091,10 +1094,9 @@ def test_security_settings_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1354,9 +1356,7 @@ def test_security_settings_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1902,9 +1902,9 @@ def test_get_security_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_security_settings] = ( + mock_rpc + ) request = {} client.get_security_settings(request) @@ -2671,9 +2671,9 @@ def test_list_security_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_security_settings] = ( + mock_rpc + ) request = {} client.list_security_settings(request) @@ -3677,9 +3677,9 @@ def test_get_security_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_security_settings] = ( + mock_rpc + ) request = {} client.get_security_settings(request) @@ -4061,9 +4061,9 @@ def test_list_security_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_security_settings] = ( + mock_rpc + ) request = {} client.list_security_settings(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_session_entity_types.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_session_entity_types.py index 1515bc961805..676b3e74cf35 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_session_entity_types.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_session_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.session_entity_types import ( SessionEntityTypesAsyncClient, @@ -61,11 +66,10 @@ pagers, transports, ) +from google.cloud.dialogflowcx_v3.types import entity_type, session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import entity_type -from google.cloud.dialogflowcx_v3.types import session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -989,10 +993,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1040,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1076,10 +1078,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1331,9 +1332,7 @@ def test_session_entity_types_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_sessions.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_sessions.py index 094e53208e06..571fdde4947d 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_sessions.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_sessions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,20 +43,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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.struct_pb2 as struct_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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.struct_pb2 as struct_pb2 # type: ignore -import google.type.latlng_pb2 as latlng_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.sessions import ( SessionsAsyncClient, @@ -921,10 +926,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1240,9 +1242,7 @@ def test_sessions_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2506,9 +2506,9 @@ def test_submit_answer_feedback_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.submit_answer_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.submit_answer_feedback] = ( + mock_rpc + ) request = {} client.submit_answer_feedback(request) @@ -3136,9 +3136,9 @@ def test_submit_answer_feedback_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.submit_answer_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.submit_answer_feedback] = ( + mock_rpc + ) request = {} client.submit_answer_feedback(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_test_cases.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_test_cases.py index aae0257d7c60..207b8948443e 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_test_cases.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_test_cases.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +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.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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -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.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 google.cloud.dialogflowcx_v3.services.test_cases import ( TestCasesAsyncClient, @@ -85,10 +85,10 @@ page, response_message, session, + test_case, + tool_call, ) -from google.cloud.dialogflowcx_v3.types import test_case from google.cloud.dialogflowcx_v3.types import test_case as gcdc_test_case -from google.cloud.dialogflowcx_v3.types import tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -946,10 +946,9 @@ def test_test_cases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +993,9 @@ def test_test_cases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1031,9 @@ def test_test_cases_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1269,9 +1266,7 @@ def test_test_cases_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2567,9 +2562,9 @@ def test_create_test_case_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_test_case] = ( + mock_rpc + ) request = {} client.create_test_case(request) @@ -2910,9 +2905,9 @@ def test_update_test_case_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_test_case] = ( + mock_rpc + ) request = {} client.update_test_case(request) @@ -3503,9 +3498,9 @@ def test_batch_run_test_cases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_run_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_run_test_cases] = ( + mock_rpc + ) request = {} client.batch_run_test_cases(request) @@ -3765,9 +3760,9 @@ def test_calculate_coverage_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.calculate_coverage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.calculate_coverage] = ( + mock_rpc + ) request = {} client.calculate_coverage(request) @@ -4017,9 +4012,9 @@ def test_import_test_cases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_test_cases] = ( + mock_rpc + ) request = {} client.import_test_cases(request) @@ -4278,9 +4273,9 @@ def test_export_test_cases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_test_cases] = ( + mock_rpc + ) request = {} client.export_test_cases(request) @@ -4545,9 +4540,9 @@ def test_list_test_case_results_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_test_case_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_test_case_results] = ( + mock_rpc + ) request = {} client.list_test_case_results(request) @@ -5092,9 +5087,9 @@ def test_get_test_case_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_test_case_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_test_case_result] = ( + mock_rpc + ) request = {} client.get_test_case_result(request) @@ -5992,9 +5987,9 @@ def test_create_test_case_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_test_case] = ( + mock_rpc + ) request = {} client.create_test_case(request) @@ -6183,9 +6178,9 @@ def test_update_test_case_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_test_case] = ( + mock_rpc + ) request = {} client.update_test_case(request) @@ -6497,9 +6492,9 @@ def test_batch_run_test_cases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_run_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_run_test_cases] = ( + mock_rpc + ) request = {} client.batch_run_test_cases(request) @@ -6635,9 +6630,9 @@ def test_calculate_coverage_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.calculate_coverage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.calculate_coverage] = ( + mock_rpc + ) request = {} client.calculate_coverage(request) @@ -6767,9 +6762,9 @@ def test_import_test_cases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_test_cases] = ( + mock_rpc + ) request = {} client.import_test_cases(request) @@ -6891,9 +6886,9 @@ def test_export_test_cases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_test_cases] = ( + mock_rpc + ) request = {} client.export_test_cases(request) @@ -7018,9 +7013,9 @@ def test_list_test_case_results_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_test_case_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_test_case_results] = ( + mock_rpc + ) request = {} client.list_test_case_results(request) @@ -7284,9 +7279,9 @@ def test_get_test_case_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_test_case_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_test_case_result] = ( + mock_rpc + ) request = {} client.get_test_case_result(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_tools.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_tools.py index 89eca4da56ea..8fd4623199f4 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_tools.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_tools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.dialogflowcx_v3.services.tools import ( ToolsAsyncClient, @@ -63,8 +68,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import data_store_connection -from google.cloud.dialogflowcx_v3.types import tool +from google.cloud.dialogflowcx_v3.types import data_store_connection, tool from google.cloud.dialogflowcx_v3.types import tool as gcdc_tool CRED_INFO_JSON = { @@ -898,10 +902,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +949,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +987,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1217,9 +1218,7 @@ def test_tools_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3172,9 +3171,9 @@ def test_list_tool_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tool_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tool_versions] = ( + mock_rpc + ) request = {} client.list_tool_versions(request) @@ -3717,9 +3716,9 @@ def test_create_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tool_version] = ( + mock_rpc + ) request = {} client.create_tool_version(request) @@ -4062,9 +4061,9 @@ def test_get_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tool_version] = ( + mock_rpc + ) request = {} client.get_tool_version(request) @@ -4388,9 +4387,9 @@ def test_delete_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tool_version] = ( + mock_rpc + ) request = {} client.delete_tool_version(request) @@ -4717,9 +4716,9 @@ def test_restore_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_tool_version] = ( + mock_rpc + ) request = {} client.restore_tool_version(request) @@ -5959,9 +5958,9 @@ def test_list_tool_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tool_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tool_versions] = ( + mock_rpc + ) request = {} client.list_tool_versions(request) @@ -6221,9 +6220,9 @@ def test_create_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tool_version] = ( + mock_rpc + ) request = {} client.create_tool_version(request) @@ -6414,9 +6413,9 @@ def test_get_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tool_version] = ( + mock_rpc + ) request = {} client.get_tool_version(request) @@ -6596,9 +6595,9 @@ def test_delete_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tool_version] = ( + mock_rpc + ) request = {} client.delete_tool_version(request) @@ -6777,9 +6776,9 @@ def test_restore_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_tool_version] = ( + mock_rpc + ) request = {} client.restore_tool_version(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_transition_route_groups.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_transition_route_groups.py index 8cb55c29167b..87489736549e 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_transition_route_groups.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_transition_route_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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.struct_pb2 as struct_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.transition_route_groups import ( TransitionRouteGroupsAsyncClient, @@ -70,11 +75,11 @@ page, response_message, tool_call, + transition_route_group, ) from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import transition_route_group CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1010,10 +1015,9 @@ def test_transition_route_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1062,9 @@ def test_transition_route_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1097,10 +1100,9 @@ def test_transition_route_groups_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1360,9 +1362,7 @@ def test_transition_route_groups_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_versions.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_versions.py index e39103efc51e..10e653b4ec38 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_versions.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_versions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 from google.cloud.dialogflowcx_v3.services.versions import ( VersionsAsyncClient, @@ -73,8 +73,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import flow -from google.cloud.dialogflowcx_v3.types import version +from google.cloud.dialogflowcx_v3.types import flow, version from google.cloud.dialogflowcx_v3.types import version as gcdc_version CRED_INFO_JSON = { @@ -924,10 +923,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1011,10 +1008,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1243,9 +1239,7 @@ def test_versions_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3527,9 +3521,9 @@ def test_compare_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compare_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compare_versions] = ( + mock_rpc + ) request = {} client.compare_versions(request) @@ -4955,9 +4949,9 @@ def test_compare_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compare_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compare_versions] = ( + mock_rpc + ) request = {} client.compare_versions(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_webhooks.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_webhooks.py index 97cd9043cc8a..0705e008a0c5 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_webhooks.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_webhooks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.webhooks import ( WebhooksAsyncClient, @@ -912,10 +917,9 @@ def test_webhooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +964,9 @@ def test_webhooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +1002,9 @@ def test_webhooks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1231,9 +1233,7 @@ def test_webhooks_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_agents.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_agents.py index 7ab39f662306..11b76352b066 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_agents.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_agents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 from google.cloud.dialogflowcx_v3beta1.services.agents import ( AgentsAsyncClient, @@ -74,19 +74,19 @@ transports, ) from google.cloud.dialogflowcx_v3beta1.types import ( + advanced_settings, + agent, audio_config, bigquery_export, flow, gcs, + generative_settings, + safety_settings, ) +from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3beta1.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings -from google.cloud.dialogflowcx_v3beta1.types import agent -from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings -from google.cloud.dialogflowcx_v3beta1.types import safety_settings CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -923,10 +923,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +970,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1008,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1242,9 +1239,7 @@ def test_agents_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_changelogs.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_changelogs.py index e3ff1c5b0c64..a408c1b593bc 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_changelogs.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_changelogs.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.changelogs import ( ChangelogsAsyncClient, @@ -921,10 +926,9 @@ def test_changelogs_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_changelogs_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_changelogs_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1244,9 +1246,7 @@ def test_changelogs_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_conversation_history.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_conversation_history.py index 42f7f5ffacce..cf0a5040ee0b 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_conversation_history.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_conversation_history.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.conversation_history import ( ConversationHistoryAsyncClient, @@ -1002,10 +1007,9 @@ def test_conversation_history_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1050,10 +1054,9 @@ def test_conversation_history_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1089,10 +1092,9 @@ def test_conversation_history_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1352,9 +1354,7 @@ def test_conversation_history_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1474,9 +1474,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -2016,9 +2016,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -2349,9 +2349,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -2614,9 +2614,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -2876,9 +2876,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -3060,9 +3060,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_deployments.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_deployments.py index 9abdf46f8209..06d8956199b3 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_deployments.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_deployments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.deployments import ( DeploymentsAsyncClient, @@ -925,10 +930,9 @@ def test_deployments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +977,9 @@ def test_deployments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1015,9 @@ def test_deployments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1248,9 +1250,7 @@ def test_deployments_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1362,9 +1362,9 @@ def test_list_deployments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -2148,9 +2148,9 @@ def test_list_deployments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_entity_types.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_entity_types.py index c1163529724b..b7cb9be23644 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_entity_types.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.entity_types import ( EntityTypesAsyncClient, @@ -70,9 +70,8 @@ pagers, transports, ) +from google.cloud.dialogflowcx_v3beta1.types import entity_type, inline from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type -from google.cloud.dialogflowcx_v3beta1.types import entity_type -from google.cloud.dialogflowcx_v3beta1.types import inline CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -936,10 +935,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +982,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1020,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1259,9 +1255,7 @@ def test_entity_types_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1743,9 +1737,9 @@ def test_create_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -2121,9 +2115,9 @@ def test_update_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -2483,9 +2477,9 @@ def test_delete_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -2817,9 +2811,9 @@ def test_list_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -3361,9 +3355,9 @@ def test_export_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_entity_types] = ( + mock_rpc + ) request = {} client.export_entity_types(request) @@ -3624,9 +3618,9 @@ def test_import_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_entity_types] = ( + mock_rpc + ) request = {} client.import_entity_types(request) @@ -4000,9 +3994,9 @@ def test_create_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -4195,9 +4189,9 @@ def test_update_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -4394,9 +4388,9 @@ def test_delete_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -4573,9 +4567,9 @@ def test_list_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -4835,9 +4829,9 @@ def test_export_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_entity_types] = ( + mock_rpc + ) request = {} client.export_entity_types(request) @@ -4973,9 +4967,9 @@ def test_import_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_entity_types] = ( + mock_rpc + ) request = {} client.import_entity_types(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_environments.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_environments.py index 9b8ec92ff32f..b14887c0a6d1 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_environments.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_environments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +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.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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.struct_pb2 as struct_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.environments import ( EnvironmentsAsyncClient, @@ -73,9 +73,8 @@ pagers, transports, ) +from google.cloud.dialogflowcx_v3beta1.types import environment, webhook from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment -from google.cloud.dialogflowcx_v3beta1.types import environment -from google.cloud.dialogflowcx_v3beta1.types import webhook CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -943,10 +942,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -991,10 +989,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1027,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1276,9 +1272,7 @@ def test_environments_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1394,9 +1388,9 @@ def test_list_environments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -2265,9 +2259,9 @@ def test_create_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -2617,9 +2611,9 @@ def test_update_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -2973,9 +2967,9 @@ def test_delete_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -3851,9 +3845,9 @@ def test_run_continuous_test_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_continuous_test - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_continuous_test] = ( + mock_rpc + ) request = {} client.run_continuous_test(request) @@ -4839,9 +4833,9 @@ def test_list_environments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -5279,9 +5273,9 @@ def test_create_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -5471,9 +5465,9 @@ def test_update_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -5664,9 +5658,9 @@ def test_delete_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -6108,9 +6102,9 @@ def test_run_continuous_test_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_continuous_test - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_continuous_test] = ( + mock_rpc + ) request = {} client.run_continuous_test(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_examples.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_examples.py index 33fd541b1605..3069667d16a5 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_examples.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_examples.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.dialogflowcx_v3beta1.services.examples import ( ExamplesAsyncClient, @@ -63,10 +68,12 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3beta1.types import data_store_connection -from google.cloud.dialogflowcx_v3beta1.types import example +from google.cloud.dialogflowcx_v3beta1.types import ( + data_store_connection, + example, + trace, +) from google.cloud.dialogflowcx_v3beta1.types import example as gcdc_example -from google.cloud.dialogflowcx_v3beta1.types import trace CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -915,10 +922,9 @@ def test_examples_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -963,10 +969,9 @@ def test_examples_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1002,10 +1007,9 @@ def test_examples_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1234,9 +1238,7 @@ def test_examples_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_experiments.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_experiments.py index 1d1f7fced82f..fe94dae73ea9 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_experiments.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_experiments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 google.cloud.dialogflowcx_v3beta1.services.experiments import ( ExperimentsAsyncClient, @@ -63,8 +68,8 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -928,10 +933,9 @@ def test_experiments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -976,10 +980,9 @@ def test_experiments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1018,9 @@ def test_experiments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1251,9 +1253,7 @@ def test_experiments_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1365,9 +1365,9 @@ def test_list_experiments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_experiments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_experiments] = ( + mock_rpc + ) request = {} client.list_experiments(request) @@ -2235,9 +2235,9 @@ def test_create_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_experiment] = ( + mock_rpc + ) request = {} client.create_experiment(request) @@ -2597,9 +2597,9 @@ def test_update_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_experiment] = ( + mock_rpc + ) request = {} client.update_experiment(request) @@ -2952,9 +2952,9 @@ def test_delete_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_experiment] = ( + mock_rpc + ) request = {} client.delete_experiment(request) @@ -3286,9 +3286,9 @@ def test_start_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_experiment] = ( + mock_rpc + ) request = {} client.start_experiment(request) @@ -3894,9 +3894,9 @@ def test_list_experiments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_experiments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_experiments] = ( + mock_rpc + ) request = {} client.list_experiments(request) @@ -4336,9 +4336,9 @@ def test_create_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_experiment] = ( + mock_rpc + ) request = {} client.create_experiment(request) @@ -4529,9 +4529,9 @@ def test_update_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_experiment] = ( + mock_rpc + ) request = {} client.update_experiment(request) @@ -4721,9 +4721,9 @@ def test_delete_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_experiment] = ( + mock_rpc + ) request = {} client.delete_experiment(request) @@ -4898,9 +4898,9 @@ def test_start_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_experiment] = ( + mock_rpc + ) request = {} client.start_experiment(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_flows.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_flows.py index 3e9237edf7cb..54195beee17e 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_flows.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_flows.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 from google.cloud.dialogflowcx_v3beta1.services.flows import ( FlowsAsyncClient, @@ -77,8 +77,7 @@ from google.cloud.dialogflowcx_v3beta1.types import ( advanced_settings, data_store_connection, -) -from google.cloud.dialogflowcx_v3beta1.types import ( + flow, fulfillment, gcs, import_strategy, @@ -88,7 +87,6 @@ tool_call, validation_message, ) -from google.cloud.dialogflowcx_v3beta1.types import flow from google.cloud.dialogflowcx_v3beta1.types import flow as gcdc_flow CRED_INFO_JSON = { @@ -922,10 +920,9 @@ def test_flows_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -970,10 +967,9 @@ def test_flows_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1009,10 +1005,9 @@ def test_flows_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1241,9 +1236,7 @@ def test_flows_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_generators.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_generators.py index 2eb87c4744a0..438459813652 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_generators.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_generators.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.generators import ( GeneratorsAsyncClient, @@ -61,8 +66,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3beta1.types import generative_settings -from google.cloud.dialogflowcx_v3beta1.types import generator +from google.cloud.dialogflowcx_v3beta1.types import generative_settings, generator from google.cloud.dialogflowcx_v3beta1.types import generator as gcdc_generator CRED_INFO_JSON = { @@ -923,10 +927,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +974,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1012,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1246,9 +1247,7 @@ def test_generators_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2208,9 +2207,9 @@ def test_create_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -2547,9 +2546,9 @@ def test_update_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) @@ -2881,9 +2880,9 @@ def test_delete_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) @@ -3569,9 +3568,9 @@ def test_create_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -3762,9 +3761,9 @@ def test_update_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) @@ -3959,9 +3958,9 @@ def test_delete_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_intents.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_intents.py index a62637f1b722..193b1bd2ed35 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_intents.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_intents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.intents import ( IntentsAsyncClient, @@ -70,8 +70,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3beta1.types import inline -from google.cloud.dialogflowcx_v3beta1.types import intent +from google.cloud.dialogflowcx_v3beta1.types import inline, intent from google.cloud.dialogflowcx_v3beta1.types import intent as gcdc_intent CRED_INFO_JSON = { @@ -910,10 +909,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +956,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +994,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1229,9 +1225,7 @@ def test_intents_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_pages.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_pages.py index c7b0fa377991..9c9fdef7258c 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_pages.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_pages.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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.struct_pb2 as struct_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.pages import ( PagesAsyncClient, @@ -68,10 +73,11 @@ data_store_connection, fulfillment, gcs, + page, + response_message, + tool_call, ) -from google.cloud.dialogflowcx_v3beta1.types import page from google.cloud.dialogflowcx_v3beta1.types import page as gcdc_page -from google.cloud.dialogflowcx_v3beta1.types import response_message, tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -904,10 +910,9 @@ def test_pages_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -952,10 +957,9 @@ def test_pages_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -991,10 +995,9 @@ def test_pages_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1223,9 +1226,7 @@ def test_pages_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_playbooks.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_playbooks.py index 6a4354cd0129..6cdf7d9533e4 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_playbooks.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_playbooks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +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.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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.struct_pb2 as struct_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.playbooks import ( PlaybooksAsyncClient, @@ -83,9 +83,11 @@ generative_settings, import_strategy, parameter_definition, + playbook, + response_message, + tool_call, + trace, ) -from google.cloud.dialogflowcx_v3beta1.types import response_message, tool_call, trace -from google.cloud.dialogflowcx_v3beta1.types import playbook from google.cloud.dialogflowcx_v3beta1.types import playbook as gcdc_playbook CRED_INFO_JSON = { @@ -942,10 +944,9 @@ def test_playbooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -990,10 +991,9 @@ def test_playbooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1029,10 +1029,9 @@ def test_playbooks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1265,9 +1264,7 @@ def test_playbooks_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4142,9 +4139,9 @@ def test_get_playbook_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_playbook_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_playbook_version] = ( + mock_rpc + ) request = {} client.get_playbook_version(request) @@ -4824,9 +4821,9 @@ def test_list_playbook_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_playbook_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_playbook_versions] = ( + mock_rpc + ) request = {} client.list_playbook_versions(request) @@ -7047,9 +7044,9 @@ def test_get_playbook_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_playbook_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_playbook_version] = ( + mock_rpc + ) request = {} client.get_playbook_version(request) @@ -7418,9 +7415,9 @@ def test_list_playbook_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_playbook_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_playbook_versions] = ( + mock_rpc + ) request = {} client.list_playbook_versions(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_security_settings_service.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_security_settings_service.py index 4efa5fbb8973..ad349ca636b4 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_security_settings_service.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_security_settings_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.security_settings_service import ( SecuritySettingsServiceAsyncClient, @@ -61,10 +66,10 @@ pagers, transports, ) +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1004,10 +1009,9 @@ def test_security_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1052,10 +1056,9 @@ def test_security_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1091,10 +1094,9 @@ def test_security_settings_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1354,9 +1356,7 @@ def test_security_settings_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1902,9 +1902,9 @@ def test_get_security_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_security_settings] = ( + mock_rpc + ) request = {} client.get_security_settings(request) @@ -2671,9 +2671,9 @@ def test_list_security_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_security_settings] = ( + mock_rpc + ) request = {} client.list_security_settings(request) @@ -3677,9 +3677,9 @@ def test_get_security_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_security_settings] = ( + mock_rpc + ) request = {} client.get_security_settings(request) @@ -4061,9 +4061,9 @@ def test_list_security_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_security_settings] = ( + mock_rpc + ) request = {} client.list_security_settings(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_session_entity_types.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_session_entity_types.py index eb4f288cd33b..70ff0b6b568d 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_session_entity_types.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_session_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.session_entity_types import ( SessionEntityTypesAsyncClient, @@ -61,11 +66,10 @@ pagers, transports, ) +from google.cloud.dialogflowcx_v3beta1.types import entity_type, session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import entity_type -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -989,10 +993,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1040,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1076,10 +1078,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1331,9 +1332,7 @@ def test_session_entity_types_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_sessions.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_sessions.py index 758d357df7e5..aa966624c5da 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_sessions.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_sessions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,20 +43,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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.struct_pb2 as struct_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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.struct_pb2 as struct_pb2 # type: ignore -import google.type.latlng_pb2 as latlng_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.sessions import ( SessionsAsyncClient, @@ -921,10 +926,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1240,9 +1242,7 @@ def test_sessions_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2506,9 +2506,9 @@ def test_submit_answer_feedback_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.submit_answer_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.submit_answer_feedback] = ( + mock_rpc + ) request = {} client.submit_answer_feedback(request) @@ -3136,9 +3136,9 @@ def test_submit_answer_feedback_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.submit_answer_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.submit_answer_feedback] = ( + mock_rpc + ) request = {} client.submit_answer_feedback(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_test_cases.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_test_cases.py index 8d2c7165f949..8ef49c39b64c 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_test_cases.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_test_cases.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +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.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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -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.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 google.cloud.dialogflowcx_v3beta1.services.test_cases import ( TestCasesAsyncClient, @@ -85,10 +85,10 @@ page, response_message, session, + test_case, + tool_call, ) -from google.cloud.dialogflowcx_v3beta1.types import test_case from google.cloud.dialogflowcx_v3beta1.types import test_case as gcdc_test_case -from google.cloud.dialogflowcx_v3beta1.types import tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -946,10 +946,9 @@ def test_test_cases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +993,9 @@ def test_test_cases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1031,9 @@ def test_test_cases_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1269,9 +1266,7 @@ def test_test_cases_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2567,9 +2562,9 @@ def test_create_test_case_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_test_case] = ( + mock_rpc + ) request = {} client.create_test_case(request) @@ -2910,9 +2905,9 @@ def test_update_test_case_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_test_case] = ( + mock_rpc + ) request = {} client.update_test_case(request) @@ -3503,9 +3498,9 @@ def test_batch_run_test_cases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_run_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_run_test_cases] = ( + mock_rpc + ) request = {} client.batch_run_test_cases(request) @@ -3765,9 +3760,9 @@ def test_calculate_coverage_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.calculate_coverage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.calculate_coverage] = ( + mock_rpc + ) request = {} client.calculate_coverage(request) @@ -4017,9 +4012,9 @@ def test_import_test_cases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_test_cases] = ( + mock_rpc + ) request = {} client.import_test_cases(request) @@ -4278,9 +4273,9 @@ def test_export_test_cases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_test_cases] = ( + mock_rpc + ) request = {} client.export_test_cases(request) @@ -4545,9 +4540,9 @@ def test_list_test_case_results_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_test_case_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_test_case_results] = ( + mock_rpc + ) request = {} client.list_test_case_results(request) @@ -5092,9 +5087,9 @@ def test_get_test_case_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_test_case_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_test_case_result] = ( + mock_rpc + ) request = {} client.get_test_case_result(request) @@ -5992,9 +5987,9 @@ def test_create_test_case_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_test_case] = ( + mock_rpc + ) request = {} client.create_test_case(request) @@ -6183,9 +6178,9 @@ def test_update_test_case_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_test_case] = ( + mock_rpc + ) request = {} client.update_test_case(request) @@ -6497,9 +6492,9 @@ def test_batch_run_test_cases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_run_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_run_test_cases] = ( + mock_rpc + ) request = {} client.batch_run_test_cases(request) @@ -6635,9 +6630,9 @@ def test_calculate_coverage_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.calculate_coverage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.calculate_coverage] = ( + mock_rpc + ) request = {} client.calculate_coverage(request) @@ -6767,9 +6762,9 @@ def test_import_test_cases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_test_cases] = ( + mock_rpc + ) request = {} client.import_test_cases(request) @@ -6891,9 +6886,9 @@ def test_export_test_cases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_test_cases] = ( + mock_rpc + ) request = {} client.export_test_cases(request) @@ -7018,9 +7013,9 @@ def test_list_test_case_results_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_test_case_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_test_case_results] = ( + mock_rpc + ) request = {} client.list_test_case_results(request) @@ -7284,9 +7279,9 @@ def test_get_test_case_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_test_case_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_test_case_result] = ( + mock_rpc + ) request = {} client.get_test_case_result(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_tools.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_tools.py index 42e8e209e87e..2fcf9ae29f46 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_tools.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_tools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.dialogflowcx_v3beta1.services.tools import ( ToolsAsyncClient, @@ -72,8 +72,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3beta1.types import data_store_connection -from google.cloud.dialogflowcx_v3beta1.types import tool +from google.cloud.dialogflowcx_v3beta1.types import data_store_connection, tool from google.cloud.dialogflowcx_v3beta1.types import tool as gcdc_tool CRED_INFO_JSON = { @@ -907,10 +906,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +953,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +991,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1226,9 +1222,7 @@ def test_tools_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3428,9 +3422,9 @@ def test_list_tool_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tool_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tool_versions] = ( + mock_rpc + ) request = {} client.list_tool_versions(request) @@ -3973,9 +3967,9 @@ def test_create_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tool_version] = ( + mock_rpc + ) request = {} client.create_tool_version(request) @@ -4318,9 +4312,9 @@ def test_get_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tool_version] = ( + mock_rpc + ) request = {} client.get_tool_version(request) @@ -4644,9 +4638,9 @@ def test_delete_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tool_version] = ( + mock_rpc + ) request = {} client.delete_tool_version(request) @@ -4973,9 +4967,9 @@ def test_restore_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_tool_version] = ( + mock_rpc + ) request = {} client.restore_tool_version(request) @@ -6347,9 +6341,9 @@ def test_list_tool_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tool_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tool_versions] = ( + mock_rpc + ) request = {} client.list_tool_versions(request) @@ -6609,9 +6603,9 @@ def test_create_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tool_version] = ( + mock_rpc + ) request = {} client.create_tool_version(request) @@ -6802,9 +6796,9 @@ def test_get_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tool_version] = ( + mock_rpc + ) request = {} client.get_tool_version(request) @@ -6984,9 +6978,9 @@ def test_delete_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tool_version] = ( + mock_rpc + ) request = {} client.delete_tool_version(request) @@ -7165,9 +7159,9 @@ def test_restore_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_tool_version] = ( + mock_rpc + ) request = {} client.restore_tool_version(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_transition_route_groups.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_transition_route_groups.py index 4f24a858abd0..32ed83252ee0 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_transition_route_groups.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_transition_route_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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.struct_pb2 as struct_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.transition_route_groups import ( TransitionRouteGroupsAsyncClient, @@ -70,11 +75,11 @@ page, response_message, tool_call, + transition_route_group, ) from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1010,10 +1015,9 @@ def test_transition_route_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1062,9 @@ def test_transition_route_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1097,10 +1100,9 @@ def test_transition_route_groups_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1360,9 +1362,7 @@ def test_transition_route_groups_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_versions.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_versions.py index a77437716ac7..da1b4a9552ba 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_versions.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_versions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 from google.cloud.dialogflowcx_v3beta1.services.versions import ( VersionsAsyncClient, @@ -73,8 +73,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3beta1.types import flow -from google.cloud.dialogflowcx_v3beta1.types import version +from google.cloud.dialogflowcx_v3beta1.types import flow, version from google.cloud.dialogflowcx_v3beta1.types import version as gcdc_version CRED_INFO_JSON = { @@ -924,10 +923,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1011,10 +1008,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1243,9 +1239,7 @@ def test_versions_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3527,9 +3521,9 @@ def test_compare_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compare_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compare_versions] = ( + mock_rpc + ) request = {} client.compare_versions(request) @@ -4955,9 +4949,9 @@ def test_compare_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compare_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compare_versions] = ( + mock_rpc + ) request = {} client.compare_versions(request) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_webhooks.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_webhooks.py index 848c0ecd9e9a..6fc797333c95 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_webhooks.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_webhooks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.webhooks import ( WebhooksAsyncClient, @@ -912,10 +917,9 @@ def test_webhooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +964,9 @@ def test_webhooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +1002,9 @@ def test_webhooks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1231,9 +1233,7 @@ def test_webhooks_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow/CHANGELOG.md b/packages/google-cloud-dialogflow/CHANGELOG.md index 8f7b1accdfef..cfbaf997251d 100644 --- a/packages/google-cloud-dialogflow/CHANGELOG.md +++ b/packages/google-cloud-dialogflow/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://pypi.org/project/google-cloud-dialogflow/#history +## [2.46.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-dialogflow-v2.45.0...google-cloud-dialogflow-v2.46.0) (2026-02-12) + + +### Features + +* added a new field StreamingAnalyzeContentRequest.output_multiple_utterances ([a6b40b3154a526d35267abafde4c64aa86bcc27c](https://github.com/googleapis/google-cloud-python/commit/a6b40b3154a526d35267abafde4c64aa86bcc27c)) + ## [2.45.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-dialogflow-v2.44.0...google-cloud-dialogflow-v2.45.0) (2026-01-08) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow/gapic_version.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow/gapic_version.py index 69e882b829a7..01ec3a69ff70 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow/gapic_version.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.45.0" # {x-release-please-version} +__version__ = "2.46.0" # {x-release-please-version} diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/__init__.py index 157877f25793..831da88affb4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.agents import AgentsAsyncClient, AgentsClient from .services.answer_records import AnswerRecordsAsyncClient, AnswerRecordsClient from .services.contexts import ContextsAsyncClient, ContextsClient diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/gapic_version.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/gapic_version.py index 69e882b829a7..01ec3a69ff70 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/gapic_version.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.45.0" # {x-release-please-version} +__version__ = "2.46.0" # {x-release-please-version} diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/async_client.py index 80385bff00d8..a0498576d991 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -46,15 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.agents import pagers -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result from .client import AgentsClient from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport @@ -112,7 +111,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_info.__func__(AgentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AgentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AgentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -128,7 +130,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_file.__func__(AgentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AgentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AgentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/client.py index 77191caf7443..09af80ec0b1f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -63,15 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.agents import pagers -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport from .transports.grpc import AgentsGrpcTransport @@ -620,11 +619,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AgentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AgentsClient._read_environment_variables() + ) self._client_cert_source = AgentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -659,8 +656,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AgentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/pagers.py index cb6544ecbf01..689bc6b6bfac 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/base.py index 92a5283690f7..b47f80c5984c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/base.py @@ -17,21 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -333,7 +332,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc.py index 74885f88241f..5ab71171eaef 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc.py @@ -16,24 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result from .base import DEFAULT_CLIENT_INFO, AgentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc_asyncio.py index 35beed31bf66..15fd33a8e84f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,16 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result from .base import DEFAULT_CLIENT_INFO, AgentsTransport from .grpc import AgentsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest.py index c2ef16f455bd..59c05990d852 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest.py @@ -16,24 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAgentsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest_base.py index 42ae284914e3..a06646e68ecd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest_base.py @@ -17,15 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result from .base import DEFAULT_CLIENT_INFO, AgentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/async_client.py index 103e67d0f624..582e6e0cc820 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.answer_records import pagers from google.cloud.dialogflow_v2.types import answer_record @@ -128,7 +128,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AnswerRecordsAsyncClient: The constructed client. """ - return AnswerRecordsClient.from_service_account_info.__func__(AnswerRecordsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AnswerRecordsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AnswerRecordsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +147,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AnswerRecordsAsyncClient: The constructed client. """ - return AnswerRecordsClient.from_service_account_file.__func__(AnswerRecordsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AnswerRecordsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AnswerRecordsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/client.py index 1c4c1d0f1949..1a20eff8a817 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.answer_records import pagers from google.cloud.dialogflow_v2.types import answer_record @@ -683,11 +683,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AnswerRecordsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AnswerRecordsClient._read_environment_variables() + ) self._client_cert_source = AnswerRecordsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -722,8 +720,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AnswerRecordsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/pagers.py index bb3b1b9c9f5f..1418dcd76f77 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/base.py index d17f912193c7..20b5fffa8858 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import answer_record @@ -235,7 +235,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc.py index 627e46be21e3..8dbe9a2e5ba2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import answer_record from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc_asyncio.py index 2771ff55e068..a9d1338bd1ac 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import answer_record from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest.py index 780d10deb58c..6051e3fd627f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -465,9 +465,7 @@ def __call__( """ - http_options = ( - _BaseAnswerRecordsRestTransport._BaseListAnswerRecords._get_http_options() - ) + http_options = _BaseAnswerRecordsRestTransport._BaseListAnswerRecords._get_http_options() request, metadata = self._interceptor.pre_list_answer_records( request, metadata @@ -647,9 +645,7 @@ def __call__( """ - http_options = ( - _BaseAnswerRecordsRestTransport._BaseUpdateAnswerRecord._get_http_options() - ) + http_options = _BaseAnswerRecordsRestTransport._BaseUpdateAnswerRecord._get_http_options() request, metadata = self._interceptor.pre_update_answer_record( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/async_client.py index fe5964665d59..2716c094004d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.contexts import pagers from google.cloud.dialogflow_v2.types import context @@ -111,7 +111,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ContextsAsyncClient: The constructed client. """ - return ContextsClient.from_service_account_info.__func__(ContextsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ContextsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ContextsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -127,7 +130,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ContextsAsyncClient: The constructed client. """ - return ContextsClient.from_service_account_file.__func__(ContextsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ContextsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ContextsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/client.py index 8102c977b8ca..ac524ca677cd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.contexts import pagers from google.cloud.dialogflow_v2.types import context @@ -624,11 +624,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContextsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContextsClient._read_environment_variables() + ) self._client_cert_source = ContextsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -663,8 +661,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContextsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/pagers.py index 2d1302d4c40d..cec086b8f8e5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/base.py index 0791a94cfd32..c3c08a12e813 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import context @@ -286,7 +286,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc.py index 5b35117e6ecb..b8ed5b9fa877 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflow_v2.types import context from google.cloud.dialogflow_v2.types import context as gcd_context diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc_asyncio.py index 93410885e7ec..6ce04e62b970 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import context from google.cloud.dialogflow_v2.types import context as gcd_context diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest.py index 7a6c72474c9f..34a8ec79d6c8 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflow_v2.types import context diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest_base.py index b6849d776498..f1201939a274 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2.types import context from google.cloud.dialogflow_v2.types import context as gcd_context diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/async_client.py index 3e2b01bb3327..e72acd99c120 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -46,16 +46,16 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_datasets import pagers +from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset from .client import ConversationDatasetsClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationDatasetsTransport @@ -131,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationDatasetsAsyncClient: The constructed client. """ - return ConversationDatasetsClient.from_service_account_info.__func__(ConversationDatasetsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConversationDatasetsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConversationDatasetsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationDatasetsAsyncClient: The constructed client. """ - return ConversationDatasetsClient.from_service_account_file.__func__(ConversationDatasetsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConversationDatasetsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ConversationDatasetsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -185,7 +191,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationDatasetsClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationDatasetsClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationDatasetsTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/client.py index 7afe9c8dde2b..8d3e2cd87fee 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -63,16 +63,16 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_datasets import pagers +from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset from .transports.base import DEFAULT_CLIENT_INFO, ConversationDatasetsTransport from .transports.grpc import ConversationDatasetsGrpcTransport @@ -88,9 +88,7 @@ class ConversationDatasetsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationDatasetsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationDatasetsTransport]] _transport_registry["grpc"] = ConversationDatasetsGrpcTransport _transport_registry["grpc_asyncio"] = ConversationDatasetsGrpcAsyncIOTransport _transport_registry["rest"] = ConversationDatasetsRestTransport @@ -638,11 +636,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationDatasetsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationDatasetsClient._read_environment_variables() + ) self._client_cert_source = ConversationDatasetsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +673,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationDatasetsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/pagers.py index d01c4f0fc61f..f677e39aaeea 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/__init__.py index 2af8bedadff7..dc407fc2e845 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ConversationDatasetsRestInterceptor, ConversationDatasetsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationDatasetsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationDatasetsTransport]] _transport_registry["grpc"] = ConversationDatasetsGrpcTransport _transport_registry["grpc_asyncio"] = ConversationDatasetsGrpcAsyncIOTransport _transport_registry["rest"] = ConversationDatasetsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/base.py index 209bfec6a1da..cc17922ae964 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/base.py @@ -17,21 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -285,7 +285,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc.py index 4f0033f78a43..4fcf645f4a65 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc.py @@ -16,24 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset from .base import DEFAULT_CLIENT_INFO, ConversationDatasetsTransport @@ -378,12 +378,12 @@ def create_conversation_dataset( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_dataset" not in self._stubs: - self._stubs[ - "create_conversation_dataset" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationDatasets/CreateConversationDataset", - request_serializer=gcd_conversation_dataset.CreateConversationDatasetRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_conversation_dataset"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationDatasets/CreateConversationDataset", + request_serializer=gcd_conversation_dataset.CreateConversationDatasetRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_conversation_dataset"] @@ -439,12 +439,12 @@ def list_conversation_datasets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_datasets" not in self._stubs: - self._stubs[ - "list_conversation_datasets" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationDatasets/ListConversationDatasets", - request_serializer=conversation_dataset.ListConversationDatasetsRequest.serialize, - response_deserializer=conversation_dataset.ListConversationDatasetsResponse.deserialize, + self._stubs["list_conversation_datasets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationDatasets/ListConversationDatasets", + request_serializer=conversation_dataset.ListConversationDatasetsRequest.serialize, + response_deserializer=conversation_dataset.ListConversationDatasetsResponse.deserialize, + ) ) return self._stubs["list_conversation_datasets"] @@ -480,12 +480,12 @@ def delete_conversation_dataset( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversation_dataset" not in self._stubs: - self._stubs[ - "delete_conversation_dataset" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationDatasets/DeleteConversationDataset", - request_serializer=conversation_dataset.DeleteConversationDatasetRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_conversation_dataset"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationDatasets/DeleteConversationDataset", + request_serializer=conversation_dataset.DeleteConversationDatasetRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_conversation_dataset"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc_asyncio.py index 3df1186e264b..8917f03b791a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,15 +31,12 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset from .base import DEFAULT_CLIENT_INFO, ConversationDatasetsTransport from .grpc import ConversationDatasetsGrpcTransport @@ -386,12 +386,12 @@ def create_conversation_dataset( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_dataset" not in self._stubs: - self._stubs[ - "create_conversation_dataset" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationDatasets/CreateConversationDataset", - request_serializer=gcd_conversation_dataset.CreateConversationDatasetRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_conversation_dataset"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationDatasets/CreateConversationDataset", + request_serializer=gcd_conversation_dataset.CreateConversationDatasetRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_conversation_dataset"] @@ -447,12 +447,12 @@ def list_conversation_datasets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_datasets" not in self._stubs: - self._stubs[ - "list_conversation_datasets" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationDatasets/ListConversationDatasets", - request_serializer=conversation_dataset.ListConversationDatasetsRequest.serialize, - response_deserializer=conversation_dataset.ListConversationDatasetsResponse.deserialize, + self._stubs["list_conversation_datasets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationDatasets/ListConversationDatasets", + request_serializer=conversation_dataset.ListConversationDatasetsRequest.serialize, + response_deserializer=conversation_dataset.ListConversationDatasetsResponse.deserialize, + ) ) return self._stubs["list_conversation_datasets"] @@ -488,12 +488,12 @@ def delete_conversation_dataset( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversation_dataset" not in self._stubs: - self._stubs[ - "delete_conversation_dataset" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationDatasets/DeleteConversationDataset", - request_serializer=conversation_dataset.DeleteConversationDatasetRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_conversation_dataset"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationDatasets/DeleteConversationDataset", + request_serializer=conversation_dataset.DeleteConversationDatasetRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_conversation_dataset"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest.py index b622560fbdd6..2c9089900888 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest.py @@ -16,24 +16,24 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationDatasetsRestTransport @@ -708,9 +708,7 @@ def __call__( """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseCreateConversationDataset._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseCreateConversationDataset._get_http_options() request, metadata = self._interceptor.pre_create_conversation_dataset( request, metadata @@ -863,9 +861,7 @@ def __call__( """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseDeleteConversationDataset._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseDeleteConversationDataset._get_http_options() request, metadata = self._interceptor.pre_delete_conversation_dataset( request, metadata @@ -1016,9 +1012,7 @@ def __call__( """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseGetConversationDataset._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseGetConversationDataset._get_http_options() request, metadata = self._interceptor.pre_get_conversation_dataset( request, metadata @@ -1172,9 +1166,7 @@ def __call__( """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseImportConversationData._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseImportConversationData._get_http_options() request, metadata = self._interceptor.pre_import_conversation_data( request, metadata @@ -1328,9 +1320,7 @@ def __call__( """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseListConversationDatasets._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseListConversationDatasets._get_http_options() request, metadata = self._interceptor.pre_list_conversation_datasets( request, metadata @@ -1433,7 +1423,9 @@ def create_conversation_dataset( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateConversationDataset(self._session, self._host, self._interceptor) # type: ignore + return self._CreateConversationDataset( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_conversation_dataset( @@ -1444,7 +1436,9 @@ def delete_conversation_dataset( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteConversationDataset(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteConversationDataset( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_conversation_dataset( @@ -1455,7 +1449,9 @@ def get_conversation_dataset( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetConversationDataset(self._session, self._host, self._interceptor) # type: ignore + return self._GetConversationDataset( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_conversation_data( @@ -1465,7 +1461,9 @@ def import_conversation_data( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportConversationData(self._session, self._host, self._interceptor) # type: ignore + return self._ImportConversationData( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_conversation_datasets( @@ -1476,7 +1474,9 @@ def list_conversation_datasets( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListConversationDatasets(self._session, self._host, self._interceptor) # type: ignore + return self._ListConversationDatasets( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1536,9 +1536,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseConversationDatasetsRestTransport._BaseGetLocation._get_transcoded_request( @@ -1677,9 +1675,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseConversationDatasetsRestTransport._BaseListLocations._get_transcoded_request( @@ -1815,9 +1811,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1933,9 +1927,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationDatasetsRestTransport._BaseGetOperation._get_transcoded_request( @@ -2074,9 +2066,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationDatasetsRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest_base.py index 39b2787276eb..ec5976be40a7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest_base.py @@ -22,10 +22,10 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset from .base import DEFAULT_CLIENT_INFO, ConversationDatasetsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/async_client.py index f50d7eafacbc..bc70ed1e1a21 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -46,16 +46,16 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_models import pagers +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model from .client import ConversationModelsClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationModelsTransport @@ -141,7 +141,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationModelsAsyncClient: The constructed client. """ - return ConversationModelsClient.from_service_account_info.__func__(ConversationModelsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConversationModelsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConversationModelsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +160,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationModelsAsyncClient: The constructed client. """ - return ConversationModelsClient.from_service_account_file.__func__(ConversationModelsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConversationModelsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ConversationModelsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -195,7 +201,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationModelsClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationModelsClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationModelsTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/client.py index e8a77f3ae4c9..3578127110d6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -63,16 +63,16 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_models import pagers +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model from .transports.base import DEFAULT_CLIENT_INFO, ConversationModelsTransport from .transports.grpc import ConversationModelsGrpcTransport @@ -88,9 +88,7 @@ class ConversationModelsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationModelsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationModelsTransport]] _transport_registry["grpc"] = ConversationModelsGrpcTransport _transport_registry["grpc_asyncio"] = ConversationModelsGrpcAsyncIOTransport _transport_registry["rest"] = ConversationModelsRestTransport @@ -700,11 +698,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationModelsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationModelsClient._read_environment_variables() + ) self._client_cert_source = ConversationModelsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -739,8 +735,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationModelsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/pagers.py index c692bf680272..07a94e33ea1a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/__init__.py index efef7b9dc687..ec8b4e827bab 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ConversationModelsRestInterceptor, ConversationModelsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationModelsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationModelsTransport]] _transport_registry["grpc"] = ConversationModelsGrpcTransport _transport_registry["grpc_asyncio"] = ConversationModelsGrpcAsyncIOTransport _transport_registry["rest"] = ConversationModelsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/base.py index 5f28e95651bf..e141ac251b67 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/base.py @@ -17,21 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -347,7 +347,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc.py index 19fb436f699f..2fe6539dd0d1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc.py @@ -16,24 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model from .base import DEFAULT_CLIENT_INFO, ConversationModelsTransport @@ -554,12 +554,12 @@ def undeploy_conversation_model( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_conversation_model" not in self._stubs: - self._stubs[ - "undeploy_conversation_model" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/UndeployConversationModel", - request_serializer=conversation_model.UndeployConversationModelRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["undeploy_conversation_model"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/UndeployConversationModel", + request_serializer=conversation_model.UndeployConversationModelRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["undeploy_conversation_model"] @@ -586,12 +586,12 @@ def get_conversation_model_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_conversation_model_evaluation" not in self._stubs: - self._stubs[ - "get_conversation_model_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/GetConversationModelEvaluation", - request_serializer=conversation_model.GetConversationModelEvaluationRequest.serialize, - response_deserializer=conversation_model.ConversationModelEvaluation.deserialize, + self._stubs["get_conversation_model_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/GetConversationModelEvaluation", + request_serializer=conversation_model.GetConversationModelEvaluationRequest.serialize, + response_deserializer=conversation_model.ConversationModelEvaluation.deserialize, + ) ) return self._stubs["get_conversation_model_evaluation"] @@ -618,12 +618,12 @@ def list_conversation_model_evaluations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_model_evaluations" not in self._stubs: - self._stubs[ - "list_conversation_model_evaluations" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/ListConversationModelEvaluations", - request_serializer=conversation_model.ListConversationModelEvaluationsRequest.serialize, - response_deserializer=conversation_model.ListConversationModelEvaluationsResponse.deserialize, + self._stubs["list_conversation_model_evaluations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/ListConversationModelEvaluations", + request_serializer=conversation_model.ListConversationModelEvaluationsRequest.serialize, + response_deserializer=conversation_model.ListConversationModelEvaluationsResponse.deserialize, + ) ) return self._stubs["list_conversation_model_evaluations"] @@ -650,12 +650,12 @@ def create_conversation_model_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_model_evaluation" not in self._stubs: - self._stubs[ - "create_conversation_model_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/CreateConversationModelEvaluation", - request_serializer=conversation_model.CreateConversationModelEvaluationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_conversation_model_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/CreateConversationModelEvaluation", + request_serializer=conversation_model.CreateConversationModelEvaluationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_conversation_model_evaluation"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc_asyncio.py index 1aa1d5a5276e..755c783db2a3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,15 +31,12 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model from .base import DEFAULT_CLIENT_INFO, ConversationModelsTransport from .grpc import ConversationModelsGrpcTransport @@ -565,12 +565,12 @@ def undeploy_conversation_model( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_conversation_model" not in self._stubs: - self._stubs[ - "undeploy_conversation_model" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/UndeployConversationModel", - request_serializer=conversation_model.UndeployConversationModelRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["undeploy_conversation_model"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/UndeployConversationModel", + request_serializer=conversation_model.UndeployConversationModelRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["undeploy_conversation_model"] @@ -597,12 +597,12 @@ def get_conversation_model_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_conversation_model_evaluation" not in self._stubs: - self._stubs[ - "get_conversation_model_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/GetConversationModelEvaluation", - request_serializer=conversation_model.GetConversationModelEvaluationRequest.serialize, - response_deserializer=conversation_model.ConversationModelEvaluation.deserialize, + self._stubs["get_conversation_model_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/GetConversationModelEvaluation", + request_serializer=conversation_model.GetConversationModelEvaluationRequest.serialize, + response_deserializer=conversation_model.ConversationModelEvaluation.deserialize, + ) ) return self._stubs["get_conversation_model_evaluation"] @@ -629,12 +629,12 @@ def list_conversation_model_evaluations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_model_evaluations" not in self._stubs: - self._stubs[ - "list_conversation_model_evaluations" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/ListConversationModelEvaluations", - request_serializer=conversation_model.ListConversationModelEvaluationsRequest.serialize, - response_deserializer=conversation_model.ListConversationModelEvaluationsResponse.deserialize, + self._stubs["list_conversation_model_evaluations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/ListConversationModelEvaluations", + request_serializer=conversation_model.ListConversationModelEvaluationsRequest.serialize, + response_deserializer=conversation_model.ListConversationModelEvaluationsResponse.deserialize, + ) ) return self._stubs["list_conversation_model_evaluations"] @@ -661,12 +661,12 @@ def create_conversation_model_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_model_evaluation" not in self._stubs: - self._stubs[ - "create_conversation_model_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/CreateConversationModelEvaluation", - request_serializer=conversation_model.CreateConversationModelEvaluationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_conversation_model_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/CreateConversationModelEvaluation", + request_serializer=conversation_model.CreateConversationModelEvaluationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_conversation_model_evaluation"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest.py index 02bdc83fa1ed..75618dbb4e91 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest.py @@ -16,24 +16,24 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationModelsRestTransport @@ -937,9 +937,7 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseCreateConversationModel._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseCreateConversationModel._get_http_options() request, metadata = self._interceptor.pre_create_conversation_model( request, metadata @@ -1097,15 +1095,12 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseCreateConversationModelEvaluation._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseCreateConversationModelEvaluation._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_conversation_model_evaluation( - request, metadata + request, metadata = ( + self._interceptor.pre_create_conversation_model_evaluation( + request, metadata + ) ) transcoded_request = _BaseConversationModelsRestTransport._BaseCreateConversationModelEvaluation._get_transcoded_request( http_options, request @@ -1169,11 +1164,10 @@ def __call__( resp = self._interceptor.post_create_conversation_model_evaluation(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_conversation_model_evaluation_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_conversation_model_evaluation_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1257,9 +1251,7 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseDeleteConversationModel._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseDeleteConversationModel._get_http_options() request, metadata = self._interceptor.pre_delete_conversation_model( request, metadata @@ -1409,9 +1401,7 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseDeployConversationModel._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseDeployConversationModel._get_http_options() request, metadata = self._interceptor.pre_deploy_conversation_model( request, metadata @@ -1562,9 +1552,7 @@ def __call__( Represents a conversation model. """ - http_options = ( - _BaseConversationModelsRestTransport._BaseGetConversationModel._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseGetConversationModel._get_http_options() request, metadata = self._interceptor.pre_get_conversation_model( request, metadata @@ -1719,9 +1707,7 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseGetConversationModelEvaluation._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseGetConversationModelEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_conversation_model_evaluation( request, metadata @@ -1785,11 +1771,10 @@ def __call__( resp = self._interceptor.post_get_conversation_model_evaluation(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_conversation_model_evaluation_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_conversation_model_evaluation_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1877,15 +1862,12 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseListConversationModelEvaluations._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseListConversationModelEvaluations._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_conversation_model_evaluations( - request, metadata + request, metadata = ( + self._interceptor.pre_list_conversation_model_evaluations( + request, metadata + ) ) transcoded_request = _BaseConversationModelsRestTransport._BaseListConversationModelEvaluations._get_transcoded_request( http_options, request @@ -1948,11 +1930,10 @@ def __call__( resp = self._interceptor.post_list_conversation_model_evaluations(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_conversation_model_evaluations_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_conversation_model_evaluations_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2037,9 +2018,7 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseListConversationModels._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseListConversationModels._get_http_options() request, metadata = self._interceptor.pre_list_conversation_models( request, metadata @@ -2196,9 +2175,7 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseUndeployConversationModel._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseUndeployConversationModel._get_http_options() request, metadata = self._interceptor.pre_undeploy_conversation_model( request, metadata @@ -2300,7 +2277,9 @@ def create_conversation_model( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateConversationModel(self._session, self._host, self._interceptor) # type: ignore + return self._CreateConversationModel( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_conversation_model_evaluation( @@ -2311,7 +2290,9 @@ def create_conversation_model_evaluation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateConversationModelEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateConversationModelEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_conversation_model( @@ -2321,7 +2302,9 @@ def delete_conversation_model( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteConversationModel(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteConversationModel( + self._session, self._host, self._interceptor + ) # type: ignore @property def deploy_conversation_model( @@ -2331,7 +2314,9 @@ def deploy_conversation_model( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeployConversationModel(self._session, self._host, self._interceptor) # type: ignore + return self._DeployConversationModel( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_conversation_model( @@ -2353,7 +2338,9 @@ def get_conversation_model_evaluation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetConversationModelEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._GetConversationModelEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_conversation_model_evaluations( @@ -2364,7 +2351,9 @@ def list_conversation_model_evaluations( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListConversationModelEvaluations(self._session, self._host, self._interceptor) # type: ignore + return self._ListConversationModelEvaluations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_conversation_models( @@ -2375,7 +2364,9 @@ def list_conversation_models( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListConversationModels(self._session, self._host, self._interceptor) # type: ignore + return self._ListConversationModels( + self._session, self._host, self._interceptor + ) # type: ignore @property def undeploy_conversation_model( @@ -2385,7 +2376,9 @@ def undeploy_conversation_model( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UndeployConversationModel(self._session, self._host, self._interceptor) # type: ignore + return self._UndeployConversationModel( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -2445,9 +2438,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseConversationModelsRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseConversationModelsRestTransport._BaseGetLocation._get_transcoded_request( @@ -2586,9 +2577,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseConversationModelsRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseConversationModelsRestTransport._BaseListLocations._get_transcoded_request( @@ -2724,9 +2713,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationModelsRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2842,9 +2829,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationModelsRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationModelsRestTransport._BaseGetOperation._get_transcoded_request( @@ -2983,9 +2968,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationModelsRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationModelsRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest_base.py index ac5c0a0c4d64..64652b737e83 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest_base.py @@ -22,10 +22,10 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model from .base import DEFAULT_CLIENT_INFO, ConversationModelsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/async_client.py index 2157f7847179..0c4b2a81d3ca 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -46,18 +46,20 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_profiles import pagers +from google.cloud.dialogflow_v2.types import ( + audio_config, + conversation_profile, + participant, +) from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import audio_config -from google.cloud.dialogflow_v2.types import conversation_profile -from google.cloud.dialogflow_v2.types import participant from .client import ConversationProfilesClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport @@ -157,7 +159,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationProfilesAsyncClient: The constructed client. """ - return ConversationProfilesClient.from_service_account_info.__func__(ConversationProfilesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConversationProfilesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConversationProfilesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -173,7 +178,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationProfilesAsyncClient: The constructed client. """ - return ConversationProfilesClient.from_service_account_file.__func__(ConversationProfilesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConversationProfilesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ConversationProfilesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -211,7 +219,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationProfilesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationProfilesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationProfilesTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/client.py index b35662129ac2..7b01b1a406ea 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -63,18 +63,20 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_profiles import pagers +from google.cloud.dialogflow_v2.types import ( + audio_config, + conversation_profile, + participant, +) from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import audio_config -from google.cloud.dialogflow_v2.types import conversation_profile -from google.cloud.dialogflow_v2.types import participant from .transports.base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport from .transports.grpc import ConversationProfilesGrpcTransport @@ -90,9 +92,7 @@ class ConversationProfilesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationProfilesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationProfilesTransport]] _transport_registry["grpc"] = ConversationProfilesGrpcTransport _transport_registry["grpc_asyncio"] = ConversationProfilesGrpcAsyncIOTransport _transport_registry["rest"] = ConversationProfilesRestTransport @@ -780,11 +780,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationProfilesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationProfilesClient._read_environment_variables() + ) self._client_cert_source = ConversationProfilesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -819,8 +817,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationProfilesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/pagers.py index 094c4b1c76c7..b506e2b6aebb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/__init__.py index cfed16be48c8..2005af811949 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ConversationProfilesRestInterceptor, ConversationProfilesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationProfilesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationProfilesTransport]] _transport_registry["grpc"] = ConversationProfilesGrpcTransport _transport_registry["grpc_asyncio"] = ConversationProfilesGrpcAsyncIOTransport _transport_registry["rest"] = ConversationProfilesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/base.py index f054191ccae4..84e74e80431f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.cloud.dialogflow_v2.types import conversation_profile from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import conversation_profile DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -320,7 +320,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc.py index ffee278d5e8f..ad507e99cb7e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.dialogflow_v2.types import conversation_profile from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import conversation_profile from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport @@ -368,12 +368,12 @@ def list_conversation_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_profiles" not in self._stubs: - self._stubs[ - "list_conversation_profiles" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/ListConversationProfiles", - request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, - response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + self._stubs["list_conversation_profiles"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/ListConversationProfiles", + request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, + response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + ) ) return self._stubs["list_conversation_profiles"] @@ -435,12 +435,12 @@ def create_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_profile" not in self._stubs: - self._stubs[ - "create_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/CreateConversationProfile", - request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["create_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/CreateConversationProfile", + request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["create_conversation_profile"] @@ -473,12 +473,12 @@ def update_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_conversation_profile" not in self._stubs: - self._stubs[ - "update_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/UpdateConversationProfile", - request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["update_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/UpdateConversationProfile", + request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["update_conversation_profile"] @@ -503,12 +503,12 @@ def delete_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversation_profile" not in self._stubs: - self._stubs[ - "delete_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/DeleteConversationProfile", - request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/DeleteConversationProfile", + request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_conversation_profile"] @@ -553,12 +553,12 @@ def set_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_suggestion_feature_config" not in self._stubs: - self._stubs[ - "set_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/SetSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/SetSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_suggestion_feature_config"] @@ -596,12 +596,12 @@ def clear_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "clear_suggestion_feature_config" not in self._stubs: - self._stubs[ - "clear_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/ClearSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["clear_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/ClearSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["clear_suggestion_feature_config"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc_asyncio.py index 6807ee382f4d..1239b71a7d7c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import conversation_profile from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import conversation_profile from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport from .grpc import ConversationProfilesGrpcTransport @@ -376,12 +376,12 @@ def list_conversation_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_profiles" not in self._stubs: - self._stubs[ - "list_conversation_profiles" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/ListConversationProfiles", - request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, - response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + self._stubs["list_conversation_profiles"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/ListConversationProfiles", + request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, + response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + ) ) return self._stubs["list_conversation_profiles"] @@ -443,12 +443,12 @@ def create_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_profile" not in self._stubs: - self._stubs[ - "create_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/CreateConversationProfile", - request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["create_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/CreateConversationProfile", + request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["create_conversation_profile"] @@ -481,12 +481,12 @@ def update_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_conversation_profile" not in self._stubs: - self._stubs[ - "update_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/UpdateConversationProfile", - request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["update_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/UpdateConversationProfile", + request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["update_conversation_profile"] @@ -512,12 +512,12 @@ def delete_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversation_profile" not in self._stubs: - self._stubs[ - "delete_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/DeleteConversationProfile", - request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/DeleteConversationProfile", + request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_conversation_profile"] @@ -562,12 +562,12 @@ def set_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_suggestion_feature_config" not in self._stubs: - self._stubs[ - "set_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/SetSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/SetSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_suggestion_feature_config"] @@ -605,12 +605,12 @@ def clear_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "clear_suggestion_feature_config" not in self._stubs: - self._stubs[ - "clear_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/ClearSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["clear_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/ClearSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["clear_suggestion_feature_config"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest.py index fc23364e9614..8dad56bb594b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest.py @@ -16,25 +16,25 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.dialogflow_v2.types import conversation_profile from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import conversation_profile from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationProfilesRestTransport @@ -791,9 +791,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseClearSuggestionFeatureConfig._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseClearSuggestionFeatureConfig._get_http_options() request, metadata = self._interceptor.pre_clear_suggestion_feature_config( request, metadata @@ -860,11 +858,10 @@ def __call__( resp = self._interceptor.post_clear_suggestion_feature_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_clear_suggestion_feature_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_clear_suggestion_feature_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -949,9 +946,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseCreateConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseCreateConversationProfile._get_http_options() request, metadata = self._interceptor.pre_create_conversation_profile( request, metadata @@ -1104,9 +1099,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseDeleteConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseDeleteConversationProfile._get_http_options() request, metadata = self._interceptor.pre_delete_conversation_profile( request, metadata @@ -1220,9 +1213,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseGetConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseGetConversationProfile._get_http_options() request, metadata = self._interceptor.pre_get_conversation_profile( request, metadata @@ -1375,9 +1366,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseListConversationProfiles._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseListConversationProfiles._get_http_options() request, metadata = self._interceptor.pre_list_conversation_profiles( request, metadata @@ -1532,9 +1521,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseSetSuggestionFeatureConfig._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseSetSuggestionFeatureConfig._get_http_options() request, metadata = self._interceptor.pre_set_suggestion_feature_config( request, metadata @@ -1601,11 +1588,10 @@ def __call__( resp = self._interceptor.post_set_suggestion_feature_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_suggestion_feature_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_suggestion_feature_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1690,9 +1676,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseUpdateConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseUpdateConversationProfile._get_http_options() request, metadata = self._interceptor.pre_update_conversation_profile( request, metadata @@ -1798,7 +1782,9 @@ def clear_suggestion_feature_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ClearSuggestionFeatureConfig(self._session, self._host, self._interceptor) # type: ignore + return self._ClearSuggestionFeatureConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_conversation_profile( @@ -1809,7 +1795,9 @@ def create_conversation_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._CreateConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_conversation_profile( @@ -1819,7 +1807,9 @@ def delete_conversation_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_conversation_profile( @@ -1830,7 +1820,9 @@ def get_conversation_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._GetConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_conversation_profiles( @@ -1841,7 +1833,9 @@ def list_conversation_profiles( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListConversationProfiles(self._session, self._host, self._interceptor) # type: ignore + return self._ListConversationProfiles( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_suggestion_feature_config( @@ -1852,7 +1846,9 @@ def set_suggestion_feature_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetSuggestionFeatureConfig(self._session, self._host, self._interceptor) # type: ignore + return self._SetSuggestionFeatureConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_conversation_profile( @@ -1863,7 +1859,9 @@ def update_conversation_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1923,9 +1921,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseGetLocation._get_transcoded_request( @@ -2064,9 +2060,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseListLocations._get_transcoded_request( @@ -2202,9 +2196,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2320,9 +2312,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseGetOperation._get_transcoded_request( @@ -2461,9 +2451,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest_base.py index 373d7e974f5c..ed47eef421ea 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.dialogflow_v2.types import conversation_profile from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import conversation_profile from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/async_client.py index 014475bb89f9..1167a037765a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,14 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversations import pagers -from google.cloud.dialogflow_v2.types import conversation +from google.cloud.dialogflow_v2.types import conversation, generator, participant from google.cloud.dialogflow_v2.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2.types import generator, participant from .client import ConversationsClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationsTransport @@ -159,7 +158,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationsAsyncClient: The constructed client. """ - return ConversationsClient.from_service_account_info.__func__(ConversationsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConversationsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConversationsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -175,7 +177,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationsAsyncClient: The constructed client. """ - return ConversationsClient.from_service_account_file.__func__(ConversationsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConversationsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ConversationsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/client.py index d86f70228acc..a101a141d45c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,14 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversations import pagers -from google.cloud.dialogflow_v2.types import conversation +from google.cloud.dialogflow_v2.types import conversation, generator, participant from google.cloud.dialogflow_v2.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2.types import generator, participant from .transports.base import DEFAULT_CLIENT_INFO, ConversationsTransport from .transports.grpc import ConversationsGrpcTransport @@ -876,11 +875,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationsClient._read_environment_variables() + ) self._client_cert_source = ConversationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -915,8 +912,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/pagers.py index d8a711d6551a..cc1b0b63fe32 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/base.py index 910225316b1a..f61df65bf947 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version -from google.cloud.dialogflow_v2.types import conversation +from google.cloud.dialogflow_v2.types import conversation, participant from google.cloud.dialogflow_v2.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2.types import participant DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -381,7 +380,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc.py index c2ab061373b7..30018fcf83ac 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2.types import conversation +from google.cloud.dialogflow_v2.types import conversation, participant from google.cloud.dialogflow_v2.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2.types import participant from .base import DEFAULT_CLIENT_INFO, ConversationsTransport @@ -545,12 +544,12 @@ def suggest_conversation_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "suggest_conversation_summary" not in self._stubs: - self._stubs[ - "suggest_conversation_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.Conversations/SuggestConversationSummary", - request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, - response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + self._stubs["suggest_conversation_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.Conversations/SuggestConversationSummary", + request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, + response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + ) ) return self._stubs["suggest_conversation_summary"] @@ -577,12 +576,12 @@ def generate_stateless_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_summary" not in self._stubs: - self._stubs[ - "generate_stateless_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSummary", - request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, - response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + self._stubs["generate_stateless_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSummary", + request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, + response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + ) ) return self._stubs["generate_stateless_summary"] @@ -609,12 +608,12 @@ def generate_stateless_suggestion( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_suggestion" not in self._stubs: - self._stubs[ - "generate_stateless_suggestion" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSuggestion", - request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, - response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + self._stubs["generate_stateless_suggestion"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSuggestion", + request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, + response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + ) ) return self._stubs["generate_stateless_suggestion"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc_asyncio.py index 2ed88fdb67b6..759b9db26c0b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2.types import conversation +from google.cloud.dialogflow_v2.types import conversation, participant from google.cloud.dialogflow_v2.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2.types import participant from .base import DEFAULT_CLIENT_INFO, ConversationsTransport from .grpc import ConversationsGrpcTransport @@ -557,12 +556,12 @@ def suggest_conversation_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "suggest_conversation_summary" not in self._stubs: - self._stubs[ - "suggest_conversation_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.Conversations/SuggestConversationSummary", - request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, - response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + self._stubs["suggest_conversation_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.Conversations/SuggestConversationSummary", + request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, + response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + ) ) return self._stubs["suggest_conversation_summary"] @@ -589,12 +588,12 @@ def generate_stateless_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_summary" not in self._stubs: - self._stubs[ - "generate_stateless_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSummary", - request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, - response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + self._stubs["generate_stateless_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSummary", + request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, + response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + ) ) return self._stubs["generate_stateless_summary"] @@ -621,12 +620,12 @@ def generate_stateless_suggestion( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_suggestion" not in self._stubs: - self._stubs[ - "generate_stateless_suggestion" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSuggestion", - request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, - response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + self._stubs["generate_stateless_suggestion"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSuggestion", + request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, + response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + ) ) return self._stubs["generate_stateless_suggestion"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest.py index 4f22706a9208..8a1be4252bf1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,13 +27,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import conversation +from google.cloud.dialogflow_v2.types import conversation, participant from google.cloud.dialogflow_v2.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2.types import participant from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationsRestTransport @@ -1000,9 +999,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseCompleteConversation._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseCompleteConversation._get_http_options() request, metadata = self._interceptor.pre_complete_conversation( request, metadata @@ -1160,9 +1157,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1317,9 +1312,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseGenerateStatelessSuggestion._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseGenerateStatelessSuggestion._get_http_options() request, metadata = self._interceptor.pre_generate_stateless_suggestion( request, metadata @@ -1390,11 +1383,10 @@ def __call__( resp = self._interceptor.post_generate_stateless_suggestion(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_stateless_suggestion_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_stateless_suggestion_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1483,9 +1475,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseGenerateStatelessSummary._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseGenerateStatelessSummary._get_http_options() request, metadata = self._interceptor.pre_generate_stateless_summary( request, metadata @@ -1642,9 +1632,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseGenerateSuggestions._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseGenerateSuggestions._get_http_options() request, metadata = self._interceptor.pre_generate_suggestions( request, metadata @@ -1954,9 +1942,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseIngestContextReferences._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseIngestContextReferences._get_http_options() request, metadata = self._interceptor.pre_ingest_context_references( request, metadata @@ -2114,9 +2100,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2574,9 +2558,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseSuggestConversationSummary._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseSuggestConversationSummary._get_http_options() request, metadata = self._interceptor.pre_suggest_conversation_summary( request, metadata @@ -2706,7 +2688,9 @@ def generate_stateless_suggestion( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateStatelessSuggestion(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateStatelessSuggestion( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_stateless_summary( @@ -2717,7 +2701,9 @@ def generate_stateless_summary( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateStatelessSummary(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateStatelessSummary( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_suggestions( @@ -2747,7 +2733,9 @@ def ingest_context_references( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._IngestContextReferences(self._session, self._host, self._interceptor) # type: ignore + return self._IngestContextReferences( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_conversations( @@ -2788,7 +2776,9 @@ def suggest_conversation_summary( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SuggestConversationSummary(self._session, self._host, self._interceptor) # type: ignore + return self._SuggestConversationSummary( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest_base.py index 37adba7d3d31..d15a5c4f0246 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2.types import conversation +from google.cloud.dialogflow_v2.types import conversation, participant from google.cloud.dialogflow_v2.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2.types import participant from .base import DEFAULT_CLIENT_INFO, ConversationsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/async_client.py index 0e82fba14967..0e253a0119b7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -46,10 +46,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.documents import pagers from google.cloud.dialogflow_v2.types import document @@ -117,7 +117,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentsAsyncClient: The constructed client. """ - return DocumentsClient.from_service_account_info.__func__(DocumentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DocumentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DocumentsAsyncClient, 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: DocumentsAsyncClient: The constructed client. """ - return DocumentsClient.from_service_account_file.__func__(DocumentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DocumentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DocumentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/client.py index 0e63ed700004..13ccd2af1fcd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -63,10 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.documents import pagers from google.cloud.dialogflow_v2.types import document @@ -628,11 +628,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentsClient._read_environment_variables() + ) self._client_cert_source = DocumentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +665,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/pagers.py index 971287b1fec3..c9ea3ff1d7ff 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/base.py index 14dd3bb88e16..c118e1e6ab2c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import document @@ -321,7 +321,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc.py index 88ff759293a5..923c0162a87d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import document from google.cloud.dialogflow_v2.types import document as gcd_document diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc_asyncio.py index 9b4f733966e4..abed9328a837 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import document from google.cloud.dialogflow_v2.types import document as gcd_document diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest.py index 4651deac2028..503fe3224d6d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/async_client.py index fa321985cc50..e0db52b7084e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -49,8 +49,8 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from .client import EncryptionSpecServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport @@ -126,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EncryptionSpecServiceAsyncClient: The constructed client. """ - return EncryptionSpecServiceClient.from_service_account_info.__func__(EncryptionSpecServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EncryptionSpecServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EncryptionSpecServiceAsyncClient, 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: EncryptionSpecServiceAsyncClient: The constructed client. """ - return EncryptionSpecServiceClient.from_service_account_file.__func__(EncryptionSpecServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EncryptionSpecServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EncryptionSpecServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -180,7 +186,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return EncryptionSpecServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return EncryptionSpecServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> EncryptionSpecServiceTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/client.py index 91d5deedb558..7a189e50efdd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -66,8 +66,8 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from .transports.base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport from .transports.grpc import EncryptionSpecServiceGrpcTransport @@ -83,9 +83,7 @@ class EncryptionSpecServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EncryptionSpecServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EncryptionSpecServiceTransport]] _transport_registry["grpc"] = EncryptionSpecServiceGrpcTransport _transport_registry["grpc_asyncio"] = EncryptionSpecServiceGrpcAsyncIOTransport _transport_registry["rest"] = EncryptionSpecServiceRestTransport @@ -631,11 +629,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EncryptionSpecServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EncryptionSpecServiceClient._read_environment_variables() + ) self._client_cert_source = EncryptionSpecServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -670,8 +666,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EncryptionSpecServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/__init__.py index e85e850f9086..e2f6ba4fbf6f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[EncryptionSpecServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[EncryptionSpecServiceTransport]] _transport_registry["grpc"] = EncryptionSpecServiceGrpcTransport _transport_registry["grpc_asyncio"] = EncryptionSpecServiceGrpcAsyncIOTransport _transport_registry["rest"] = EncryptionSpecServiceRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/base.py index 8325a055c296..4b0133edd7d3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/base.py @@ -17,19 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -237,7 +237,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc.py index b69672e1aa63..624b36cf00fd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc.py @@ -16,22 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport @@ -397,12 +397,12 @@ def initialize_encryption_spec( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "initialize_encryption_spec" not in self._stubs: - self._stubs[ - "initialize_encryption_spec" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.EncryptionSpecService/InitializeEncryptionSpec", - request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["initialize_encryption_spec"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.EncryptionSpecService/InitializeEncryptionSpec", + request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["initialize_encryption_spec"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc_asyncio.py index 03b8c767176a..7033d9def6db 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,13 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport from .grpc import EncryptionSpecServiceGrpcTransport @@ -407,12 +407,12 @@ def initialize_encryption_spec( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "initialize_encryption_spec" not in self._stubs: - self._stubs[ - "initialize_encryption_spec" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.EncryptionSpecService/InitializeEncryptionSpec", - request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["initialize_encryption_spec"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.EncryptionSpecService/InitializeEncryptionSpec", + request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["initialize_encryption_spec"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest.py index 692789efdf6e..96920bb7c652 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest.py @@ -16,22 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEncryptionSpecServiceRestTransport @@ -525,9 +525,7 @@ def __call__( """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseGetEncryptionSpec._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseGetEncryptionSpec._get_http_options() request, metadata = self._interceptor.pre_get_encryption_spec( request, metadata @@ -680,9 +678,7 @@ def __call__( """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseInitializeEncryptionSpec._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseInitializeEncryptionSpec._get_http_options() request, metadata = self._interceptor.pre_initialize_encryption_spec( request, metadata @@ -793,7 +789,9 @@ def initialize_encryption_spec( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._InitializeEncryptionSpec(self._session, self._host, self._interceptor) # type: ignore + return self._InitializeEncryptionSpec( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -853,9 +851,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -994,9 +990,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1132,9 +1126,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1252,9 +1244,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1393,9 +1383,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest_base.py index bcc316d3fa63..9867fd80c600 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest_base.py @@ -22,8 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/async_client.py index f3ba2b731a74..2d650c8bcc91 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -46,10 +46,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.entity_types import pagers from google.cloud.dialogflow_v2.types import entity_type @@ -119,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_info.__func__(EntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EntityTypesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_file.__func__(EntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EntityTypesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/client.py index 62e73d137241..e99777abcd75 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -63,10 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.entity_types import pagers from google.cloud.dialogflow_v2.types import entity_type @@ -625,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EntityTypesClient._read_environment_variables() + ) self._client_cert_source = EntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/pagers.py index 3b508f688723..d173533cd38f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/base.py index 8b00d108bd48..e6930e6174ad 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import entity_type @@ -351,7 +351,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc.py index 3998662025f1..0d1ca677f950 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflow_v2.types import entity_type from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc_asyncio.py index 2dc49fb6137c..418f8c8d917b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import entity_type from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest.py index 598f3d749af3..48bd5da394cf 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflow_v2.types import entity_type @@ -938,9 +938,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchCreateEntities._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchCreateEntities._get_http_options() request, metadata = self._interceptor.pre_batch_create_entities( request, metadata @@ -1092,9 +1090,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchDeleteEntities._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchDeleteEntities._get_http_options() request, metadata = self._interceptor.pre_batch_delete_entities( request, metadata @@ -1246,9 +1242,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchDeleteEntityTypes._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchDeleteEntityTypes._get_http_options() request, metadata = self._interceptor.pre_batch_delete_entity_types( request, metadata @@ -1400,9 +1394,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchUpdateEntities._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchUpdateEntities._get_http_options() request, metadata = self._interceptor.pre_batch_update_entities( request, metadata @@ -1554,9 +1546,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchUpdateEntityTypes._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchUpdateEntityTypes._get_http_options() request, metadata = self._interceptor.pre_batch_update_entity_types( request, metadata @@ -2431,7 +2421,9 @@ def batch_delete_entity_types( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchDeleteEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._BatchDeleteEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_entities( @@ -2449,7 +2441,9 @@ def batch_update_entity_types( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchUpdateEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_entity_type( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest_base.py index acbff8cae087..41a2e9dd22d6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2.types import entity_type from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/async_client.py index 0b11e2354467..868a1f41b21e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.environments import pagers from google.cloud.dialogflow_v2.types import environment, fulfillment @@ -119,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_info.__func__(EnvironmentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EnvironmentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EnvironmentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_file.__func__(EnvironmentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EnvironmentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EnvironmentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/client.py index b7aed7f7ad4b..c6ce51585dc4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.environments import pagers from google.cloud.dialogflow_v2.types import environment, fulfillment @@ -655,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EnvironmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EnvironmentsClient._read_environment_variables() + ) self._client_cert_source = EnvironmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +692,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EnvironmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/pagers.py index 6224f8fc79a0..4f6573b47222 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/base.py index b1be37e19604..1d65116e9ecd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import environment @@ -291,7 +291,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc.py index ed42b296a02e..c32a8066bc1c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflow_v2.types import environment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc_asyncio.py index 6f25c3c12bbb..32713e2f9915 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import environment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest.py index 44e3c8145f54..64a8a81582ae 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflow_v2.types import environment @@ -669,9 +669,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() request, metadata = self._interceptor.pre_create_environment( request, metadata @@ -817,9 +815,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() request, metadata = self._interceptor.pre_delete_environment( request, metadata @@ -1096,9 +1092,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseGetEnvironmentHistory._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseGetEnvironmentHistory._get_http_options() request, metadata = self._interceptor.pre_get_environment_history( request, metadata @@ -1414,9 +1408,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() request, metadata = self._interceptor.pre_update_environment( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest_base.py index 645c5668635b..2c7c6e5f6f87 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2.types import environment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/async_client.py index 03ac14f68705..673a2fd7c174 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.types import fulfillment from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment @@ -115,7 +115,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FulfillmentsAsyncClient: The constructed client. """ - return FulfillmentsClient.from_service_account_info.__func__(FulfillmentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + FulfillmentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(FulfillmentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +134,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FulfillmentsAsyncClient: The constructed client. """ - return FulfillmentsClient.from_service_account_file.__func__(FulfillmentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + FulfillmentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(FulfillmentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/client.py index 2c5e756e062b..d412c834ae55 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.types import fulfillment from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment @@ -617,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FulfillmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FulfillmentsClient._read_environment_variables() + ) self._client_cert_source = FulfillmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -656,8 +654,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FulfillmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/base.py index bc55216ec22a..a39c98ea8567 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import fulfillment @@ -230,7 +230,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc.py index dd0560577064..297d7568c414 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import fulfillment from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc_asyncio.py index c5d6bf159247..d1b3eb3cee5b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import fulfillment from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest.py index 8c02c7fd2c21..c0cdc9dae9f3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -631,9 +631,7 @@ def __call__( """ - http_options = ( - _BaseFulfillmentsRestTransport._BaseUpdateFulfillment._get_http_options() - ) + http_options = _BaseFulfillmentsRestTransport._BaseUpdateFulfillment._get_http_options() request, metadata = self._interceptor.pre_update_fulfillment( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/async_client.py index 961b44866417..9db02fc78c48 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -46,17 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.generator_evaluations import pagers +from google.cloud.dialogflow_v2.types import generator, generator_evaluation, operations from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator -from google.cloud.dialogflow_v2.types import generator_evaluation -from google.cloud.dialogflow_v2.types import operations from .client import GeneratorEvaluationsClient from .transports.base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport @@ -132,7 +130,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GeneratorEvaluationsAsyncClient: The constructed client. """ - return GeneratorEvaluationsClient.from_service_account_info.__func__(GeneratorEvaluationsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GeneratorEvaluationsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GeneratorEvaluationsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +149,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GeneratorEvaluationsAsyncClient: The constructed client. """ - return GeneratorEvaluationsClient.from_service_account_file.__func__(GeneratorEvaluationsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GeneratorEvaluationsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(GeneratorEvaluationsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -186,7 +190,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GeneratorEvaluationsClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GeneratorEvaluationsClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GeneratorEvaluationsTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/client.py index 4520d5fe97bb..eba833af3603 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -63,17 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.generator_evaluations import pagers +from google.cloud.dialogflow_v2.types import generator, generator_evaluation, operations from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator -from google.cloud.dialogflow_v2.types import generator_evaluation -from google.cloud.dialogflow_v2.types import operations from .transports.base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport from .transports.grpc import GeneratorEvaluationsGrpcTransport @@ -89,9 +87,7 @@ class GeneratorEvaluationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GeneratorEvaluationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GeneratorEvaluationsTransport]] _transport_registry["grpc"] = GeneratorEvaluationsGrpcTransport _transport_registry["grpc_asyncio"] = GeneratorEvaluationsGrpcAsyncIOTransport _transport_registry["rest"] = GeneratorEvaluationsRestTransport @@ -681,11 +677,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GeneratorEvaluationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GeneratorEvaluationsClient._read_environment_variables() + ) self._client_cert_source = GeneratorEvaluationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -720,8 +714,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GeneratorEvaluationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/pagers.py index ffcf521a6ab9..3ae51d405c2d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/__init__.py index d8fcc5682d44..9d3ec4732b37 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import GeneratorEvaluationsRestInterceptor, GeneratorEvaluationsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GeneratorEvaluationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GeneratorEvaluationsTransport]] _transport_registry["grpc"] = GeneratorEvaluationsGrpcTransport _transport_registry["grpc_asyncio"] = GeneratorEvaluationsGrpcAsyncIOTransport _transport_registry["rest"] = GeneratorEvaluationsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/base.py index 3bcecceac1ad..6917eecbd4f9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.cloud.dialogflow_v2.types import generator_evaluation from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator_evaluation DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc.py index 495cbc1a0771..33061a8aebe3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.dialogflow_v2.types import generator_evaluation from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport @@ -366,12 +366,12 @@ def create_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_generator_evaluation" not in self._stubs: - self._stubs[ - "create_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.GeneratorEvaluations/CreateGeneratorEvaluation", - request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.GeneratorEvaluations/CreateGeneratorEvaluation", + request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_generator_evaluation"] @@ -426,12 +426,12 @@ def list_generator_evaluations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_generator_evaluations" not in self._stubs: - self._stubs[ - "list_generator_evaluations" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.GeneratorEvaluations/ListGeneratorEvaluations", - request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, - response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + self._stubs["list_generator_evaluations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.GeneratorEvaluations/ListGeneratorEvaluations", + request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, + response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + ) ) return self._stubs["list_generator_evaluations"] @@ -456,12 +456,12 @@ def delete_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_generator_evaluation" not in self._stubs: - self._stubs[ - "delete_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.GeneratorEvaluations/DeleteGeneratorEvaluation", - request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.GeneratorEvaluations/DeleteGeneratorEvaluation", + request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_generator_evaluation"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc_asyncio.py index ce8ee83bcca3..2b6cd86c222d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import generator_evaluation from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport from .grpc import GeneratorEvaluationsGrpcTransport @@ -374,12 +374,12 @@ def create_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_generator_evaluation" not in self._stubs: - self._stubs[ - "create_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.GeneratorEvaluations/CreateGeneratorEvaluation", - request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.GeneratorEvaluations/CreateGeneratorEvaluation", + request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_generator_evaluation"] @@ -434,12 +434,12 @@ def list_generator_evaluations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_generator_evaluations" not in self._stubs: - self._stubs[ - "list_generator_evaluations" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.GeneratorEvaluations/ListGeneratorEvaluations", - request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, - response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + self._stubs["list_generator_evaluations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.GeneratorEvaluations/ListGeneratorEvaluations", + request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, + response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + ) ) return self._stubs["list_generator_evaluations"] @@ -465,12 +465,12 @@ def delete_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_generator_evaluation" not in self._stubs: - self._stubs[ - "delete_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.GeneratorEvaluations/DeleteGeneratorEvaluation", - request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.GeneratorEvaluations/DeleteGeneratorEvaluation", + request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_generator_evaluation"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest.py index 8611d720f146..7a71892e3714 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest.py @@ -16,25 +16,25 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.dialogflow_v2.types import generator_evaluation from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseGeneratorEvaluationsRestTransport @@ -610,9 +610,7 @@ def __call__( """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseCreateGeneratorEvaluation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseCreateGeneratorEvaluation._get_http_options() request, metadata = self._interceptor.pre_create_generator_evaluation( request, metadata @@ -757,9 +755,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseDeleteGeneratorEvaluation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseDeleteGeneratorEvaluation._get_http_options() request, metadata = self._interceptor.pre_delete_generator_evaluation( request, metadata @@ -872,9 +868,7 @@ def __call__( """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseGetGeneratorEvaluation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseGetGeneratorEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_generator_evaluation( request, metadata @@ -1024,9 +1018,7 @@ def __call__( Response of ListGeneratorEvaluations. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseListGeneratorEvaluations._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseListGeneratorEvaluations._get_http_options() request, metadata = self._interceptor.pre_list_generator_evaluations( request, metadata @@ -1129,7 +1121,9 @@ def create_generator_evaluation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateGeneratorEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateGeneratorEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_generator_evaluation( @@ -1139,7 +1133,9 @@ def delete_generator_evaluation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteGeneratorEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteGeneratorEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_generator_evaluation( @@ -1150,7 +1146,9 @@ def get_generator_evaluation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetGeneratorEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._GetGeneratorEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_generator_evaluations( @@ -1161,7 +1159,9 @@ def list_generator_evaluations( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListGeneratorEvaluations(self._session, self._host, self._interceptor) # type: ignore + return self._ListGeneratorEvaluations( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1221,9 +1221,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseGetLocation._get_transcoded_request( @@ -1362,9 +1360,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseListLocations._get_transcoded_request( @@ -1500,9 +1496,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1618,9 +1612,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseGetOperation._get_transcoded_request( @@ -1759,9 +1751,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest_base.py index 91fa7a98859b..e8d975ca6d70 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.dialogflow_v2.types import generator_evaluation from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/async_client.py index 03866d8fd6ad..330d466ec290 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.generators import pagers from google.cloud.dialogflow_v2.types import generator @@ -120,7 +120,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_info.__func__(GeneratorsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GeneratorsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GeneratorsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +139,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_file.__func__(GeneratorsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GeneratorsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(GeneratorsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/client.py index af9cd5179b59..90381cea2553 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.generators import pagers from google.cloud.dialogflow_v2.types import generator @@ -651,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GeneratorsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GeneratorsClient._read_environment_variables() + ) self._client_cert_source = GeneratorsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -690,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GeneratorsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/pagers.py index 387d60ea3040..a4a55dee2734 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/base.py index 885f4d36cfbe..df62742c595c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import generator @@ -276,7 +276,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc.py index 40353167bee0..83d2a74d8657 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflow_v2.types import generator from google.cloud.dialogflow_v2.types import generator as gcd_generator diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc_asyncio.py index adcc6b8ed7e3..c9ec8c4f6860 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import generator from google.cloud.dialogflow_v2.types import generator as gcd_generator diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest.py index 75b0f75f1ebf..cd167d6da927 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflow_v2.types import generator diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest_base.py index 19b9ebae1f78..184c50619b72 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2.types import generator from google.cloud.dialogflow_v2.types import generator as gcd_generator diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/async_client.py index 28e123964783..cc752a4aba12 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -46,15 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.intents import pagers -from google.cloud.dialogflow_v2.types import context -from google.cloud.dialogflow_v2.types import intent +from google.cloud.dialogflow_v2.types import context, intent from google.cloud.dialogflow_v2.types import intent as gcd_intent from .client import IntentsClient @@ -117,7 +116,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_info.__func__(IntentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + IntentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(IntentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -133,7 +135,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_file.__func__(IntentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + IntentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(IntentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/client.py index deea5463d39a..28f8765dae27 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -63,15 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.intents import pagers -from google.cloud.dialogflow_v2.types import context -from google.cloud.dialogflow_v2.types import intent +from google.cloud.dialogflow_v2.types import context, intent from google.cloud.dialogflow_v2.types import intent as gcd_intent from .transports.base import DEFAULT_CLIENT_INFO, IntentsTransport @@ -645,11 +644,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IntentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IntentsClient._read_environment_variables() + ) self._client_cert_source = IntentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -684,8 +681,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IntentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/pagers.py index e1c44cf8d173..edbfa0b6c0d9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/base.py index a1a0a3d88ed6..af46cd89d217 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import intent @@ -304,7 +304,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc.py index ec0b4fa5b171..e0c071e9037c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflow_v2.types import intent from google.cloud.dialogflow_v2.types import intent as gcd_intent diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc_asyncio.py index 8fe3f6224f12..8cae740c2a73 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import intent from google.cloud.dialogflow_v2.types import intent as gcd_intent diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest.py index 6d1305ea544e..8ae35d74f2a6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflow_v2.types import intent diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest_base.py index f59e99248756..1e9b4bfbbb1a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2.types import intent from google.cloud.dialogflow_v2.types import intent as gcd_intent diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/async_client.py index 99b95d456f38..23b2969d9be8 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.knowledge_bases import pagers -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from .client import KnowledgeBasesClient from .transports.base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport @@ -122,7 +122,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: KnowledgeBasesAsyncClient: The constructed client. """ - return KnowledgeBasesClient.from_service_account_info.__func__(KnowledgeBasesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + KnowledgeBasesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(KnowledgeBasesAsyncClient, 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: KnowledgeBasesAsyncClient: The constructed client. """ - return KnowledgeBasesClient.from_service_account_file.__func__(KnowledgeBasesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + KnowledgeBasesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(KnowledgeBasesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/client.py index f244f5a2f837..2761101bd387 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.knowledge_bases import pagers -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from .transports.base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport from .transports.grpc import KnowledgeBasesGrpcTransport @@ -83,9 +83,7 @@ class KnowledgeBasesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[KnowledgeBasesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[KnowledgeBasesTransport]] _transport_registry["grpc"] = KnowledgeBasesGrpcTransport _transport_registry["grpc_asyncio"] = KnowledgeBasesGrpcAsyncIOTransport _transport_registry["rest"] = KnowledgeBasesRestTransport @@ -624,11 +622,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = KnowledgeBasesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + KnowledgeBasesClient._read_environment_variables() + ) self._client_cert_source = KnowledgeBasesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -663,8 +659,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(KnowledgeBasesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/pagers.py index 9a6672bdd538..57cc3b0dc237 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/base.py index 8588d4844fe5..93c94039e92d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -282,7 +282,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc.py index ed5fcd3ad47e..c4b73666f284 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc_asyncio.py index bcbbaba03a93..9057483aa292 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,15 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport from .grpc import KnowledgeBasesGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest.py index 17f672a7d2e2..1f78812fc78c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,13 +28,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseKnowledgeBasesRestTransport @@ -616,9 +616,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseCreateKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseCreateKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_create_knowledge_base( request, metadata @@ -767,9 +765,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseDeleteKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseDeleteKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_delete_knowledge_base( request, metadata @@ -892,9 +888,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseGetKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseGetKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_get_knowledge_base( request, metadata @@ -1041,9 +1035,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseListKnowledgeBases._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseListKnowledgeBases._get_http_options() request, metadata = self._interceptor.pre_list_knowledge_bases( request, metadata @@ -1204,9 +1196,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseUpdateKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseUpdateKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_update_knowledge_base( request, metadata @@ -1688,9 +1678,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest_base.py index d8e650bfccbd..fac709d3acf4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/async_client.py index 91cccc071f3d..7aa8f795320d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -47,14 +47,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.participants import pagers -from google.cloud.dialogflow_v2.types import participant +from google.cloud.dialogflow_v2.types import participant, session from google.cloud.dialogflow_v2.types import participant as gcd_participant -from google.cloud.dialogflow_v2.types import session from .client import ParticipantsClient from .transports.base import DEFAULT_CLIENT_INFO, ParticipantsTransport @@ -136,7 +135,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ParticipantsAsyncClient: The constructed client. """ - return ParticipantsClient.from_service_account_info.__func__(ParticipantsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ParticipantsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ParticipantsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -152,7 +154,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ParticipantsAsyncClient: The constructed client. """ - return ParticipantsClient.from_service_account_file.__func__(ParticipantsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ParticipantsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ParticipantsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/client.py index c316f16c24d0..4ef56e7d6a64 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -63,14 +63,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.participants import pagers -from google.cloud.dialogflow_v2.types import participant +from google.cloud.dialogflow_v2.types import participant, session from google.cloud.dialogflow_v2.types import participant as gcd_participant -from google.cloud.dialogflow_v2.types import session from .transports.base import DEFAULT_CLIENT_INFO, ParticipantsTransport from .transports.grpc import ParticipantsGrpcTransport @@ -776,11 +775,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ParticipantsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ParticipantsClient._read_environment_variables() + ) self._client_cert_source = ParticipantsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -815,8 +812,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ParticipantsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/pagers.py index 18ca0fa61276..8a5759c4977f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/base.py index 5e5563bc77f1..9f36fafde00b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import participant @@ -372,7 +372,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc.py index 1fedbddd1ec8..4a7b7c4a7518 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import participant from google.cloud.dialogflow_v2.types import participant as gcd_participant @@ -506,12 +506,12 @@ def streaming_analyze_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "streaming_analyze_content" not in self._stubs: - self._stubs[ - "streaming_analyze_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.dialogflow.v2.Participants/StreamingAnalyzeContent", - request_serializer=participant.StreamingAnalyzeContentRequest.serialize, - response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + self._stubs["streaming_analyze_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.dialogflow.v2.Participants/StreamingAnalyzeContent", + request_serializer=participant.StreamingAnalyzeContentRequest.serialize, + response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + ) ) return self._stubs["streaming_analyze_content"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc_asyncio.py index 9748d5922b22..9985878762d9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import participant from google.cloud.dialogflow_v2.types import participant as gcd_participant @@ -520,12 +520,12 @@ def streaming_analyze_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "streaming_analyze_content" not in self._stubs: - self._stubs[ - "streaming_analyze_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.dialogflow.v2.Participants/StreamingAnalyzeContent", - request_serializer=participant.StreamingAnalyzeContentRequest.serialize, - response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + self._stubs["streaming_analyze_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.dialogflow.v2.Participants/StreamingAnalyzeContent", + request_serializer=participant.StreamingAnalyzeContentRequest.serialize, + response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + ) ) return self._stubs["streaming_analyze_content"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest.py index e9d8b4787d3c..77a3ede08947 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1026,9 +1026,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseCreateParticipant._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseCreateParticipant._get_http_options() request, metadata = self._interceptor.pre_create_participant( request, metadata @@ -1655,9 +1653,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseSuggestFaqAnswers._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseSuggestFaqAnswers._get_http_options() request, metadata = self._interceptor.pre_suggest_faq_answers( request, metadata @@ -1812,9 +1808,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseSuggestKnowledgeAssist._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseSuggestKnowledgeAssist._get_http_options() request, metadata = self._interceptor.pre_suggest_knowledge_assist( request, metadata @@ -1969,9 +1963,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseSuggestSmartReplies._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseSuggestSmartReplies._get_http_options() request, metadata = self._interceptor.pre_suggest_smart_replies( request, metadata @@ -2126,9 +2118,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseUpdateParticipant._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseUpdateParticipant._get_http_options() request, metadata = self._interceptor.pre_update_participant( request, metadata @@ -2270,7 +2260,9 @@ def streaming_analyze_content( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._StreamingAnalyzeContent(self._session, self._host, self._interceptor) # type: ignore + return self._StreamingAnalyzeContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def suggest_articles( @@ -2301,7 +2293,9 @@ def suggest_knowledge_assist( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SuggestKnowledgeAssist(self._session, self._host, self._interceptor) # type: ignore + return self._SuggestKnowledgeAssist( + self._session, self._host, self._interceptor + ) # type: ignore @property def suggest_smart_replies( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/async_client.py index 789d0a4e4f16..958ec9362e16 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.session_entity_types import pagers +from google.cloud.dialogflow_v2.types import entity_type, session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import entity_type -from google.cloud.dialogflow_v2.types import session_entity_type from .client import SessionEntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -127,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_info.__func__(SessionEntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SessionEntityTypesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SessionEntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +145,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_file.__func__(SessionEntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SessionEntityTypesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SessionEntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +186,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SessionEntityTypesTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/client.py index 0ad5206f6d97..e06b75d3f079 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.session_entity_types import pagers +from google.cloud.dialogflow_v2.types import entity_type, session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import entity_type -from google.cloud.dialogflow_v2.types import session_entity_type from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .transports.grpc import SessionEntityTypesGrpcTransport @@ -86,9 +85,7 @@ class SessionEntityTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionEntityTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport @@ -634,11 +631,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionEntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionEntityTypesClient._read_environment_variables() + ) self._client_cert_source = SessionEntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -673,8 +668,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionEntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/pagers.py index 484d20614953..fda324704bc5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/__init__.py index f94244b2aec5..4e711301d110 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SessionEntityTypesRestInterceptor, SessionEntityTypesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SessionEntityTypesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/base.py index 37658f25ad81..d0e1e1d8d42e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.cloud.dialogflow_v2.types import session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import session_entity_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc.py index e6ce3b88ba4a..67b130cbc0f9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.dialogflow_v2.types import session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -423,12 +423,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -458,12 +458,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -492,12 +492,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc_asyncio.py index 6c181d4d7cd9..782a3ce5b141 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .grpc import SessionEntityTypesGrpcTransport @@ -431,12 +431,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -466,12 +466,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -500,12 +500,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest.py index 0ac87da9c5aa..dec556b5a96c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.dialogflow_v2.types import session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import session_entity_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionEntityTypesRestTransport @@ -622,9 +622,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_create_session_entity_type( request, metadata @@ -776,9 +774,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_delete_session_entity_type( request, metadata @@ -902,9 +898,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_get_session_entity_type( request, metadata @@ -1056,9 +1050,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() request, metadata = self._interceptor.pre_list_session_entity_types( request, metadata @@ -1222,9 +1214,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_update_session_entity_type( request, metadata @@ -1332,7 +1322,9 @@ def create_session_entity_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_session_entity_type( @@ -1342,7 +1334,9 @@ def delete_session_entity_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_session_entity_type( @@ -1364,7 +1358,9 @@ def list_session_entity_types( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListSessionEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._ListSessionEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_session_entity_type( @@ -1375,7 +1371,9 @@ def update_session_entity_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1435,9 +1433,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_transcoded_request( @@ -1576,9 +1572,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_transcoded_request( @@ -1714,9 +1708,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1832,9 +1824,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_transcoded_request( @@ -1973,9 +1963,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest_base.py index d7e861b47ea3..9eb4a07a0ea2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.dialogflow_v2.types import session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/async_client.py index 19646742cfa4..9af499eea757 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -47,12 +47,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore -from google.cloud.dialogflow_v2.types import audio_config -from google.cloud.dialogflow_v2.types import session +from google.cloud.dialogflow_v2.types import audio_config, session from google.cloud.dialogflow_v2.types import session as gcd_session from .client import SessionsClient @@ -127,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_info.__func__(SessionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SessionsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SessionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +145,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_file.__func__(SessionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SessionsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SessionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/client.py index 625c2cce335c..cea9975d5458 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -63,12 +63,11 @@ _LOGGER = std_logging.getLogger(__name__) +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore -from google.cloud.dialogflow_v2.types import audio_config -from google.cloud.dialogflow_v2.types import session +from google.cloud.dialogflow_v2.types import audio_config, session from google.cloud.dialogflow_v2.types import session as gcd_session from .transports.base import DEFAULT_CLIENT_INFO, SessionsTransport @@ -709,11 +708,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionsClient._read_environment_variables() + ) self._client_cert_source = SessionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -748,8 +745,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/base.py index 75058114fbef..49e6078ddc80 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import session @@ -245,7 +245,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc.py index ee067d310ae8..ef4a2a845bd6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import session from google.cloud.dialogflow_v2.types import session as gcd_session diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc_asyncio.py index 79c9940f69a3..162704db94c6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import session from google.cloud.dialogflow_v2.types import session as gcd_session diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest.py index 38d8dcc4aada..ea51fc6690db 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/async_client.py index 43c4cefa17e6..d85cd80c8222 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.sip_trunks import pagers from google.cloud.dialogflow_v2.types import sip_trunk @@ -114,7 +114,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SipTrunksAsyncClient: The constructed client. """ - return SipTrunksClient.from_service_account_info.__func__(SipTrunksAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SipTrunksClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SipTrunksAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +133,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SipTrunksAsyncClient: The constructed client. """ - return SipTrunksClient.from_service_account_file.__func__(SipTrunksAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SipTrunksClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SipTrunksAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/client.py index be588a2dea32..d5a0914c7759 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.sip_trunks import pagers from google.cloud.dialogflow_v2.types import sip_trunk @@ -625,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SipTrunksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SipTrunksClient._read_environment_variables() + ) self._client_cert_source = SipTrunksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SipTrunksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/pagers.py index da5409622044..14e1128ee189 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/base.py index 5bec7291f47b..b2c6b3865f00 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import sip_trunk @@ -275,7 +275,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc.py index 70578993f6ad..bdc83144f0fd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflow_v2.types import sip_trunk from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc_asyncio.py index ffc5687f3330..2e3ddd28fcca 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import sip_trunk from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest.py index 605cdbd58fe8..2e79e8039c53 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflow_v2.types import sip_trunk diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest_base.py index 8e5dcd33791f..a8a5b23558a0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2.types import sip_trunk from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/async_client.py index 2b2076e3d7db..2aac2373935a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.tools import pagers from google.cloud.dialogflow_v2.types import tool @@ -116,7 +116,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_info.__func__(ToolsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ToolsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ToolsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +135,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_file.__func__(ToolsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ToolsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ToolsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/client.py index 47674ea1864f..6992358dfdd5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.tools import pagers from google.cloud.dialogflow_v2.types import tool @@ -673,11 +673,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ToolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ToolsClient._read_environment_variables() + ) self._client_cert_source = ToolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -712,8 +710,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ToolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/pagers.py index 0e44b3d25931..0161ef409e96 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/base.py index 695e5854f715..1a7042b7a500 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import tool @@ -267,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc.py index c3fae8cc7404..9e54c922ca00 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflow_v2.types import tool from google.cloud.dialogflow_v2.types import tool as gcd_tool diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc_asyncio.py index 08ae4c9ed164..5e49c2382a3b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import tool from google.cloud.dialogflow_v2.types import tool as gcd_tool diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest.py index 8b5ce9de3047..b9945ebf3875 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflow_v2.types import tool diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest_base.py index 54e081bad72b..340601af1a40 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2.types import tool from google.cloud.dialogflow_v2.types import tool as gcd_tool diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/async_client.py index 94ae6af1044a..68ee1a17be16 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.versions import pagers from google.cloud.dialogflow_v2.types import version @@ -111,7 +111,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_info.__func__(VersionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + VersionsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(VersionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -127,7 +130,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_file.__func__(VersionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + VersionsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(VersionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/client.py index 5cdf512a6fcc..ab7db5403368 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2.services.versions import pagers from google.cloud.dialogflow_v2.types import version @@ -621,11 +621,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VersionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VersionsClient._read_environment_variables() + ) self._client_cert_source = VersionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -660,8 +658,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VersionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/pagers.py index a16437ad9290..e0e03fa121dc 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/base.py index fef006ec4179..496a944a62e2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import version @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc.py index cad87659e0ed..a2cf35ec0764 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflow_v2.types import version from google.cloud.dialogflow_v2.types import version as gcd_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc_asyncio.py index 2803fa050ee6..d4b4021821ed 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import version from google.cloud.dialogflow_v2.types import version as gcd_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest.py index ad718fedea92..4b3cb677e1a4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflow_v2.types import version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest_base.py index e388fba67de5..ef691c55ad30 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2.types import version from google.cloud.dialogflow_v2.types import version as gcd_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/__init__.py index 8455a2beab80..672bfeb257f6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/__init__.py @@ -27,7 +27,9 @@ SetAgentRequest, TrainAgentRequest, ) -from .agent_coaching_instruction import AgentCoachingInstruction +from .agent_coaching_instruction import ( + AgentCoachingInstruction, +) from .answer_record import ( AgentAssistantFeedback, AgentAssistantRecord, @@ -101,7 +103,9 @@ ListConversationDatasetsRequest, ListConversationDatasetsResponse, ) -from .conversation_event import ConversationEvent +from .conversation_event import ( + ConversationEvent, +) from .conversation_model import ( ArticleSuggestionModelMetadata, ConversationModel, @@ -197,8 +201,15 @@ TextToSpeechSettings, UpdateEnvironmentRequest, ) -from .fulfillment import Fulfillment, GetFulfillmentRequest, UpdateFulfillmentRequest -from .gcs import GcsDestination, GcsSources +from .fulfillment import ( + Fulfillment, + GetFulfillmentRequest, + UpdateFulfillmentRequest, +) +from .gcs import ( + GcsDestination, + GcsSources, +) from .generator import ( AgentCoachingContext, AgentCoachingSuggestion, @@ -235,7 +246,9 @@ ListGeneratorEvaluationsResponse, SummarizationEvaluationMetrics, ) -from .human_agent_assistant_event import HumanAgentAssistantEvent +from .human_agent_assistant_event import ( + HumanAgentAssistantEvent, +) from .intent import ( BatchDeleteIntentsRequest, BatchUpdateIntentsRequest, @@ -259,7 +272,9 @@ ListKnowledgeBasesResponse, UpdateKnowledgeBaseRequest, ) -from .operations import GeneratorEvaluationOperationMetadata +from .operations import ( + GeneratorEvaluationOperationMetadata, +) from .participant import ( AnalyzeContentRequest, AnalyzeContentResponse, @@ -342,8 +357,14 @@ Tool, UpdateToolRequest, ) -from .tool_call import ToolCall, ToolCallResult -from .validation_result import ValidationError, ValidationResult +from .tool_call import ( + ToolCall, + ToolCallResult, +) +from .validation_result import ( + ValidationError, + ValidationResult, +) from .version import ( CreateVersionRequest, DeleteVersionRequest, @@ -353,7 +374,11 @@ UpdateVersionRequest, Version, ) -from .webhook import OriginalDetectIntentRequest, WebhookRequest, WebhookResponse +from .webhook import ( + OriginalDetectIntentRequest, + WebhookRequest, + WebhookResponse, +) __all__ = ( "Agent", diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent.py index 9cf2027363e3..a17ccb8d4a92 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent.py @@ -126,6 +126,7 @@ class MatchMode(proto.Enum): examples in intents, especially the ones using @sys.any or very large custom entities. """ + MATCH_MODE_UNSPECIFIED = 0 MATCH_MODE_HYBRID = 1 MATCH_MODE_ML_ONLY = 2 @@ -143,6 +144,7 @@ class ApiVersion(proto.Enum): API_VERSION_V2_BETA_1 (3): V2beta1 API. """ + API_VERSION_UNSPECIFIED = 0 API_VERSION_V1 = 1 API_VERSION_V2 = 2 @@ -165,6 +167,7 @@ class Tier(proto.Enum): Essentials Edition (same as TIER_ENTERPRISE), previously known as Enterprise Plus Edition. """ + TIER_UNSPECIFIED = 0 TIER_STANDARD = 1 TIER_ENTERPRISE = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent_coaching_instruction.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent_coaching_instruction.py index d9bbe4178e23..f2a2050a5659 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent_coaching_instruction.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent_coaching_instruction.py @@ -80,6 +80,7 @@ class TriggerEvent(proto.Enum): TOOL_CALL_COMPLETION (5): Triggers on tool call completion. """ + TRIGGER_EVENT_UNSPECIFIED = 0 END_OF_UTTERANCE = 1 MANUAL_CALL = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/answer_record.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/answer_record.py index e25f3488b028..3785c9814da6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/answer_record.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/answer_record.py @@ -262,6 +262,7 @@ class CorrectnessLevel(proto.Enum): FULLY_CORRECT (3): Answer is fully correct. """ + CORRECTNESS_LEVEL_UNSPECIFIED = 0 NOT_CORRECT = 1 PARTIALLY_CORRECT = 2 @@ -352,6 +353,7 @@ class AnswerRelevance(proto.Enum): RELEVANT (2): Answer is relevant to query. """ + ANSWER_RELEVANCE_UNSPECIFIED = 0 IRRELEVANT = 1 RELEVANT = 2 @@ -367,6 +369,7 @@ class DocumentCorrectness(proto.Enum): CORRECT (2): Information in document is correct. """ + DOCUMENT_CORRECTNESS_UNSPECIFIED = 0 INCORRECT = 1 CORRECT = 2 @@ -382,6 +385,7 @@ class DocumentEfficiency(proto.Enum): EFFICIENT (2): Document is efficient. """ + DOCUMENT_EFFICIENCY_UNSPECIFIED = 0 INEFFICIENT = 1 EFFICIENT = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/audio_config.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/audio_config.py index 6da1f5011029..53c9e1de980a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/audio_config.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/audio_config.py @@ -83,6 +83,7 @@ class TelephonyDtmf(proto.Enum): Pound/diamond/hash/square/gate/octothorpe: '#'. """ + TELEPHONY_DTMF_UNSPECIFIED = 0 DTMF_ONE = 1 DTMF_TWO = 2 @@ -155,6 +156,7 @@ class AudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + AUDIO_ENCODING_UNSPECIFIED = 0 AUDIO_ENCODING_LINEAR_16 = 1 AUDIO_ENCODING_FLAC = 2 @@ -210,6 +212,7 @@ class SpeechModelVariant(proto.Enum): docs `__ for how to make your project eligible. """ + SPEECH_MODEL_VARIANT_UNSPECIFIED = 0 USE_BEST_AVAILABLE = 1 USE_STANDARD = 2 @@ -232,6 +235,7 @@ class SsmlVoiceGender(proto.Enum): SSML_VOICE_GENDER_NEUTRAL (3): A gender-neutral voice. """ + SSML_VOICE_GENDER_UNSPECIFIED = 0 SSML_VOICE_GENDER_MALE = 1 SSML_VOICE_GENDER_FEMALE = 2 @@ -266,6 +270,7 @@ class OutputAudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + OUTPUT_AUDIO_ENCODING_UNSPECIFIED = 0 OUTPUT_AUDIO_ENCODING_LINEAR_16 = 1 OUTPUT_AUDIO_ENCODING_MP3 = 2 @@ -641,6 +646,7 @@ class PhoneticEncoding(proto.Enum): X-SAMPA, such as apple -> "{p@l". https://en.wikipedia.org/wiki/X-SAMPA """ + PHONETIC_ENCODING_UNSPECIFIED = 0 PHONETIC_ENCODING_IPA = 1 PHONETIC_ENCODING_X_SAMPA = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation.py index 63899c17faab..ea07c9f178ca 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation.py @@ -122,6 +122,7 @@ class LifecycleState(proto.Enum): COMPLETED (2): Conversation has been completed. """ + LIFECYCLE_STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 COMPLETED = 2 @@ -142,6 +143,7 @@ class ConversationStage(proto.Enum): The conversation should not provide responses, just listen and provide suggestions. """ + CONVERSATION_STAGE_UNSPECIFIED = 0 VIRTUAL_AGENT_STAGE = 1 HUMAN_ASSIST_STAGE = 2 @@ -260,6 +262,7 @@ class UpdateMode(proto.Enum): Context content updates are applied in overwrite mode. """ + UPDATE_MODE_UNSPECIFIED = 0 APPEND = 1 OVERWRITE = 2 @@ -295,6 +298,7 @@ class ContentFormat(proto.Enum): PLAIN_TEXT (2): Content was provided as plain text. """ + CONTENT_FORMAT_UNSPECIFIED = 0 JSON = 1 PLAIN_TEXT = 2 @@ -657,13 +661,13 @@ class IngestContextReferencesRequest(proto.Message): proto.STRING, number=1, ) - context_references: MutableMapping[ - str, "Conversation.ContextReference" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=2, - message="Conversation.ContextReference", + context_references: MutableMapping[str, "Conversation.ContextReference"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=2, + message="Conversation.ContextReference", + ) ) @@ -1016,13 +1020,13 @@ class GenerateStatelessSuggestionRequest(proto.Message): number=3, oneof="generator_resource", ) - context_references: MutableMapping[ - str, "Conversation.ContextReference" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=4, - message="Conversation.ContextReference", + context_references: MutableMapping[str, "Conversation.ContextReference"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=4, + message="Conversation.ContextReference", + ) ) conversation_context: gcd_generator.ConversationContext = proto.Field( proto.MESSAGE, @@ -1136,6 +1140,7 @@ class QuerySource(proto.Enum): The query is a suggested query from [Participants.SuggestKnowledgeAssist][google.cloud.dialogflow.v2.Participants.SuggestKnowledgeAssist]. """ + QUERY_SOURCE_UNSPECIFIED = 0 AGENT_QUERY = 1 SUGGESTED_QUERY = 2 @@ -1281,6 +1286,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. E.g. ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -1297,6 +1303,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -1524,6 +1531,7 @@ class AnswerType(proto.Enum): INTENT (3): The answer is from intent matching. """ + ANSWER_TYPE_UNSPECIFIED = 0 FAQ = 1 GENERATIVE = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_event.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_event.py index d533bf138f7e..2498c2189264 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_event.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_event.py @@ -105,6 +105,7 @@ class Type(proto.Enum): or, - when we can recover from an error. """ + TYPE_UNSPECIFIED = 0 CONVERSATION_STARTED = 1 CONVERSATION_FINISHED = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_model.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_model.py index 8f49aaba570a..818b45bfd069 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_model.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_model.py @@ -129,6 +129,7 @@ class State(proto.Enum): until there is enough capacity to start training. """ + STATE_UNSPECIFIED = 0 CREATING = 1 UNDEPLOYED = 2 @@ -150,6 +151,7 @@ class ModelType(proto.Enum): SMART_REPLY_BERT_MODEL (6): ModelType smart reply bert model. """ + MODEL_TYPE_UNSPECIFIED = 0 SMART_REPLY_DUAL_ENCODER_MODEL = 2 SMART_REPLY_BERT_MODEL = 6 @@ -684,12 +686,12 @@ class ListConversationModelEvaluationsResponse(proto.Message): def raw_page(self): return self - conversation_model_evaluations: MutableSequence[ - "ConversationModelEvaluation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ConversationModelEvaluation", + conversation_model_evaluations: MutableSequence["ConversationModelEvaluation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ConversationModelEvaluation", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -762,6 +764,7 @@ class State(proto.Enum): TRAINING (6): Custom model is training. """ + STATE_UNSPECIFIED = 0 PENDING = 1 SUCCEEDED = 2 @@ -927,6 +930,7 @@ class State(proto.Enum): FAILED (5): The operation has failed. """ + STATE_UNSPECIFIED = 0 INITIALIZING = 1 RUNNING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_profile.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_profile.py index 82020f6e688d..2440aa429235 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_profile.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_profile.py @@ -846,6 +846,7 @@ class SectionType(proto.Enum): amount, etc. Section names are prefixed by "entities/". """ + SECTION_TYPE_UNSPECIFIED = 0 SITUATION = 1 ACTION = 2 @@ -1152,6 +1153,7 @@ class MessageFormat(proto.Enum): JSON (2): Pub/Sub message will be json. """ + MESSAGE_FORMAT_UNSPECIFIED = 0 PROTO = 1 JSON = 2 @@ -1218,6 +1220,7 @@ class Type(proto.Enum): Run knowledge assist with automatic query generation. """ + TYPE_UNSPECIFIED = 0 ARTICLE_SUGGESTION = 1 FAQ = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/document.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/document.py index a391dde20e82..339a6ef0e79a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/document.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/document.py @@ -156,6 +156,7 @@ class KnowledgeType(proto.Enum): The document contains agent-facing Smart Reply entries. """ + KNOWLEDGE_TYPE_UNSPECIFIED = 0 FAQ = 1 EXTRACTIVE_QA = 2 @@ -179,6 +180,7 @@ class State(proto.Enum): DELETING (5): The document deletion is in progress. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -673,6 +675,7 @@ class State(proto.Enum): The operation is done, either cancelled or completed. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/entity_type.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/entity_type.py index a24d090bb0c3..d52d56513054 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/entity_type.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/entity_type.py @@ -98,6 +98,7 @@ class Kind(proto.Enum): Regexp entity types allow to specify regular expressions in entries values. """ + KIND_UNSPECIFIED = 0 KIND_MAP = 1 KIND_LIST = 2 @@ -116,6 +117,7 @@ class AutoExpansionMode(proto.Enum): Allows an agent to recognize values that have not been explicitly listed in the entity. """ + AUTO_EXPANSION_MODE_UNSPECIFIED = 0 AUTO_EXPANSION_MODE_DEFAULT = 1 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/environment.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/environment.py index 4db294fcb824..2f5e36b637c6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/environment.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/environment.py @@ -116,6 +116,7 @@ class State(proto.Enum): RUNNING (3): Running. """ + STATE_UNSPECIFIED = 0 STOPPED = 1 LOADING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/fulfillment.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/fulfillment.py index 7f766b87c0fb..53695f0e4698 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/fulfillment.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/fulfillment.py @@ -143,6 +143,7 @@ class Type(proto.Enum): SMALLTALK (1): Fulfillment is enabled for SmallTalk. """ + TYPE_UNSPECIFIED = 0 SMALLTALK = 1 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator.py index 884b60538a9f..d3ff39df4db1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator.py @@ -73,6 +73,7 @@ class TriggerEvent(proto.Enum): AGENT_MESSAGE (4): Triggers after each agent message only. """ + TRIGGER_EVENT_UNSPECIFIED = 0 END_OF_UTTERANCE = 1 MANUAL_CALL = 2 @@ -263,6 +264,7 @@ class Role(proto.Enum): Participant is an end user that has called or chatted with Dialogflow services. """ + ROLE_UNSPECIFIED = 0 HUMAN_AGENT = 1 AUTOMATED_AGENT = 2 @@ -312,12 +314,12 @@ class SummarizationSectionList(proto.Message): Optional. Summarization sections. """ - summarization_sections: MutableSequence[ - "SummarizationSection" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SummarizationSection", + summarization_sections: MutableSequence["SummarizationSection"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SummarizationSection", + ) ) @@ -532,6 +534,7 @@ class Type(proto.Enum): type is only available if type ACTION is not selected. """ + TYPE_UNSPECIFIED = 0 SITUATION = 1 ACTION = 2 @@ -578,12 +581,12 @@ class SummarizationContext(proto.Message): empty. Supported 2.0 and later versions. """ - summarization_sections: MutableSequence[ - "SummarizationSection" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SummarizationSection", + summarization_sections: MutableSequence["SummarizationSection"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SummarizationSection", + ) ) few_shot_examples: MutableSequence["FewShotExample"] = proto.RepeatedField( proto.MESSAGE, @@ -934,12 +937,12 @@ class SampleResponse(proto.Message): number=1, message=agent_coaching_instruction.AgentCoachingInstruction, ) - agent_action_suggestions: MutableSequence[ - AgentActionSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=AgentActionSuggestion, + agent_action_suggestions: MutableSequence[AgentActionSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=AgentActionSuggestion, + ) ) sample_responses: MutableSequence[SampleResponse] = proto.RepeatedField( proto.MESSAGE, @@ -1078,6 +1081,7 @@ class RaiCategory(proto.Enum): HATE_SPEECH (4): Hate speech content. """ + RAI_CATEGORY_UNSPECIFIED = 0 DANGEROUS_CONTENT = 1 SEXUALLY_EXPLICIT = 2 @@ -1104,6 +1108,7 @@ class SensitivityLevel(proto.Enum): BLOCK_NONE (4): No filtering for this category. """ + SENSITIVITY_LEVEL_UNSPECIFIED = 0 BLOCK_MOST = 1 BLOCK_SOME = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator_evaluation.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator_evaluation.py index 50bb6dabc39e..cf5f4054fa35 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator_evaluation.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator_evaluation.py @@ -717,12 +717,12 @@ class SectionDetail(proto.Message): message="SummarizationEvaluationMetrics.SectionToken", ) - summarization_evaluation_results: MutableSequence[ - SummarizationEvaluationResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=SummarizationEvaluationResult, + summarization_evaluation_results: MutableSequence[SummarizationEvaluationResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=SummarizationEvaluationResult, + ) ) summarization_evaluation_merged_results_uri: str = proto.Field( proto.STRING, @@ -781,6 +781,7 @@ class InputDataSourceType(proto.Enum): chosen, input_data_config.start_time and input_data_config.end_timestamp must be provided. """ + INPUT_DATA_SOURCE_TYPE_UNSPECIFIED = 0 AGENT_ASSIST_CONVERSATIONS = 1 INSIGHTS_CONVERSATIONS = 2 @@ -886,6 +887,7 @@ class SummaryGenerationOption(proto.Enum): Do not generate new summaries. Only use existing summaries found. """ + SUMMARY_GENERATION_OPTION_UNSPECIFIED = 0 ALWAYS_GENERATE = 1 GENERATE_IF_MISSING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/human_agent_assistant_event.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/human_agent_assistant_event.py index 3f7e0a99c297..b7d20adbd244 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/human_agent_assistant_event.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/human_agent_assistant_event.py @@ -54,12 +54,12 @@ class HumanAgentAssistantEvent(proto.Message): proto.STRING, number=3, ) - suggestion_results: MutableSequence[ - gcd_participant.SuggestionResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=gcd_participant.SuggestionResult, + suggestion_results: MutableSequence[gcd_participant.SuggestionResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=gcd_participant.SuggestionResult, + ) ) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/intent.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/intent.py index 4ea30749ed3c..4d2c65fabd07 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/intent.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/intent.py @@ -55,6 +55,7 @@ class IntentView(proto.Enum): INTENT_VIEW_FULL (1): All fields are populated. """ + INTENT_VIEW_UNSPECIFIED = 0 INTENT_VIEW_FULL = 1 @@ -192,6 +193,7 @@ class WebhookState(proto.Enum): intent. Also, each slot filling prompt is forwarded to the webhook. """ + WEBHOOK_STATE_UNSPECIFIED = 0 WEBHOOK_STATE_ENABLED = 1 WEBHOOK_STATE_ENABLED_FOR_SLOT_FILLING = 2 @@ -257,6 +259,7 @@ class Type(proto.Enum): existing training phrases that you've created in template mode, those will continue to work. """ + TYPE_UNSPECIFIED = 0 EXAMPLE = 1 TEMPLATE = 2 @@ -499,6 +502,7 @@ class Platform(proto.Enum): GOOGLE_HANGOUTS (11): Google Hangouts. """ + PLATFORM_UNSPECIFIED = 0 FACEBOOK = 1 SLACK = 2 @@ -611,12 +615,12 @@ class Button(proto.Message): proto.STRING, number=3, ) - buttons: MutableSequence[ - "Intent.Message.Card.Button" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Intent.Message.Card.Button", + buttons: MutableSequence["Intent.Message.Card.Button"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Intent.Message.Card.Button", + ) ) class SimpleResponse(proto.Message): @@ -658,12 +662,12 @@ class SimpleResponses(proto.Message): Required. The list of simple responses. """ - simple_responses: MutableSequence[ - "Intent.Message.SimpleResponse" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.SimpleResponse", + simple_responses: MutableSequence["Intent.Message.SimpleResponse"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.SimpleResponse", + ) ) class BasicCard(proto.Message): @@ -736,12 +740,12 @@ class OpenUriAction(proto.Message): number=4, message="Intent.Message.Image", ) - buttons: MutableSequence[ - "Intent.Message.BasicCard.Button" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="Intent.Message.BasicCard.Button", + buttons: MutableSequence["Intent.Message.BasicCard.Button"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="Intent.Message.BasicCard.Button", + ) ) class Suggestion(proto.Message): @@ -767,12 +771,12 @@ class Suggestions(proto.Message): Required. The list of suggested replies. """ - suggestions: MutableSequence[ - "Intent.Message.Suggestion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.Suggestion", + suggestions: MutableSequence["Intent.Message.Suggestion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.Suggestion", + ) ) class LinkOutSuggestion(proto.Message): @@ -847,12 +851,12 @@ class Item(proto.Message): proto.STRING, number=1, ) - items: MutableSequence[ - "Intent.Message.ListSelect.Item" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Intent.Message.ListSelect.Item", + items: MutableSequence["Intent.Message.ListSelect.Item"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Intent.Message.ListSelect.Item", + ) ) subtitle: str = proto.Field( proto.STRING, @@ -901,12 +905,12 @@ class Item(proto.Message): message="Intent.Message.Image", ) - items: MutableSequence[ - "Intent.Message.CarouselSelect.Item" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.CarouselSelect.Item", + items: MutableSequence["Intent.Message.CarouselSelect.Item"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.CarouselSelect.Item", + ) ) class SelectItemInfo(proto.Message): @@ -951,6 +955,7 @@ class ResponseMediaType(proto.Enum): AUDIO (1): Response media type is audio. """ + RESPONSE_MEDIA_TYPE_UNSPECIFIED = 0 AUDIO = 1 @@ -1065,6 +1070,7 @@ class ImageDisplayOptions(proto.Enum): Pad the gaps between image and image frame with a blurred copy of the same image. """ + IMAGE_DISPLAY_OPTIONS_UNSPECIFIED = 0 GRAY = 1 WHITE = 2 @@ -1116,6 +1122,7 @@ class UrlTypeHint(proto.Enum): to a canonical URL which refers to AMP content via . """ + URL_TYPE_HINT_UNSPECIFIED = 0 AMP_ACTION = 1 AMP_CONTENT = 2 @@ -1199,24 +1206,24 @@ class TableCard(proto.Message): number=3, message="Intent.Message.Image", ) - column_properties: MutableSequence[ - "Intent.Message.ColumnProperties" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Intent.Message.ColumnProperties", + column_properties: MutableSequence["Intent.Message.ColumnProperties"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Intent.Message.ColumnProperties", + ) ) rows: MutableSequence["Intent.Message.TableCardRow"] = proto.RepeatedField( proto.MESSAGE, number=5, message="Intent.Message.TableCardRow", ) - buttons: MutableSequence[ - "Intent.Message.BasicCard.Button" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="Intent.Message.BasicCard.Button", + buttons: MutableSequence["Intent.Message.BasicCard.Button"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="Intent.Message.BasicCard.Button", + ) ) class ColumnProperties(proto.Message): @@ -1247,6 +1254,7 @@ class HorizontalAlignment(proto.Enum): Text is aligned to the trailing edge of the column. """ + HORIZONTAL_ALIGNMENT_UNSPECIFIED = 0 LEADING = 1 CENTER = 2 @@ -1275,12 +1283,12 @@ class TableCardRow(proto.Message): after this row. """ - cells: MutableSequence[ - "Intent.Message.TableCardCell" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.TableCardCell", + cells: MutableSequence["Intent.Message.TableCardCell"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.TableCardCell", + ) ) divider_after: bool = proto.Field( proto.BOOL, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/participant.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/participant.py index 367c5748056e..d4cf47ffa434 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/participant.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/participant.py @@ -174,6 +174,7 @@ class Role(proto.Enum): Participant is an end user that has called or chatted with Dialogflow services. """ + ROLE_UNSPECIFIED = 0 HUMAN_AGENT = 1 AUTOMATED_AGENT = 2 @@ -199,6 +200,7 @@ class AgentDesktopSource(proto.Enum): either not currently released or setting this field to the applicable desktop. """ + AGENT_DESKTOP_SOURCE_UNSPECIFIED = 0 LIVE_PERSON = 1 GENESYS_CLOUD = 2 @@ -640,19 +642,19 @@ class AnalyzeContentResponse(proto.Message): number=5, message="Message", ) - human_agent_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="SuggestionResult", + human_agent_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="SuggestionResult", + ) ) - end_user_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message="SuggestionResult", + end_user_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message="SuggestionResult", + ) ) dtmf_parameters: "DtmfParameters" = proto.Field( proto.MESSAGE, @@ -966,19 +968,19 @@ class StreamingAnalyzeContentResponse(proto.Message): number=6, message="Message", ) - human_agent_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message="SuggestionResult", + human_agent_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message="SuggestionResult", + ) ) - end_user_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="SuggestionResult", + end_user_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="SuggestionResult", + ) ) dtmf_parameters: "DtmfParameters" = proto.Field( proto.MESSAGE, @@ -1204,12 +1206,12 @@ class GeneratorSuggestionAnswer(proto.Message): number=3, ) - generator_suggestion_answers: MutableSequence[ - GeneratorSuggestionAnswer - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=GeneratorSuggestionAnswer, + generator_suggestion_answers: MutableSequence[GeneratorSuggestionAnswer] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=GeneratorSuggestionAnswer, + ) ) latest_message: str = proto.Field( proto.STRING, @@ -1390,6 +1392,7 @@ class AutomatedAgentReplyType(proto.Enum): FINAL (2): Final reply. """ + AUTOMATED_AGENT_REPLY_TYPE_UNSPECIFIED = 0 PARTIAL = 1 FINAL = 2 @@ -1845,6 +1848,7 @@ class Action(proto.Enum): This action is intended for tool calls that may write data. """ + ACTION_UNSPECIFIED = 0 CANCEL = 1 REVISE = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session.py index 76a1d9273b96..498d11d114d1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session.py @@ -25,9 +25,8 @@ import proto # type: ignore from google.cloud.dialogflow_v2.types import audio_config as gcd_audio_config -from google.cloud.dialogflow_v2.types import context +from google.cloud.dialogflow_v2.types import context, session_entity_type from google.cloud.dialogflow_v2.types import intent as gcd_intent -from google.cloud.dialogflow_v2.types import session_entity_type __protobuf__ = proto.module( package="google.cloud.dialogflow.v2", @@ -272,12 +271,12 @@ class QueryParameters(proto.Message): proto.BOOL, number=4, ) - session_entity_types: MutableSequence[ - session_entity_type.SessionEntityType - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=session_entity_type.SessionEntityType, + session_entity_types: MutableSequence[session_entity_type.SessionEntityType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=session_entity_type.SessionEntityType, + ) ) payload: struct_pb2.Struct = proto.Field( proto.MESSAGE, @@ -505,12 +504,12 @@ class QueryResult(proto.Message): proto.STRING, number=6, ) - fulfillment_messages: MutableSequence[ - gcd_intent.Intent.Message - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gcd_intent.Intent.Message, + fulfillment_messages: MutableSequence[gcd_intent.Intent.Message] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gcd_intent.Intent.Message, + ) ) webhook_source: str = proto.Field( proto.STRING, @@ -772,19 +771,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=5, ) - speech_partial_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=duration_pb2.Duration, + speech_partial_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=duration_pb2.Duration, + ) ) - speech_final_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=duration_pb2.Duration, + speech_final_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=duration_pb2.Duration, + ) ) partial_responses: int = proto.Field( proto.INT32, @@ -802,19 +801,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=11, ) - dtmf_partial_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=12, - message=duration_pb2.Duration, + dtmf_partial_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12, + message=duration_pb2.Duration, + ) ) - dtmf_final_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=13, - message=duration_pb2.Duration, + dtmf_final_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=13, + message=duration_pb2.Duration, + ) ) single_utterance_end_time_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, @@ -1030,6 +1029,7 @@ class MessageType(proto.Enum): ``single_utterance`` was set to ``true``, and is not used otherwise. """ + MESSAGE_TYPE_UNSPECIFIED = 0 TRANSCRIPT = 1 END_OF_SINGLE_UTTERANCE = 2 @@ -1051,12 +1051,12 @@ class MessageType(proto.Enum): proto.FLOAT, number=4, ) - speech_word_info: MutableSequence[ - gcd_audio_config.SpeechWordInfo - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gcd_audio_config.SpeechWordInfo, + speech_word_info: MutableSequence[gcd_audio_config.SpeechWordInfo] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gcd_audio_config.SpeechWordInfo, + ) ) speech_end_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session_entity_type.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session_entity_type.py index abdf850e82fe..2f5a1d92a78f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session_entity_type.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session_entity_type.py @@ -94,6 +94,7 @@ class EntityOverrideMode(proto.Enum): [EntityTypes.GetEntityType][google.cloud.dialogflow.v2.EntityTypes.GetEntityType] on the custom entity type and merge. """ + ENTITY_OVERRIDE_MODE_UNSPECIFIED = 0 ENTITY_OVERRIDE_MODE_OVERRIDE = 1 ENTITY_OVERRIDE_MODE_SUPPLEMENT = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/sip_trunk.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/sip_trunk.py index 0413a5343d6b..70734799f069 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/sip_trunk.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/sip_trunk.py @@ -253,6 +253,7 @@ class State(proto.Enum): KEEPALIVE (4): SIP Trunk connection is keepalive. """ + STATE_UNSPECIFIED = 0 CONNECTED = 1 DISCONNECTED = 2 @@ -284,6 +285,7 @@ class CertificateState(proto.Enum): CERTIFICATE_QUOTA_EXCEEDED (8): Certificate has exhausted its quota. """ + CERTIFICATE_STATE_UNSPECIFIED = 0 CERTIFICATE_VALID = 1 CERTIFICATE_INVALID = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool.py index 3c8c582ef42b..b642a2f2b900 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool.py @@ -270,6 +270,7 @@ class ConfirmationRequirement(proto.Enum): NOT_REQUIRED (2): Conformation is not required. """ + CONFIRMATION_REQUIREMENT_UNSPECIFIED = 0 REQUIRED = 1 NOT_REQUIRED = 2 @@ -291,6 +292,7 @@ class MethodType(proto.Enum): PATCH (5): PATCH method. """ + METHOD_TYPE_UNSPECIFIED = 0 GET = 1 POST = 2 @@ -467,6 +469,7 @@ class OperationType(proto.Enum): DELETE (5): Delete operation. """ + OPERATION_TYPE_UNSPECIFIED = 0 LIST = 1 GET = 2 @@ -558,6 +561,7 @@ class RequestLocation(proto.Enum): QUERY_STRING (2): Represents the key in query string. """ + REQUEST_LOCATION_UNSPECIFIED = 0 HEADER = 1 QUERY_STRING = 2 @@ -638,6 +642,7 @@ class OauthGrantType(proto.Enum): Represents the `client credential flow `__. """ + OAUTH_GRANT_TYPE_UNSPECIFIED = 0 CLIENT_CREDENTIAL = 1 @@ -701,6 +706,7 @@ class ServiceAgentAuth(proto.Enum): other Google Cloud APIs after you grant required roles to ``service-@gcp-sa-dialogflow.iam.gserviceaccount.com``. """ + SERVICE_AGENT_AUTH_UNSPECIFIED = 0 ID_TOKEN = 1 ACCESS_TOKEN = 2 @@ -847,13 +853,13 @@ class ServiceDirectoryConfig(proto.Message): proto.STRING, number=3, ) - action_confirmation_requirement: MutableMapping[ - str, ConfirmationRequirement - ] = proto.MapField( - proto.STRING, - proto.ENUM, - number=17, - enum=ConfirmationRequirement, + action_confirmation_requirement: MutableMapping[str, ConfirmationRequirement] = ( + proto.MapField( + proto.STRING, + proto.ENUM, + number=17, + enum=ConfirmationRequirement, + ) ) extension_spec: ExtensionTool = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool_call.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool_call.py index 277a54cbc4d0..912568c6f8d0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool_call.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool_call.py @@ -76,6 +76,7 @@ class State(proto.Enum): The tool call requires confirmation from a human. """ + STATE_UNSPECIFIED = 0 TRIGGERED = 1 NEEDS_CONFIRMATION = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/validation_result.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/validation_result.py index 18814c55c561..ef1f64474b8c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/validation_result.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/validation_result.py @@ -70,6 +70,7 @@ class Severity(proto.Enum): CRITICAL (4): The agent may completely fail. """ + SEVERITY_UNSPECIFIED = 0 INFO = 1 WARNING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/version.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/version.py index c5e73124bf0c..5451603429fa 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/version.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/version.py @@ -94,6 +94,7 @@ class VersionStatus(proto.Enum): FAILED (3): Version training failed. """ + VERSION_STATUS_UNSPECIFIED = 0 IN_PROGRESS = 1 READY = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/webhook.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/webhook.py index 39b453714eb4..a42def87e542 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/webhook.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/webhook.py @@ -20,9 +20,8 @@ import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.dialogflow_v2.types import context, intent +from google.cloud.dialogflow_v2.types import context, intent, session_entity_type from google.cloud.dialogflow_v2.types import session as gcd_session -from google.cloud.dialogflow_v2.types import session_entity_type __protobuf__ = proto.module( package="google.cloud.dialogflow.v2", @@ -174,12 +173,12 @@ class WebhookResponse(proto.Message): number=6, message=gcd_session.EventInput, ) - session_entity_types: MutableSequence[ - session_entity_type.SessionEntityType - ] = proto.RepeatedField( - proto.MESSAGE, - number=10, - message=session_entity_type.SessionEntityType, + session_entity_types: MutableSequence[session_entity_type.SessionEntityType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=10, + message=session_entity_type.SessionEntityType, + ) ) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/__init__.py index 5a222e8e0743..cd836430eaab 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.agents import AgentsAsyncClient, AgentsClient from .services.answer_records import AnswerRecordsAsyncClient, AnswerRecordsClient from .services.contexts import ContextsAsyncClient, ContextsClient diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/gapic_version.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/gapic_version.py index 69e882b829a7..01ec3a69ff70 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/gapic_version.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.45.0" # {x-release-please-version} +__version__ = "2.46.0" # {x-release-please-version} diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/async_client.py index 6c2a136d8ebe..c52dde41b9aa 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -46,15 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.agents import pagers -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result from .client import AgentsClient from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport @@ -114,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_info.__func__(AgentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AgentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AgentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_file.__func__(AgentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AgentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AgentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/client.py index 310e71ec97d5..5966b1d8e7aa 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -63,15 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.agents import pagers -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport from .transports.grpc import AgentsGrpcTransport @@ -622,11 +621,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AgentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AgentsClient._read_environment_variables() + ) self._client_cert_source = AgentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -661,8 +658,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AgentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/pagers.py index 2637e7af6df6..a0d710174e0c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/base.py index 87c37ed6ead8..547bcae9d2c2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/base.py @@ -17,21 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -333,7 +332,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc.py index bb7274cc4bae..4ba94ab29893 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc.py @@ -16,24 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result from .base import DEFAULT_CLIENT_INFO, AgentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc_asyncio.py index 43f44c998bfe..8bd55111c7e3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,16 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result from .base import DEFAULT_CLIENT_INFO, AgentsTransport from .grpc import AgentsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest.py index e4d94b83f6d0..9cf98a6797bf 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest.py @@ -16,24 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAgentsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest_base.py index 2b5aba062f94..367e640e996d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest_base.py @@ -17,15 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result from .base import DEFAULT_CLIENT_INFO, AgentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/async_client.py index 3641da591ec0..28d36a39d58e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -45,13 +45,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.answer_records import pagers -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from .client import AnswerRecordsClient from .transports.base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport @@ -131,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AnswerRecordsAsyncClient: The constructed client. """ - return AnswerRecordsClient.from_service_account_info.__func__(AnswerRecordsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AnswerRecordsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AnswerRecordsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AnswerRecordsAsyncClient: The constructed client. """ - return AnswerRecordsClient.from_service_account_file.__func__(AnswerRecordsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AnswerRecordsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AnswerRecordsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/client.py index 0c32c538df98..cdbc72884617 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.answer_records import pagers -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from .transports.base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport from .transports.grpc import AnswerRecordsGrpcTransport @@ -705,11 +705,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AnswerRecordsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AnswerRecordsClient._read_environment_variables() + ) self._client_cert_source = AnswerRecordsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -744,8 +742,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AnswerRecordsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/pagers.py index 2e21f759e08d..2cbb7413cbff 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/base.py index 6b5514f10971..b8b407cf1a7a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/base.py @@ -17,19 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -249,7 +249,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc.py index 5a4f13dd7232..0c07d2b2fc4c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc.py @@ -16,22 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from .base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc_asyncio.py index 432c171d6ac4..a16f6c3c52ac 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,13 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from .base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport from .grpc import AnswerRecordsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest.py index 4cd6d0b237cf..946b59a74af5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,12 +27,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAnswerRecordsRestTransport @@ -699,9 +699,7 @@ def __call__( """ - http_options = ( - _BaseAnswerRecordsRestTransport._BaseListAnswerRecords._get_http_options() - ) + http_options = _BaseAnswerRecordsRestTransport._BaseListAnswerRecords._get_http_options() request, metadata = self._interceptor.pre_list_answer_records( request, metadata @@ -880,9 +878,7 @@ def __call__( """ - http_options = ( - _BaseAnswerRecordsRestTransport._BaseUpdateAnswerRecord._get_http_options() - ) + http_options = _BaseAnswerRecordsRestTransport._BaseUpdateAnswerRecord._get_http_options() request, metadata = self._interceptor.pre_update_answer_record( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest_base.py index 48d4b25f45b3..fa10c68a1314 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest_base.py @@ -22,8 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from .base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/async_client.py index 315bad7905ee..de7e8f555a90 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.contexts import pagers from google.cloud.dialogflow_v2beta1.types import context @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ContextsAsyncClient: The constructed client. """ - return ContextsClient.from_service_account_info.__func__(ContextsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ContextsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ContextsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ContextsAsyncClient: The constructed client. """ - return ContextsClient.from_service_account_file.__func__(ContextsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ContextsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ContextsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/client.py index b68e729f9e4a..24c029e18201 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.contexts import pagers from google.cloud.dialogflow_v2beta1.types import context @@ -626,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContextsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContextsClient._read_environment_variables() + ) self._client_cert_source = ContextsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContextsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/pagers.py index 69022914402f..64e7a6bc8eff 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/base.py index 56db7629f108..00e2310a8a19 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import context @@ -286,7 +286,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc.py index 06c89eaf9a61..4874cadc25f9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import context from google.cloud.dialogflow_v2beta1.types import context as gcd_context diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc_asyncio.py index a23e82579cb2..b8cc8d2f9883 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import context from google.cloud.dialogflow_v2beta1.types import context as gcd_context diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest.py index 11f4ac2906b9..d7bdd1e31343 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflow_v2beta1.types import context diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest_base.py index 8c93ec6a381f..188ed4abb3e6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.types import context from google.cloud.dialogflow_v2beta1.types import context as gcd_context diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/async_client.py index 8a7a4572371b..ac5bcc2f5b59 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -46,18 +46,20 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.conversation_profiles import pagers +from google.cloud.dialogflow_v2beta1.types import ( + audio_config, + conversation_profile, + participant, +) from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import audio_config -from google.cloud.dialogflow_v2beta1.types import conversation_profile -from google.cloud.dialogflow_v2beta1.types import participant from .client import ConversationProfilesClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport @@ -157,7 +159,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationProfilesAsyncClient: The constructed client. """ - return ConversationProfilesClient.from_service_account_info.__func__(ConversationProfilesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConversationProfilesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConversationProfilesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -173,7 +178,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationProfilesAsyncClient: The constructed client. """ - return ConversationProfilesClient.from_service_account_file.__func__(ConversationProfilesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConversationProfilesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ConversationProfilesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -211,7 +219,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationProfilesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationProfilesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationProfilesTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/client.py index 82e91cd81ad1..9de76b529fab 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -63,18 +63,20 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.conversation_profiles import pagers +from google.cloud.dialogflow_v2beta1.types import ( + audio_config, + conversation_profile, + participant, +) from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import audio_config -from google.cloud.dialogflow_v2beta1.types import conversation_profile -from google.cloud.dialogflow_v2beta1.types import participant from .transports.base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport from .transports.grpc import ConversationProfilesGrpcTransport @@ -90,9 +92,7 @@ class ConversationProfilesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationProfilesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationProfilesTransport]] _transport_registry["grpc"] = ConversationProfilesGrpcTransport _transport_registry["grpc_asyncio"] = ConversationProfilesGrpcAsyncIOTransport _transport_registry["rest"] = ConversationProfilesRestTransport @@ -780,11 +780,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationProfilesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationProfilesClient._read_environment_variables() + ) self._client_cert_source = ConversationProfilesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -819,8 +817,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationProfilesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/pagers.py index f45ea906b6de..35f9863fdc48 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/__init__.py index cfed16be48c8..2005af811949 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ConversationProfilesRestInterceptor, ConversationProfilesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationProfilesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationProfilesTransport]] _transport_registry["grpc"] = ConversationProfilesGrpcTransport _transport_registry["grpc_asyncio"] = ConversationProfilesGrpcAsyncIOTransport _transport_registry["rest"] = ConversationProfilesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/base.py index 12aea28a2326..d38fcc1f3c92 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.cloud.dialogflow_v2beta1.types import conversation_profile from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import conversation_profile DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -320,7 +320,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc.py index cba67bdb58b9..40bc0f6d202d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import conversation_profile from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import conversation_profile from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport @@ -368,12 +368,12 @@ def list_conversation_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_profiles" not in self._stubs: - self._stubs[ - "list_conversation_profiles" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ListConversationProfiles", - request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, - response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + self._stubs["list_conversation_profiles"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ListConversationProfiles", + request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, + response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + ) ) return self._stubs["list_conversation_profiles"] @@ -434,12 +434,12 @@ def create_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_profile" not in self._stubs: - self._stubs[ - "create_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/CreateConversationProfile", - request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["create_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/CreateConversationProfile", + request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["create_conversation_profile"] @@ -471,12 +471,12 @@ def update_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_conversation_profile" not in self._stubs: - self._stubs[ - "update_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/UpdateConversationProfile", - request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["update_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/UpdateConversationProfile", + request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["update_conversation_profile"] @@ -501,12 +501,12 @@ def delete_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversation_profile" not in self._stubs: - self._stubs[ - "delete_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/DeleteConversationProfile", - request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/DeleteConversationProfile", + request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_conversation_profile"] @@ -551,12 +551,12 @@ def set_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_suggestion_feature_config" not in self._stubs: - self._stubs[ - "set_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/SetSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/SetSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_suggestion_feature_config"] @@ -594,12 +594,12 @@ def clear_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "clear_suggestion_feature_config" not in self._stubs: - self._stubs[ - "clear_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ClearSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["clear_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ClearSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["clear_suggestion_feature_config"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc_asyncio.py index 440e941466ad..d4a23fbc94da 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import conversation_profile from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import conversation_profile from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport from .grpc import ConversationProfilesGrpcTransport @@ -376,12 +376,12 @@ def list_conversation_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_profiles" not in self._stubs: - self._stubs[ - "list_conversation_profiles" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ListConversationProfiles", - request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, - response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + self._stubs["list_conversation_profiles"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ListConversationProfiles", + request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, + response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + ) ) return self._stubs["list_conversation_profiles"] @@ -442,12 +442,12 @@ def create_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_profile" not in self._stubs: - self._stubs[ - "create_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/CreateConversationProfile", - request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["create_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/CreateConversationProfile", + request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["create_conversation_profile"] @@ -479,12 +479,12 @@ def update_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_conversation_profile" not in self._stubs: - self._stubs[ - "update_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/UpdateConversationProfile", - request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["update_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/UpdateConversationProfile", + request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["update_conversation_profile"] @@ -510,12 +510,12 @@ def delete_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversation_profile" not in self._stubs: - self._stubs[ - "delete_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/DeleteConversationProfile", - request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/DeleteConversationProfile", + request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_conversation_profile"] @@ -560,12 +560,12 @@ def set_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_suggestion_feature_config" not in self._stubs: - self._stubs[ - "set_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/SetSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/SetSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_suggestion_feature_config"] @@ -603,12 +603,12 @@ def clear_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "clear_suggestion_feature_config" not in self._stubs: - self._stubs[ - "clear_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ClearSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["clear_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ClearSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["clear_suggestion_feature_config"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest.py index d0d63032bac3..c10a78be6025 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest.py @@ -16,25 +16,25 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.dialogflow_v2beta1.types import conversation_profile from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import conversation_profile from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationProfilesRestTransport @@ -791,9 +791,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseClearSuggestionFeatureConfig._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseClearSuggestionFeatureConfig._get_http_options() request, metadata = self._interceptor.pre_clear_suggestion_feature_config( request, metadata @@ -860,11 +858,10 @@ def __call__( resp = self._interceptor.post_clear_suggestion_feature_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_clear_suggestion_feature_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_clear_suggestion_feature_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -949,9 +946,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseCreateConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseCreateConversationProfile._get_http_options() request, metadata = self._interceptor.pre_create_conversation_profile( request, metadata @@ -1104,9 +1099,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseDeleteConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseDeleteConversationProfile._get_http_options() request, metadata = self._interceptor.pre_delete_conversation_profile( request, metadata @@ -1220,9 +1213,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseGetConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseGetConversationProfile._get_http_options() request, metadata = self._interceptor.pre_get_conversation_profile( request, metadata @@ -1375,9 +1366,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseListConversationProfiles._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseListConversationProfiles._get_http_options() request, metadata = self._interceptor.pre_list_conversation_profiles( request, metadata @@ -1532,9 +1521,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseSetSuggestionFeatureConfig._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseSetSuggestionFeatureConfig._get_http_options() request, metadata = self._interceptor.pre_set_suggestion_feature_config( request, metadata @@ -1601,11 +1588,10 @@ def __call__( resp = self._interceptor.post_set_suggestion_feature_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_suggestion_feature_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_suggestion_feature_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1690,9 +1676,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseUpdateConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseUpdateConversationProfile._get_http_options() request, metadata = self._interceptor.pre_update_conversation_profile( request, metadata @@ -1798,7 +1782,9 @@ def clear_suggestion_feature_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ClearSuggestionFeatureConfig(self._session, self._host, self._interceptor) # type: ignore + return self._ClearSuggestionFeatureConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_conversation_profile( @@ -1809,7 +1795,9 @@ def create_conversation_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._CreateConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_conversation_profile( @@ -1819,7 +1807,9 @@ def delete_conversation_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_conversation_profile( @@ -1830,7 +1820,9 @@ def get_conversation_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._GetConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_conversation_profiles( @@ -1841,7 +1833,9 @@ def list_conversation_profiles( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListConversationProfiles(self._session, self._host, self._interceptor) # type: ignore + return self._ListConversationProfiles( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_suggestion_feature_config( @@ -1852,7 +1846,9 @@ def set_suggestion_feature_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetSuggestionFeatureConfig(self._session, self._host, self._interceptor) # type: ignore + return self._SetSuggestionFeatureConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_conversation_profile( @@ -1863,7 +1859,9 @@ def update_conversation_profile( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1923,9 +1921,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseGetLocation._get_transcoded_request( @@ -2064,9 +2060,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseListLocations._get_transcoded_request( @@ -2202,9 +2196,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2320,9 +2312,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseGetOperation._get_transcoded_request( @@ -2461,9 +2451,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest_base.py index 2949d6da429b..7dbc37993b77 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.dialogflow_v2beta1.types import conversation_profile from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import conversation_profile from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/async_client.py index 30b58201c806..6a87068b4f89 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,14 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.conversations import pagers +from google.cloud.dialogflow_v2beta1.types import conversation, generator, participant from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation -from google.cloud.dialogflow_v2beta1.types import generator, participant from .client import ConversationsClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationsTransport @@ -159,7 +158,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationsAsyncClient: The constructed client. """ - return ConversationsClient.from_service_account_info.__func__(ConversationsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConversationsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ConversationsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -175,7 +177,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationsAsyncClient: The constructed client. """ - return ConversationsClient.from_service_account_file.__func__(ConversationsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConversationsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ConversationsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/client.py index be5d8881019d..58b7e8b5b410 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,14 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.conversations import pagers +from google.cloud.dialogflow_v2beta1.types import conversation, generator, participant from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation -from google.cloud.dialogflow_v2beta1.types import generator, participant from .transports.base import DEFAULT_CLIENT_INFO, ConversationsTransport from .transports.grpc import ConversationsGrpcTransport @@ -876,11 +875,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationsClient._read_environment_variables() + ) self._client_cert_source = ConversationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -915,8 +912,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/pagers.py index 2d86164738a8..d04ba3a4decb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/base.py index 6735921d6e5d..8113b9dd1eca 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.cloud.dialogflow_v2beta1.types import conversation, participant from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation -from google.cloud.dialogflow_v2beta1.types import participant DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -398,7 +397,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc.py index 55d8ee2eba1e..efc44cddf14b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import conversation, participant from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation -from google.cloud.dialogflow_v2beta1.types import participant from .base import DEFAULT_CLIENT_INFO, ConversationsTransport @@ -576,12 +575,12 @@ def suggest_conversation_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "suggest_conversation_summary" not in self._stubs: - self._stubs[ - "suggest_conversation_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.Conversations/SuggestConversationSummary", - request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, - response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + self._stubs["suggest_conversation_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.Conversations/SuggestConversationSummary", + request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, + response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + ) ) return self._stubs["suggest_conversation_summary"] @@ -608,12 +607,12 @@ def generate_stateless_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_summary" not in self._stubs: - self._stubs[ - "generate_stateless_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSummary", - request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, - response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + self._stubs["generate_stateless_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSummary", + request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, + response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + ) ) return self._stubs["generate_stateless_summary"] @@ -640,12 +639,12 @@ def generate_stateless_suggestion( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_suggestion" not in self._stubs: - self._stubs[ - "generate_stateless_suggestion" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSuggestion", - request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, - response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + self._stubs["generate_stateless_suggestion"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSuggestion", + request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, + response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + ) ) return self._stubs["generate_stateless_suggestion"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc_asyncio.py index cc13ad47da5d..d20bc8373567 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import conversation, participant from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation -from google.cloud.dialogflow_v2beta1.types import participant from .base import DEFAULT_CLIENT_INFO, ConversationsTransport from .grpc import ConversationsGrpcTransport @@ -588,12 +587,12 @@ def suggest_conversation_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "suggest_conversation_summary" not in self._stubs: - self._stubs[ - "suggest_conversation_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.Conversations/SuggestConversationSummary", - request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, - response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + self._stubs["suggest_conversation_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.Conversations/SuggestConversationSummary", + request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, + response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + ) ) return self._stubs["suggest_conversation_summary"] @@ -620,12 +619,12 @@ def generate_stateless_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_summary" not in self._stubs: - self._stubs[ - "generate_stateless_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSummary", - request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, - response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + self._stubs["generate_stateless_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSummary", + request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, + response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + ) ) return self._stubs["generate_stateless_summary"] @@ -652,12 +651,12 @@ def generate_stateless_suggestion( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_suggestion" not in self._stubs: - self._stubs[ - "generate_stateless_suggestion" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSuggestion", - request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, - response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + self._stubs["generate_stateless_suggestion"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSuggestion", + request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, + response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + ) ) return self._stubs["generate_stateless_suggestion"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest.py index 1b7dfb5561d3..6938edaadfaf 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,13 +27,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflow_v2beta1.types import conversation, participant from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation -from google.cloud.dialogflow_v2beta1.types import participant from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationsRestTransport @@ -1054,9 +1053,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseBatchCreateMessages._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseBatchCreateMessages._get_http_options() request, metadata = self._interceptor.pre_batch_create_messages( request, metadata @@ -1216,9 +1213,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseCompleteConversation._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseCompleteConversation._get_http_options() request, metadata = self._interceptor.pre_complete_conversation( request, metadata @@ -1376,9 +1371,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1533,9 +1526,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseGenerateStatelessSuggestion._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseGenerateStatelessSuggestion._get_http_options() request, metadata = self._interceptor.pre_generate_stateless_suggestion( request, metadata @@ -1606,11 +1597,10 @@ def __call__( resp = self._interceptor.post_generate_stateless_suggestion(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_stateless_suggestion_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_stateless_suggestion_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1699,9 +1689,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseGenerateStatelessSummary._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseGenerateStatelessSummary._get_http_options() request, metadata = self._interceptor.pre_generate_stateless_summary( request, metadata @@ -1858,9 +1846,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseGenerateSuggestions._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseGenerateSuggestions._get_http_options() request, metadata = self._interceptor.pre_generate_suggestions( request, metadata @@ -2170,9 +2156,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseIngestContextReferences._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseIngestContextReferences._get_http_options() request, metadata = self._interceptor.pre_ingest_context_references( request, metadata @@ -2330,9 +2314,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2790,9 +2772,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseSuggestConversationSummary._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseSuggestConversationSummary._get_http_options() request, metadata = self._interceptor.pre_suggest_conversation_summary( request, metadata @@ -2933,7 +2913,9 @@ def generate_stateless_suggestion( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateStatelessSuggestion(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateStatelessSuggestion( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_stateless_summary( @@ -2944,7 +2926,9 @@ def generate_stateless_summary( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateStatelessSummary(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateStatelessSummary( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_suggestions( @@ -2974,7 +2958,9 @@ def ingest_context_references( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._IngestContextReferences(self._session, self._host, self._interceptor) # type: ignore + return self._IngestContextReferences( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_conversations( @@ -3015,7 +3001,9 @@ def suggest_conversation_summary( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SuggestConversationSummary(self._session, self._host, self._interceptor) # type: ignore + return self._SuggestConversationSummary( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest_base.py index 3e2e4cadc349..5f6002e25290 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflow_v2beta1.types import conversation, participant from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation -from google.cloud.dialogflow_v2beta1.types import participant from .base import DEFAULT_CLIENT_INFO, ConversationsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/async_client.py index 2273fc4e43d5..74a631c32b64 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -46,15 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.documents import pagers -from google.cloud.dialogflow_v2beta1.types import document +from google.cloud.dialogflow_v2beta1.types import document, gcs from google.cloud.dialogflow_v2beta1.types import document as gcd_document -from google.cloud.dialogflow_v2beta1.types import gcs from .client import DocumentsClient from .transports.base import DEFAULT_CLIENT_INFO, DocumentsTransport @@ -118,7 +117,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentsAsyncClient: The constructed client. """ - return DocumentsClient.from_service_account_info.__func__(DocumentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DocumentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DocumentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +136,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentsAsyncClient: The constructed client. """ - return DocumentsClient.from_service_account_file.__func__(DocumentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DocumentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DocumentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/client.py index 60a577828d54..8c96e3ac162d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -63,15 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.documents import pagers -from google.cloud.dialogflow_v2beta1.types import document +from google.cloud.dialogflow_v2beta1.types import document, gcs from google.cloud.dialogflow_v2beta1.types import document as gcd_document -from google.cloud.dialogflow_v2beta1.types import gcs from .transports.base import DEFAULT_CLIENT_INFO, DocumentsTransport from .transports.grpc import DocumentsGrpcTransport @@ -629,11 +628,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentsClient._read_environment_variables() + ) self._client_cert_source = DocumentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -668,8 +665,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/pagers.py index 62e0c7ab1056..101d1bcfac58 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/base.py index e2331f16c5ed..ea2978b82cd8 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import document @@ -307,7 +307,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc.py index 4063e66a4494..73b12c48e2d5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import document from google.cloud.dialogflow_v2beta1.types import document as gcd_document diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc_asyncio.py index 42a5e4c2b551..b5cbcd7deb4e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import document from google.cloud.dialogflow_v2beta1.types import document as gcd_document diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest.py index 63fc13a3f94c..1ab9882cbd12 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/async_client.py index 57a646c40dca..ab21fc9ba03a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -49,8 +49,8 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from .client import EncryptionSpecServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport @@ -126,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EncryptionSpecServiceAsyncClient: The constructed client. """ - return EncryptionSpecServiceClient.from_service_account_info.__func__(EncryptionSpecServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EncryptionSpecServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EncryptionSpecServiceAsyncClient, 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: EncryptionSpecServiceAsyncClient: The constructed client. """ - return EncryptionSpecServiceClient.from_service_account_file.__func__(EncryptionSpecServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EncryptionSpecServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EncryptionSpecServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -180,7 +186,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return EncryptionSpecServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return EncryptionSpecServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> EncryptionSpecServiceTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/client.py index 4611065436d4..8ea53be64333 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -66,8 +66,8 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from .transports.base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport from .transports.grpc import EncryptionSpecServiceGrpcTransport @@ -83,9 +83,7 @@ class EncryptionSpecServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EncryptionSpecServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EncryptionSpecServiceTransport]] _transport_registry["grpc"] = EncryptionSpecServiceGrpcTransport _transport_registry["grpc_asyncio"] = EncryptionSpecServiceGrpcAsyncIOTransport _transport_registry["rest"] = EncryptionSpecServiceRestTransport @@ -631,11 +629,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EncryptionSpecServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EncryptionSpecServiceClient._read_environment_variables() + ) self._client_cert_source = EncryptionSpecServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -670,8 +666,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EncryptionSpecServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/__init__.py index e85e850f9086..e2f6ba4fbf6f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[EncryptionSpecServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[EncryptionSpecServiceTransport]] _transport_registry["grpc"] = EncryptionSpecServiceGrpcTransport _transport_registry["grpc_asyncio"] = EncryptionSpecServiceGrpcAsyncIOTransport _transport_registry["rest"] = EncryptionSpecServiceRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/base.py index f4145de3448a..8f82f6734e84 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/base.py @@ -17,19 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -237,7 +237,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc.py index 3f1d2096379a..ad2b035c8485 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc.py @@ -16,22 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport @@ -397,12 +397,12 @@ def initialize_encryption_spec( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "initialize_encryption_spec" not in self._stubs: - self._stubs[ - "initialize_encryption_spec" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.EncryptionSpecService/InitializeEncryptionSpec", - request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["initialize_encryption_spec"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.EncryptionSpecService/InitializeEncryptionSpec", + request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["initialize_encryption_spec"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc_asyncio.py index ae4310ca80ec..3b096f55a2ce 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,13 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport from .grpc import EncryptionSpecServiceGrpcTransport @@ -407,12 +407,12 @@ def initialize_encryption_spec( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "initialize_encryption_spec" not in self._stubs: - self._stubs[ - "initialize_encryption_spec" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.EncryptionSpecService/InitializeEncryptionSpec", - request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["initialize_encryption_spec"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.EncryptionSpecService/InitializeEncryptionSpec", + request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["initialize_encryption_spec"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest.py index 38498d4c0fd9..4a09112125fc 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest.py @@ -16,22 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEncryptionSpecServiceRestTransport @@ -525,9 +525,7 @@ def __call__( """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseGetEncryptionSpec._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseGetEncryptionSpec._get_http_options() request, metadata = self._interceptor.pre_get_encryption_spec( request, metadata @@ -680,9 +678,7 @@ def __call__( """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseInitializeEncryptionSpec._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseInitializeEncryptionSpec._get_http_options() request, metadata = self._interceptor.pre_initialize_encryption_spec( request, metadata @@ -793,7 +789,9 @@ def initialize_encryption_spec( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._InitializeEncryptionSpec(self._session, self._host, self._interceptor) # type: ignore + return self._InitializeEncryptionSpec( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -853,9 +851,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -994,9 +990,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1132,9 +1126,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1252,9 +1244,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1393,9 +1383,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest_base.py index 950e9350387e..b262e1f2eca0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest_base.py @@ -22,8 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/async_client.py index 042d5032abc6..58424a545943 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -46,15 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.entity_types import pagers -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from .client import EntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, EntityTypesTransport @@ -120,7 +120,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_info.__func__(EntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EntityTypesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +139,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_file.__func__(EntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EntityTypesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/client.py index b31f650392ae..405fe3641938 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -63,15 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.entity_types import pagers -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from .transports.base import DEFAULT_CLIENT_INFO, EntityTypesTransport from .transports.grpc import EntityTypesGrpcTransport @@ -626,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EntityTypesClient._read_environment_variables() + ) self._client_cert_source = EntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/pagers.py index a1b248d0d680..837ff61040dc 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/base.py index cc6880cb5a03..0b9d8e274fae 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -351,7 +351,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc.py index 10fb34ff3fbe..8fd80c17fb51 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc_asyncio.py index 14a178278c78..c390c991be36 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,15 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport from .grpc import EntityTypesGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest.py index 66bfc0f3f6b6..e697b92d964f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest.py @@ -16,23 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEntityTypesRestTransport @@ -938,9 +938,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchCreateEntities._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchCreateEntities._get_http_options() request, metadata = self._interceptor.pre_batch_create_entities( request, metadata @@ -1092,9 +1090,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchDeleteEntities._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchDeleteEntities._get_http_options() request, metadata = self._interceptor.pre_batch_delete_entities( request, metadata @@ -1246,9 +1242,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchDeleteEntityTypes._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchDeleteEntityTypes._get_http_options() request, metadata = self._interceptor.pre_batch_delete_entity_types( request, metadata @@ -1400,9 +1394,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchUpdateEntities._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchUpdateEntities._get_http_options() request, metadata = self._interceptor.pre_batch_update_entities( request, metadata @@ -1554,9 +1546,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchUpdateEntityTypes._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchUpdateEntityTypes._get_http_options() request, metadata = self._interceptor.pre_batch_update_entity_types( request, metadata @@ -2431,7 +2421,9 @@ def batch_delete_entity_types( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchDeleteEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._BatchDeleteEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_entities( @@ -2449,7 +2441,9 @@ def batch_update_entity_types( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchUpdateEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_entity_type( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest_base.py index a1689611af7f..907a92e936e7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/async_client.py index f02d1e8dd1cf..1958c4907e56 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.environments import pagers from google.cloud.dialogflow_v2beta1.types import environment, fulfillment @@ -119,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_info.__func__(EnvironmentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EnvironmentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EnvironmentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_file.__func__(EnvironmentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EnvironmentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EnvironmentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/client.py index 8f73933bec63..2caca4ab9e75 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.environments import pagers from google.cloud.dialogflow_v2beta1.types import environment, fulfillment @@ -655,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EnvironmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EnvironmentsClient._read_environment_variables() + ) self._client_cert_source = EnvironmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +692,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EnvironmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/pagers.py index 34fdcf52cd8e..ee2fa1e3f805 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/base.py index 210f748dcfcf..5320f012343b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import environment @@ -291,7 +291,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc.py index f36e3290e85c..837bdecf1d90 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import environment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc_asyncio.py index d029c09c1d11..836dc3be030c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import environment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest.py index 3d79bf0e7b77..e74c1a462754 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflow_v2beta1.types import environment @@ -669,9 +669,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() request, metadata = self._interceptor.pre_create_environment( request, metadata @@ -817,9 +815,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() request, metadata = self._interceptor.pre_delete_environment( request, metadata @@ -1096,9 +1092,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseGetEnvironmentHistory._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseGetEnvironmentHistory._get_http_options() request, metadata = self._interceptor.pre_get_environment_history( request, metadata @@ -1414,9 +1408,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() request, metadata = self._interceptor.pre_update_environment( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest_base.py index 6bffbb71a77f..5405fc70830c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.types import environment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/async_client.py index a43cb97cb328..7ceea0348433 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from .client import FulfillmentsClient from .transports.base import DEFAULT_CLIENT_INFO, FulfillmentsTransport @@ -115,7 +115,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FulfillmentsAsyncClient: The constructed client. """ - return FulfillmentsClient.from_service_account_info.__func__(FulfillmentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + FulfillmentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(FulfillmentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +134,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FulfillmentsAsyncClient: The constructed client. """ - return FulfillmentsClient.from_service_account_file.__func__(FulfillmentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + FulfillmentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(FulfillmentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/client.py index 9aedb822bb6a..49bc8b2526d9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from .transports.base import DEFAULT_CLIENT_INFO, FulfillmentsTransport from .transports.grpc import FulfillmentsGrpcTransport @@ -617,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FulfillmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FulfillmentsClient._read_environment_variables() + ) self._client_cert_source = FulfillmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -656,8 +654,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FulfillmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/base.py index ca0fbe8fdcd2..18658cca1f76 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/base.py @@ -17,19 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -230,7 +230,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc.py index d4e1e67d22ad..80d6ff899b00 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc.py @@ -16,22 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from .base import DEFAULT_CLIENT_INFO, FulfillmentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc_asyncio.py index 1300fea344b3..e05cb06c4c50 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,13 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from .base import DEFAULT_CLIENT_INFO, FulfillmentsTransport from .grpc import FulfillmentsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest.py index 318caae7be9f..25066baf5d40 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,12 +27,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseFulfillmentsRestTransport @@ -631,9 +631,7 @@ def __call__( """ - http_options = ( - _BaseFulfillmentsRestTransport._BaseUpdateFulfillment._get_http_options() - ) + http_options = _BaseFulfillmentsRestTransport._BaseUpdateFulfillment._get_http_options() request, metadata = self._interceptor.pre_update_fulfillment( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest_base.py index 8fafa838ca99..332afa99da6c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest_base.py @@ -22,8 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from .base import DEFAULT_CLIENT_INFO, FulfillmentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/async_client.py index 80c5fe5a017f..5f7211f98b6d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -46,17 +46,19 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.generator_evaluations import pagers +from google.cloud.dialogflow_v2beta1.types import ( + generator, + generator_evaluation, + operations, +) from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator -from google.cloud.dialogflow_v2beta1.types import generator_evaluation -from google.cloud.dialogflow_v2beta1.types import operations from .client import GeneratorEvaluationsClient from .transports.base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport @@ -132,7 +134,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GeneratorEvaluationsAsyncClient: The constructed client. """ - return GeneratorEvaluationsClient.from_service_account_info.__func__(GeneratorEvaluationsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GeneratorEvaluationsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GeneratorEvaluationsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +153,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GeneratorEvaluationsAsyncClient: The constructed client. """ - return GeneratorEvaluationsClient.from_service_account_file.__func__(GeneratorEvaluationsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GeneratorEvaluationsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(GeneratorEvaluationsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -186,7 +194,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GeneratorEvaluationsClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GeneratorEvaluationsClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GeneratorEvaluationsTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/client.py index 6e3392b7a043..4765c7891be0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -63,17 +63,19 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.generator_evaluations import pagers +from google.cloud.dialogflow_v2beta1.types import ( + generator, + generator_evaluation, + operations, +) from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator -from google.cloud.dialogflow_v2beta1.types import generator_evaluation -from google.cloud.dialogflow_v2beta1.types import operations from .transports.base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport from .transports.grpc import GeneratorEvaluationsGrpcTransport @@ -89,9 +91,7 @@ class GeneratorEvaluationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GeneratorEvaluationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GeneratorEvaluationsTransport]] _transport_registry["grpc"] = GeneratorEvaluationsGrpcTransport _transport_registry["grpc_asyncio"] = GeneratorEvaluationsGrpcAsyncIOTransport _transport_registry["rest"] = GeneratorEvaluationsRestTransport @@ -681,11 +681,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GeneratorEvaluationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GeneratorEvaluationsClient._read_environment_variables() + ) self._client_cert_source = GeneratorEvaluationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -720,8 +718,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GeneratorEvaluationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/pagers.py index 2ef1927ec914..50826eb559cf 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/__init__.py index d8fcc5682d44..9d3ec4732b37 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import GeneratorEvaluationsRestInterceptor, GeneratorEvaluationsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GeneratorEvaluationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GeneratorEvaluationsTransport]] _transport_registry["grpc"] = GeneratorEvaluationsGrpcTransport _transport_registry["grpc_asyncio"] = GeneratorEvaluationsGrpcAsyncIOTransport _transport_registry["rest"] = GeneratorEvaluationsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/base.py index bfac7cfd962d..4a5093c7abc5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.cloud.dialogflow_v2beta1.types import generator_evaluation from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator_evaluation DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc.py index 574675c643f4..6500c77e9762 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import generator_evaluation from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport @@ -366,12 +366,12 @@ def create_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_generator_evaluation" not in self._stubs: - self._stubs[ - "create_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/CreateGeneratorEvaluation", - request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/CreateGeneratorEvaluation", + request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_generator_evaluation"] @@ -426,12 +426,12 @@ def list_generator_evaluations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_generator_evaluations" not in self._stubs: - self._stubs[ - "list_generator_evaluations" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/ListGeneratorEvaluations", - request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, - response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + self._stubs["list_generator_evaluations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/ListGeneratorEvaluations", + request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, + response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + ) ) return self._stubs["list_generator_evaluations"] @@ -456,12 +456,12 @@ def delete_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_generator_evaluation" not in self._stubs: - self._stubs[ - "delete_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/DeleteGeneratorEvaluation", - request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/DeleteGeneratorEvaluation", + request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_generator_evaluation"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc_asyncio.py index c2cae63b6b49..9903bfe41f51 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import generator_evaluation from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport from .grpc import GeneratorEvaluationsGrpcTransport @@ -374,12 +374,12 @@ def create_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_generator_evaluation" not in self._stubs: - self._stubs[ - "create_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/CreateGeneratorEvaluation", - request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/CreateGeneratorEvaluation", + request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_generator_evaluation"] @@ -434,12 +434,12 @@ def list_generator_evaluations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_generator_evaluations" not in self._stubs: - self._stubs[ - "list_generator_evaluations" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/ListGeneratorEvaluations", - request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, - response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + self._stubs["list_generator_evaluations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/ListGeneratorEvaluations", + request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, + response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + ) ) return self._stubs["list_generator_evaluations"] @@ -465,12 +465,12 @@ def delete_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_generator_evaluation" not in self._stubs: - self._stubs[ - "delete_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/DeleteGeneratorEvaluation", - request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/DeleteGeneratorEvaluation", + request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_generator_evaluation"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest.py index aac57c849eca..770ce503b11a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest.py @@ -16,25 +16,25 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.dialogflow_v2beta1.types import generator_evaluation from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseGeneratorEvaluationsRestTransport @@ -610,9 +610,7 @@ def __call__( """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseCreateGeneratorEvaluation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseCreateGeneratorEvaluation._get_http_options() request, metadata = self._interceptor.pre_create_generator_evaluation( request, metadata @@ -757,9 +755,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseDeleteGeneratorEvaluation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseDeleteGeneratorEvaluation._get_http_options() request, metadata = self._interceptor.pre_delete_generator_evaluation( request, metadata @@ -872,9 +868,7 @@ def __call__( """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseGetGeneratorEvaluation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseGetGeneratorEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_generator_evaluation( request, metadata @@ -1024,9 +1018,7 @@ def __call__( Response of ListGeneratorEvaluations. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseListGeneratorEvaluations._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseListGeneratorEvaluations._get_http_options() request, metadata = self._interceptor.pre_list_generator_evaluations( request, metadata @@ -1129,7 +1121,9 @@ def create_generator_evaluation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateGeneratorEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateGeneratorEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_generator_evaluation( @@ -1139,7 +1133,9 @@ def delete_generator_evaluation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteGeneratorEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteGeneratorEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_generator_evaluation( @@ -1150,7 +1146,9 @@ def get_generator_evaluation( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetGeneratorEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._GetGeneratorEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_generator_evaluations( @@ -1161,7 +1159,9 @@ def list_generator_evaluations( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListGeneratorEvaluations(self._session, self._host, self._interceptor) # type: ignore + return self._ListGeneratorEvaluations( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1221,9 +1221,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseGetLocation._get_transcoded_request( @@ -1362,9 +1360,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseListLocations._get_transcoded_request( @@ -1500,9 +1496,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1618,9 +1612,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseGetOperation._get_transcoded_request( @@ -1759,9 +1751,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest_base.py index 042fe40ec78d..136c27d7d88d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.dialogflow_v2beta1.types import generator_evaluation from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/async_client.py index d42f5a8741d9..4400c345e837 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.generators import pagers from google.cloud.dialogflow_v2beta1.types import generator @@ -120,7 +120,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_info.__func__(GeneratorsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GeneratorsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GeneratorsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +139,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_file.__func__(GeneratorsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GeneratorsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(GeneratorsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/client.py index bfaa8d806c9f..4e6d6f47d999 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.generators import pagers from google.cloud.dialogflow_v2beta1.types import generator @@ -651,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GeneratorsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GeneratorsClient._read_environment_variables() + ) self._client_cert_source = GeneratorsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -690,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GeneratorsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/pagers.py index c607f0a4e4d1..c19b6b51bdbd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/base.py index 5ad7edf06cc5..d0ec23924a15 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import generator @@ -276,7 +276,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc.py index d99335b3375e..8c410dc94b14 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import generator from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc_asyncio.py index 36512656eb50..3cb6461ee90f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import generator from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest.py index 6959abd1c749..5a2d91e59162 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflow_v2beta1.types import generator diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest_base.py index 52c831d214f8..dcc7fefbf66c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.types import generator from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/async_client.py index 72ffba243074..3954ca8e0519 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -46,15 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.intents import pagers -from google.cloud.dialogflow_v2beta1.types import context -from google.cloud.dialogflow_v2beta1.types import intent +from google.cloud.dialogflow_v2beta1.types import context, intent from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent from .client import IntentsClient @@ -119,7 +118,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_info.__func__(IntentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + IntentsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(IntentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +137,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_file.__func__(IntentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + IntentsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(IntentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/client.py index 1d8ebb211e9b..fbdbda682bd7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -63,15 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.intents import pagers -from google.cloud.dialogflow_v2beta1.types import context -from google.cloud.dialogflow_v2beta1.types import intent +from google.cloud.dialogflow_v2beta1.types import context, intent from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent from .transports.base import DEFAULT_CLIENT_INFO, IntentsTransport @@ -647,11 +646,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IntentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IntentsClient._read_environment_variables() + ) self._client_cert_source = IntentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -686,8 +683,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IntentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/pagers.py index a71fe95a23f9..9d018a5b93eb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/base.py index 1321ae590274..05a31320d74b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import intent @@ -304,7 +304,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc.py index 992900676bf3..b896a1544410 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import intent from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc_asyncio.py index 177d601b00a7..8c8189e90828 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import intent from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest.py index 7aa000210e2c..faa174edc68b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflow_v2beta1.types import intent diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest_base.py index cb24cd0ab336..9fc45e9205ae 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.types import intent from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/async_client.py index 015039fb8bba..28c3d702b3de 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.knowledge_bases import pagers -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from .client import KnowledgeBasesClient from .transports.base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport @@ -122,7 +122,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: KnowledgeBasesAsyncClient: The constructed client. """ - return KnowledgeBasesClient.from_service_account_info.__func__(KnowledgeBasesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + KnowledgeBasesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(KnowledgeBasesAsyncClient, 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: KnowledgeBasesAsyncClient: The constructed client. """ - return KnowledgeBasesClient.from_service_account_file.__func__(KnowledgeBasesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + KnowledgeBasesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(KnowledgeBasesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/client.py index ccb350e3d9b2..1742a07f1344 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.knowledge_bases import pagers -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from .transports.base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport from .transports.grpc import KnowledgeBasesGrpcTransport @@ -83,9 +83,7 @@ class KnowledgeBasesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[KnowledgeBasesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[KnowledgeBasesTransport]] _transport_registry["grpc"] = KnowledgeBasesGrpcTransport _transport_registry["grpc_asyncio"] = KnowledgeBasesGrpcAsyncIOTransport _transport_registry["rest"] = KnowledgeBasesRestTransport @@ -624,11 +622,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = KnowledgeBasesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + KnowledgeBasesClient._read_environment_variables() + ) self._client_cert_source = KnowledgeBasesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -663,8 +659,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(KnowledgeBasesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/pagers.py index 024c0f00e16a..66657dcea287 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/base.py index 05a5c7148527..6308633fa006 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -282,7 +282,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc.py index f6de4e0ed082..b70302b48e88 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc_asyncio.py index 1e48d1808373..a4a20044d500 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,15 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport from .grpc import KnowledgeBasesGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest.py index 8414a2ed23ad..c8c94036ab3f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,13 +28,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseKnowledgeBasesRestTransport @@ -616,9 +616,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseCreateKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseCreateKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_create_knowledge_base( request, metadata @@ -767,9 +765,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseDeleteKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseDeleteKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_delete_knowledge_base( request, metadata @@ -892,9 +888,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseGetKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseGetKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_get_knowledge_base( request, metadata @@ -1041,9 +1035,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseListKnowledgeBases._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseListKnowledgeBases._get_http_options() request, metadata = self._interceptor.pre_list_knowledge_bases( request, metadata @@ -1204,9 +1196,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseUpdateKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseUpdateKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_update_knowledge_base( request, metadata @@ -1688,9 +1678,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest_base.py index 46efd6340302..09ef3b31bc17 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/async_client.py index 9588a87f2c39..68e0a381f1b2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -31,15 +32,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -48,14 +48,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.participants import pagers +from google.cloud.dialogflow_v2beta1.types import participant, session from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant -from google.cloud.dialogflow_v2beta1.types import participant -from google.cloud.dialogflow_v2beta1.types import session from .client import ParticipantsClient from .transports.base import DEFAULT_CLIENT_INFO, ParticipantsTransport @@ -139,7 +138,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ParticipantsAsyncClient: The constructed client. """ - return ParticipantsClient.from_service_account_info.__func__(ParticipantsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ParticipantsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ParticipantsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +157,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ParticipantsAsyncClient: The constructed client. """ - return ParticipantsClient.from_service_account_file.__func__(ParticipantsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ParticipantsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ParticipantsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/client.py index 7d85092dc311..c3d54ead4803 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -63,14 +63,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.participants import pagers +from google.cloud.dialogflow_v2beta1.types import participant, session from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant -from google.cloud.dialogflow_v2beta1.types import participant -from google.cloud.dialogflow_v2beta1.types import session from .transports.base import DEFAULT_CLIENT_INFO, ParticipantsTransport from .transports.grpc import ParticipantsGrpcTransport @@ -798,11 +797,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ParticipantsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ParticipantsClient._read_environment_variables() + ) self._client_cert_source = ParticipantsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -837,8 +834,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ParticipantsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/pagers.py index cea718889f5b..1c02f2030464 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/base.py index 530755351a5b..133e5770f167 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/base.py @@ -17,19 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from google.cloud.dialogflow_v2beta1.types import participant +from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -430,7 +430,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc.py index e33baa63c4ba..9d61cd261c26 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc.py @@ -16,22 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from google.cloud.dialogflow_v2beta1.types import participant +from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from .base import DEFAULT_CLIENT_INFO, ParticipantsTransport @@ -505,12 +505,12 @@ def streaming_analyze_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "streaming_analyze_content" not in self._stubs: - self._stubs[ - "streaming_analyze_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.dialogflow.v2beta1.Participants/StreamingAnalyzeContent", - request_serializer=participant.StreamingAnalyzeContentRequest.serialize, - response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + self._stubs["streaming_analyze_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.dialogflow.v2beta1.Participants/StreamingAnalyzeContent", + request_serializer=participant.StreamingAnalyzeContentRequest.serialize, + response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + ) ) return self._stubs["streaming_analyze_content"] @@ -537,12 +537,12 @@ def bidi_streaming_analyze_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bidi_streaming_analyze_content" not in self._stubs: - self._stubs[ - "bidi_streaming_analyze_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.dialogflow.v2beta1.Participants/BidiStreamingAnalyzeContent", - request_serializer=participant.BidiStreamingAnalyzeContentRequest.serialize, - response_deserializer=participant.BidiStreamingAnalyzeContentResponse.deserialize, + self._stubs["bidi_streaming_analyze_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.dialogflow.v2beta1.Participants/BidiStreamingAnalyzeContent", + request_serializer=participant.BidiStreamingAnalyzeContentRequest.serialize, + response_deserializer=participant.BidiStreamingAnalyzeContentResponse.deserialize, + ) ) return self._stubs["bidi_streaming_analyze_content"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc_asyncio.py index 1a1cf549ae4e..5d730ecd0bd9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,13 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from google.cloud.dialogflow_v2beta1.types import participant +from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from .base import DEFAULT_CLIENT_INFO, ParticipantsTransport from .grpc import ParticipantsGrpcTransport @@ -519,12 +519,12 @@ def streaming_analyze_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "streaming_analyze_content" not in self._stubs: - self._stubs[ - "streaming_analyze_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.dialogflow.v2beta1.Participants/StreamingAnalyzeContent", - request_serializer=participant.StreamingAnalyzeContentRequest.serialize, - response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + self._stubs["streaming_analyze_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.dialogflow.v2beta1.Participants/StreamingAnalyzeContent", + request_serializer=participant.StreamingAnalyzeContentRequest.serialize, + response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + ) ) return self._stubs["streaming_analyze_content"] @@ -551,12 +551,12 @@ def bidi_streaming_analyze_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bidi_streaming_analyze_content" not in self._stubs: - self._stubs[ - "bidi_streaming_analyze_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.dialogflow.v2beta1.Participants/BidiStreamingAnalyzeContent", - request_serializer=participant.BidiStreamingAnalyzeContentRequest.serialize, - response_deserializer=participant.BidiStreamingAnalyzeContentResponse.deserialize, + self._stubs["bidi_streaming_analyze_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.dialogflow.v2beta1.Participants/BidiStreamingAnalyzeContent", + request_serializer=participant.BidiStreamingAnalyzeContentRequest.serialize, + response_deserializer=participant.BidiStreamingAnalyzeContentResponse.deserialize, + ) ) return self._stubs["bidi_streaming_analyze_content"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest.py index a3471662568a..91e6485bb5fc 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,12 +27,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from google.cloud.dialogflow_v2beta1.types import participant +from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseParticipantsRestTransport @@ -1161,9 +1161,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseCompileSuggestion._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseCompileSuggestion._get_http_options() request, metadata = self._interceptor.pre_compile_suggestion( request, metadata @@ -1318,9 +1316,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseCreateParticipant._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseCreateParticipant._get_http_options() request, metadata = self._interceptor.pre_create_participant( request, metadata @@ -2098,9 +2094,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseSuggestFaqAnswers._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseSuggestFaqAnswers._get_http_options() request, metadata = self._interceptor.pre_suggest_faq_answers( request, metadata @@ -2255,9 +2249,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseSuggestKnowledgeAssist._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseSuggestKnowledgeAssist._get_http_options() request, metadata = self._interceptor.pre_suggest_knowledge_assist( request, metadata @@ -2412,9 +2404,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseSuggestSmartReplies._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseSuggestSmartReplies._get_http_options() request, metadata = self._interceptor.pre_suggest_smart_replies( request, metadata @@ -2569,9 +2559,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseUpdateParticipant._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseUpdateParticipant._get_http_options() request, metadata = self._interceptor.pre_update_participant( request, metadata @@ -2685,7 +2673,9 @@ def bidi_streaming_analyze_content( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BidiStreamingAnalyzeContent(self._session, self._host, self._interceptor) # type: ignore + return self._BidiStreamingAnalyzeContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def compile_suggestion( @@ -2744,7 +2734,9 @@ def streaming_analyze_content( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._StreamingAnalyzeContent(self._session, self._host, self._interceptor) # type: ignore + return self._StreamingAnalyzeContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def suggest_articles( @@ -2775,7 +2767,9 @@ def suggest_knowledge_assist( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SuggestKnowledgeAssist(self._session, self._host, self._interceptor) # type: ignore + return self._SuggestKnowledgeAssist( + self._session, self._host, self._interceptor + ) # type: ignore @property def suggest_smart_replies( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest_base.py index 99a23252d8ae..90e203b8845d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest_base.py @@ -22,8 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from google.cloud.dialogflow_v2beta1.types import participant +from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from .base import DEFAULT_CLIENT_INFO, ParticipantsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/async_client.py index 60437b96cfb0..eb895a0444f0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.phone_numbers import pagers -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from .client import PhoneNumbersClient from .transports.base import DEFAULT_CLIENT_INFO, PhoneNumbersTransport @@ -116,7 +116,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PhoneNumbersAsyncClient: The constructed client. """ - return PhoneNumbersClient.from_service_account_info.__func__(PhoneNumbersAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PhoneNumbersClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PhoneNumbersAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +135,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PhoneNumbersAsyncClient: The constructed client. """ - return PhoneNumbersClient.from_service_account_file.__func__(PhoneNumbersAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PhoneNumbersClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PhoneNumbersAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/client.py index 425610937f7e..4f3b25cc49c0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.phone_numbers import pagers -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from .transports.base import DEFAULT_CLIENT_INFO, PhoneNumbersTransport from .transports.grpc import PhoneNumbersGrpcTransport @@ -622,11 +622,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PhoneNumbersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PhoneNumbersClient._read_environment_variables() + ) self._client_cert_source = PhoneNumbersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -661,8 +659,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PhoneNumbersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/pagers.py index 27b6eec5c951..cf7a604e560f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/base.py index c7aec0f4c19f..4ba3e6038045 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/base.py @@ -17,19 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -261,7 +261,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc.py index a332ad838b0b..9016bfe3cd16 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc.py @@ -16,22 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from .base import DEFAULT_CLIENT_INFO, PhoneNumbersTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc_asyncio.py index 8032ac8a7452..ab92c6835756 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,13 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from .base import DEFAULT_CLIENT_INFO, PhoneNumbersTransport from .grpc import PhoneNumbersGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest.py index 9d7b05cb288b..104b7d953592 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,12 +27,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BasePhoneNumbersRestTransport @@ -579,9 +579,7 @@ def __call__( """ - http_options = ( - _BasePhoneNumbersRestTransport._BaseDeletePhoneNumber._get_http_options() - ) + http_options = _BasePhoneNumbersRestTransport._BaseDeletePhoneNumber._get_http_options() request, metadata = self._interceptor.pre_delete_phone_number( request, metadata @@ -882,9 +880,7 @@ def __call__( """ - http_options = ( - _BasePhoneNumbersRestTransport._BaseUndeletePhoneNumber._get_http_options() - ) + http_options = _BasePhoneNumbersRestTransport._BaseUndeletePhoneNumber._get_http_options() request, metadata = self._interceptor.pre_undelete_phone_number( request, metadata @@ -1039,9 +1035,7 @@ def __call__( """ - http_options = ( - _BasePhoneNumbersRestTransport._BaseUpdatePhoneNumber._get_http_options() - ) + http_options = _BasePhoneNumbersRestTransport._BaseUpdatePhoneNumber._get_http_options() request, metadata = self._interceptor.pre_update_phone_number( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest_base.py index 50c3b1ed47f8..bcc4330901d9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest_base.py @@ -22,8 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from .base import DEFAULT_CLIENT_INFO, PhoneNumbersTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/async_client.py index f18c55be3dfe..4c60d247eac9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.session_entity_types import pagers +from google.cloud.dialogflow_v2beta1.types import entity_type, session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import entity_type -from google.cloud.dialogflow_v2beta1.types import session_entity_type from .client import SessionEntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -127,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_info.__func__(SessionEntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SessionEntityTypesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SessionEntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +145,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_file.__func__(SessionEntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SessionEntityTypesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SessionEntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +186,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SessionEntityTypesTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/client.py index de82ec25152f..22e0ff7895c6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.session_entity_types import pagers +from google.cloud.dialogflow_v2beta1.types import entity_type, session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import entity_type -from google.cloud.dialogflow_v2beta1.types import session_entity_type from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .transports.grpc import SessionEntityTypesGrpcTransport @@ -86,9 +85,7 @@ class SessionEntityTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionEntityTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport @@ -634,11 +631,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionEntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionEntityTypesClient._read_environment_variables() + ) self._client_cert_source = SessionEntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -673,8 +668,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionEntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/pagers.py index 8396ff2364c7..9bb427eea3b1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/__init__.py index f94244b2aec5..4e711301d110 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SessionEntityTypesRestInterceptor, SessionEntityTypesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SessionEntityTypesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/base.py index e7effc2e813e..75a0fd748891 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.cloud.dialogflow_v2beta1.types import session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import session_entity_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc.py index 56979a55bd7f..8d0565e3cdde 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -423,12 +423,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -458,12 +458,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -492,12 +492,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc_asyncio.py index 117f0727b9d7..ae69d0cb8e0b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .grpc import SessionEntityTypesGrpcTransport @@ -431,12 +431,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -466,12 +466,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -500,12 +500,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest.py index e40dc976bbb4..842a883e0f0e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.dialogflow_v2beta1.types import session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionEntityTypesRestTransport @@ -622,9 +622,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_create_session_entity_type( request, metadata @@ -776,9 +774,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_delete_session_entity_type( request, metadata @@ -902,9 +898,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_get_session_entity_type( request, metadata @@ -1056,9 +1050,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() request, metadata = self._interceptor.pre_list_session_entity_types( request, metadata @@ -1222,9 +1214,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_update_session_entity_type( request, metadata @@ -1332,7 +1322,9 @@ def create_session_entity_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_session_entity_type( @@ -1342,7 +1334,9 @@ def delete_session_entity_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_session_entity_type( @@ -1364,7 +1358,9 @@ def list_session_entity_types( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListSessionEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._ListSessionEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_session_entity_type( @@ -1375,7 +1371,9 @@ def update_session_entity_type( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1435,9 +1433,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_transcoded_request( @@ -1576,9 +1572,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_transcoded_request( @@ -1714,9 +1708,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1832,9 +1824,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_transcoded_request( @@ -1973,9 +1963,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest_base.py index d059f65930be..93c0841e6377 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.dialogflow_v2beta1.types import session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/async_client.py index 7efbad030366..b48cc2cc815f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -47,12 +47,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore -from google.cloud.dialogflow_v2beta1.types import audio_config -from google.cloud.dialogflow_v2beta1.types import session +from google.cloud.dialogflow_v2beta1.types import audio_config, session from google.cloud.dialogflow_v2beta1.types import session as gcd_session from .client import SessionsClient @@ -129,7 +128,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_info.__func__(SessionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SessionsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SessionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +147,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_file.__func__(SessionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SessionsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SessionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/client.py index 077268cd5da0..36775457ebf9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -63,12 +63,11 @@ _LOGGER = std_logging.getLogger(__name__) +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore -from google.cloud.dialogflow_v2beta1.types import audio_config -from google.cloud.dialogflow_v2beta1.types import session +from google.cloud.dialogflow_v2beta1.types import audio_config, session from google.cloud.dialogflow_v2beta1.types import session as gcd_session from .transports.base import DEFAULT_CLIENT_INFO, SessionsTransport @@ -731,11 +730,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionsClient._read_environment_variables() + ) self._client_cert_source = SessionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -770,8 +767,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/base.py index 0286622b9afc..82d6284c179e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import session @@ -245,7 +245,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc.py index 088e20a54699..9e2a8640f9de 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import session from google.cloud.dialogflow_v2beta1.types import session as gcd_session diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc_asyncio.py index 08beab4bea7a..ff3b959e5cdb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import session from google.cloud.dialogflow_v2beta1.types import session as gcd_session diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest.py index 3fb3de5495c5..723ff1a42cac 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/async_client.py index 57835035084f..a56b78ca73cb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.sip_trunks import pagers from google.cloud.dialogflow_v2beta1.types import sip_trunk @@ -114,7 +114,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SipTrunksAsyncClient: The constructed client. """ - return SipTrunksClient.from_service_account_info.__func__(SipTrunksAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SipTrunksClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SipTrunksAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +133,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SipTrunksAsyncClient: The constructed client. """ - return SipTrunksClient.from_service_account_file.__func__(SipTrunksAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SipTrunksClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SipTrunksAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/client.py index 6aa236344eb8..ffe0a08f18c7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.sip_trunks import pagers from google.cloud.dialogflow_v2beta1.types import sip_trunk @@ -625,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SipTrunksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SipTrunksClient._read_environment_variables() + ) self._client_cert_source = SipTrunksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SipTrunksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/pagers.py index 1d45db947a5c..99dda31e9dbe 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/base.py index ce99f2611c1a..e664572b3a3b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import sip_trunk @@ -275,7 +275,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc.py index d733a84fb27b..a9fd7d9dce90 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import sip_trunk from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc_asyncio.py index f220571e0029..0bd72a806459 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import sip_trunk from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest.py index 2eedc00edbe6..e99bd7634371 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflow_v2beta1.types import sip_trunk diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest_base.py index d425cdb332df..b215c29c9481 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.types import sip_trunk from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/async_client.py index 3f18c62fd5ae..e684f25875e3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.tools import pagers from google.cloud.dialogflow_v2beta1.types import tool @@ -116,7 +116,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_info.__func__(ToolsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ToolsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ToolsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +135,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_file.__func__(ToolsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ToolsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ToolsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/client.py index 38abfa364e55..b786e470c0d0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.tools import pagers from google.cloud.dialogflow_v2beta1.types import tool @@ -673,11 +673,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ToolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ToolsClient._read_environment_variables() + ) self._client_cert_source = ToolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -712,8 +710,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ToolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/pagers.py index 30a5c21c1498..fc902ee2bae7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/base.py index 7ad724396cef..f90447c40f18 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import tool @@ -267,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc.py index 8359392bae55..177f1ff25270 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import tool from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc_asyncio.py index b50fa541b410..bcd55d0cf0ed 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import tool from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest.py index 7dcb38ae93db..691a1a117571 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflow_v2beta1.types import tool diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest_base.py index 817fd897d152..afee8f9bd9f2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.types import tool from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/async_client.py index 5d5f2569a57a..84924caec920 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.versions import pagers from google.cloud.dialogflow_v2beta1.types import version @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_info.__func__(VersionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + VersionsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(VersionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_file.__func__(VersionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + VersionsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(VersionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/client.py index f0971713f510..95a3888be47e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.versions import pagers from google.cloud.dialogflow_v2beta1.types import version @@ -623,11 +623,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VersionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VersionsClient._read_environment_variables() + ) self._client_cert_source = VersionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -662,8 +660,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VersionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/pagers.py index 15195df0c5e5..152ed39ca5b2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/base.py index 270383662751..274d7d9ee4ec 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import version @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc.py index da29bf4b4186..049b4800c80b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import version from google.cloud.dialogflow_v2beta1.types import version as gcd_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc_asyncio.py index fc69c0c67102..7ed4750c345c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import version from google.cloud.dialogflow_v2beta1.types import version as gcd_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest.py index 2e5f001c31db..941d499f1a5c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,9 +28,7 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dialogflow_v2beta1.types import version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest_base.py index 915058363710..e7aa10a1a88f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.types import version from google.cloud.dialogflow_v2beta1.types import version as gcd_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/__init__.py index a8e1f9c6de33..9c9969e82f7f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/__init__.py @@ -28,7 +28,9 @@ SubAgent, TrainAgentRequest, ) -from .agent_coaching_instruction import AgentCoachingInstruction +from .agent_coaching_instruction import ( + AgentCoachingInstruction, +) from .answer_record import ( AgentAssistantFeedback, AgentAssistantRecord, @@ -92,7 +94,9 @@ SuggestConversationSummaryRequest, SuggestConversationSummaryResponse, ) -from .conversation_event import ConversationEvent +from .conversation_event import ( + ConversationEvent, +) from .conversation_profile import ( AutomatedAgentConfig, ClearSuggestionFeatureConfigOperationMetadata, @@ -161,8 +165,16 @@ TextToSpeechSettings, UpdateEnvironmentRequest, ) -from .fulfillment import Fulfillment, GetFulfillmentRequest, UpdateFulfillmentRequest -from .gcs import GcsDestination, GcsSource, GcsSources +from .fulfillment import ( + Fulfillment, + GetFulfillmentRequest, + UpdateFulfillmentRequest, +) +from .gcs import ( + GcsDestination, + GcsSource, + GcsSources, +) from .generator import ( AgentCoachingContext, AgentCoachingSuggestion, @@ -199,7 +211,9 @@ ListGeneratorEvaluationsResponse, SummarizationEvaluationMetrics, ) -from .human_agent_assistant_event import HumanAgentAssistantEvent +from .human_agent_assistant_event import ( + HumanAgentAssistantEvent, +) from .intent import ( BatchDeleteIntentsRequest, BatchUpdateIntentsRequest, @@ -223,7 +237,9 @@ ListKnowledgeBasesResponse, UpdateKnowledgeBaseRequest, ) -from .operations import GeneratorEvaluationOperationMetadata +from .operations import ( + GeneratorEvaluationOperationMetadata, +) from .participant import ( AnalyzeContentRequest, AnalyzeContentResponse, @@ -326,8 +342,14 @@ Tool, UpdateToolRequest, ) -from .tool_call import ToolCall, ToolCallResult -from .validation_result import ValidationError, ValidationResult +from .tool_call import ( + ToolCall, + ToolCallResult, +) +from .validation_result import ( + ValidationError, + ValidationResult, +) from .version import ( CreateVersionRequest, DeleteVersionRequest, @@ -337,7 +359,11 @@ UpdateVersionRequest, Version, ) -from .webhook import OriginalDetectIntentRequest, WebhookRequest, WebhookResponse +from .webhook import ( + OriginalDetectIntentRequest, + WebhookRequest, + WebhookResponse, +) __all__ = ( "Agent", diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent.py index 5b64dd3d5586..1d1093297ada 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent.py @@ -128,6 +128,7 @@ class MatchMode(proto.Enum): examples in intents, especially the ones using @sys.any or very large custom entities. """ + MATCH_MODE_UNSPECIFIED = 0 MATCH_MODE_HYBRID = 1 MATCH_MODE_ML_ONLY = 2 @@ -145,6 +146,7 @@ class ApiVersion(proto.Enum): API_VERSION_V2_BETA_1 (3): V2beta1 API. """ + API_VERSION_UNSPECIFIED = 0 API_VERSION_V1 = 1 API_VERSION_V2 = 2 @@ -167,6 +169,7 @@ class Tier(proto.Enum): Essentials Edition (same as TIER_ENTERPRISE), previously known as Enterprise Plus Edition. """ + TIER_UNSPECIFIED = 0 TIER_STANDARD = 1 TIER_ENTERPRISE = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent_coaching_instruction.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent_coaching_instruction.py index 40969c30cac5..68db32dbf57c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent_coaching_instruction.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent_coaching_instruction.py @@ -80,6 +80,7 @@ class TriggerEvent(proto.Enum): TOOL_CALL_COMPLETION (5): Triggers on tool call completion. """ + TRIGGER_EVENT_UNSPECIFIED = 0 END_OF_UTTERANCE = 1 MANUAL_CALL = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/answer_record.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/answer_record.py index fa6e6ed72d96..dfc759114ade 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/answer_record.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/answer_record.py @@ -205,6 +205,7 @@ class CorrectnessLevel(proto.Enum): FULLY_CORRECT (3): Answer is fully correct. """ + CORRECTNESS_LEVEL_UNSPECIFIED = 0 NOT_CORRECT = 1 PARTIALLY_CORRECT = 2 @@ -294,6 +295,7 @@ class AnswerRelevance(proto.Enum): RELEVANT (2): Answer is relevant to query. """ + ANSWER_RELEVANCE_UNSPECIFIED = 0 IRRELEVANT = 1 RELEVANT = 2 @@ -309,6 +311,7 @@ class DocumentCorrectness(proto.Enum): CORRECT (2): Information in document is correct. """ + DOCUMENT_CORRECTNESS_UNSPECIFIED = 0 INCORRECT = 1 CORRECT = 2 @@ -324,6 +327,7 @@ class DocumentEfficiency(proto.Enum): EFFICIENT (2): Document is efficient. """ + DOCUMENT_EFFICIENCY_UNSPECIFIED = 0 INEFFICIENT = 1 EFFICIENT = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/audio_config.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/audio_config.py index a4035702e0e2..df82fee676b0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/audio_config.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/audio_config.py @@ -84,6 +84,7 @@ class TelephonyDtmf(proto.Enum): Pound/diamond/hash/square/gate/octothorpe: '#'. """ + TELEPHONY_DTMF_UNSPECIFIED = 0 DTMF_ONE = 1 DTMF_TWO = 2 @@ -156,6 +157,7 @@ class AudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + AUDIO_ENCODING_UNSPECIFIED = 0 AUDIO_ENCODING_LINEAR_16 = 1 AUDIO_ENCODING_FLAC = 2 @@ -213,6 +215,7 @@ class SpeechModelVariant(proto.Enum): docs `__ for how to make your project eligible. """ + SPEECH_MODEL_VARIANT_UNSPECIFIED = 0 USE_BEST_AVAILABLE = 1 USE_STANDARD = 2 @@ -235,6 +238,7 @@ class SsmlVoiceGender(proto.Enum): SSML_VOICE_GENDER_NEUTRAL (3): A gender-neutral voice. """ + SSML_VOICE_GENDER_UNSPECIFIED = 0 SSML_VOICE_GENDER_MALE = 1 SSML_VOICE_GENDER_FEMALE = 2 @@ -269,6 +273,7 @@ class OutputAudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + OUTPUT_AUDIO_ENCODING_UNSPECIFIED = 0 OUTPUT_AUDIO_ENCODING_LINEAR_16 = 1 OUTPUT_AUDIO_ENCODING_MP3 = 2 @@ -725,6 +730,7 @@ class PhoneticEncoding(proto.Enum): X-SAMPA, such as apple -> "{p@l". https://en.wikipedia.org/wiki/X-SAMPA """ + PHONETIC_ENCODING_UNSPECIFIED = 0 PHONETIC_ENCODING_IPA = 1 PHONETIC_ENCODING_X_SAMPA = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation.py index 90b4d8bae54e..732f0e10aa84 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation.py @@ -125,6 +125,7 @@ class LifecycleState(proto.Enum): COMPLETED (2): Conversation has been completed. """ + LIFECYCLE_STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 COMPLETED = 2 @@ -145,6 +146,7 @@ class ConversationStage(proto.Enum): The conversation should not provide responses, just listen and provide suggestions. """ + CONVERSATION_STAGE_UNSPECIFIED = 0 VIRTUAL_AGENT_STAGE = 1 HUMAN_ASSIST_STAGE = 2 @@ -263,6 +265,7 @@ class UpdateMode(proto.Enum): Context content updates are applied in overwrite mode. """ + UPDATE_MODE_UNSPECIFIED = 0 APPEND = 1 OVERWRITE = 2 @@ -298,6 +301,7 @@ class ContentFormat(proto.Enum): PLAIN_TEXT (2): Content was provided as plain text. """ + CONTENT_FORMAT_UNSPECIFIED = 0 JSON = 1 PLAIN_TEXT = 2 @@ -729,13 +733,13 @@ class IngestContextReferencesRequest(proto.Message): proto.STRING, number=1, ) - context_references: MutableMapping[ - str, "Conversation.ContextReference" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=2, - message="Conversation.ContextReference", + context_references: MutableMapping[str, "Conversation.ContextReference"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=2, + message="Conversation.ContextReference", + ) ) @@ -1087,13 +1091,13 @@ class GenerateStatelessSuggestionRequest(proto.Message): number=3, oneof="generator_resource", ) - context_references: MutableMapping[ - str, "Conversation.ContextReference" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=4, - message="Conversation.ContextReference", + context_references: MutableMapping[str, "Conversation.ContextReference"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=4, + message="Conversation.ContextReference", + ) ) conversation_context: gcd_generator.ConversationContext = proto.Field( proto.MESSAGE, @@ -1207,6 +1211,7 @@ class QuerySource(proto.Enum): The query is a suggested query from [Participants.SuggestKnowledgeAssist][google.cloud.dialogflow.v2beta1.Participants.SuggestKnowledgeAssist]. """ + QUERY_SOURCE_UNSPECIFIED = 0 AGENT_QUERY = 1 SUGGESTED_QUERY = 2 @@ -1352,6 +1357,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. E.g. ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -1368,6 +1374,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -1595,6 +1602,7 @@ class AnswerType(proto.Enum): INTENT (3): The answer is from intent matching. """ + ANSWER_TYPE_UNSPECIFIED = 0 FAQ = 1 GENERATIVE = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_event.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_event.py index 31da48c170f7..971c004bfff2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_event.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_event.py @@ -105,6 +105,7 @@ class Type(proto.Enum): or, - when we can recover from an error. """ + TYPE_UNSPECIFIED = 0 CONVERSATION_STARTED = 1 CONVERSATION_FINISHED = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_profile.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_profile.py index e3de071212f7..45e5ef265ef5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_profile.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_profile.py @@ -701,6 +701,7 @@ class SectionType(proto.Enum): amount, etc. Section names are prefixed by "entities/". """ + SECTION_TYPE_UNSPECIFIED = 0 SITUATION = 1 ACTION = 2 @@ -1007,6 +1008,7 @@ class MessageFormat(proto.Enum): JSON (2): Pub/Sub message will be json. """ + MESSAGE_FORMAT_UNSPECIFIED = 0 PROTO = 1 JSON = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/document.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/document.py index e8c2566ebfda..6a28cb7e5f68 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/document.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/document.py @@ -165,6 +165,7 @@ class KnowledgeType(proto.Enum): The legacy enum for agent-facing smart reply feature. """ + _pb_options = {"allow_alias": True} KNOWLEDGE_TYPE_UNSPECIFIED = 0 FAQ = 1 @@ -190,6 +191,7 @@ class State(proto.Enum): DELETING (5): The document deletion is in progress. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -605,6 +607,7 @@ class State(proto.Enum): The operation is done, either cancelled or completed. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/entity_type.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/entity_type.py index a989a2f3a31e..205055e7c50a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/entity_type.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/entity_type.py @@ -100,6 +100,7 @@ class Kind(proto.Enum): Regexp entity types allow to specify regular expressions in entries values. """ + KIND_UNSPECIFIED = 0 KIND_MAP = 1 KIND_LIST = 2 @@ -118,6 +119,7 @@ class AutoExpansionMode(proto.Enum): Allows an agent to recognize values that have not been explicitly listed in the entity. """ + AUTO_EXPANSION_MODE_UNSPECIFIED = 0 AUTO_EXPANSION_MODE_DEFAULT = 1 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/environment.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/environment.py index 40a0c9998b1f..c545a9d12b48 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/environment.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/environment.py @@ -21,8 +21,8 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import audio_config +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment __protobuf__ = proto.module( package="google.cloud.dialogflow.v2beta1", @@ -114,6 +114,7 @@ class State(proto.Enum): RUNNING (3): Running. """ + STATE_UNSPECIFIED = 0 STOPPED = 1 LOADING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/fulfillment.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/fulfillment.py index 184df354ecbf..972caf32aff7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/fulfillment.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/fulfillment.py @@ -140,6 +140,7 @@ class Type(proto.Enum): SMALLTALK (1): Fulfillment is enabled for SmallTalk. """ + TYPE_UNSPECIFIED = 0 SMALLTALK = 1 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator.py index 82ff063bdf08..19f64aa8dc7e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator.py @@ -73,6 +73,7 @@ class TriggerEvent(proto.Enum): AGENT_MESSAGE (4): Triggers after each agent message only. """ + TRIGGER_EVENT_UNSPECIFIED = 0 END_OF_UTTERANCE = 1 MANUAL_CALL = 2 @@ -263,6 +264,7 @@ class Role(proto.Enum): Participant is an end user that has called or chatted with Dialogflow services. """ + ROLE_UNSPECIFIED = 0 HUMAN_AGENT = 1 AUTOMATED_AGENT = 2 @@ -312,12 +314,12 @@ class SummarizationSectionList(proto.Message): Optional. Summarization sections. """ - summarization_sections: MutableSequence[ - "SummarizationSection" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SummarizationSection", + summarization_sections: MutableSequence["SummarizationSection"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SummarizationSection", + ) ) @@ -532,6 +534,7 @@ class Type(proto.Enum): type is only available if type ACTION is not selected. """ + TYPE_UNSPECIFIED = 0 SITUATION = 1 ACTION = 2 @@ -578,12 +581,12 @@ class SummarizationContext(proto.Message): empty. Supported 2.0 and later versions. """ - summarization_sections: MutableSequence[ - "SummarizationSection" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SummarizationSection", + summarization_sections: MutableSequence["SummarizationSection"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SummarizationSection", + ) ) few_shot_examples: MutableSequence["FewShotExample"] = proto.RepeatedField( proto.MESSAGE, @@ -934,12 +937,12 @@ class SampleResponse(proto.Message): number=1, message=agent_coaching_instruction.AgentCoachingInstruction, ) - agent_action_suggestions: MutableSequence[ - AgentActionSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=AgentActionSuggestion, + agent_action_suggestions: MutableSequence[AgentActionSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=AgentActionSuggestion, + ) ) sample_responses: MutableSequence[SampleResponse] = proto.RepeatedField( proto.MESSAGE, @@ -1078,6 +1081,7 @@ class RaiCategory(proto.Enum): HATE_SPEECH (4): Hate speech content. """ + RAI_CATEGORY_UNSPECIFIED = 0 DANGEROUS_CONTENT = 1 SEXUALLY_EXPLICIT = 2 @@ -1104,6 +1108,7 @@ class SensitivityLevel(proto.Enum): BLOCK_NONE (4): No filtering for this category. """ + SENSITIVITY_LEVEL_UNSPECIFIED = 0 BLOCK_MOST = 1 BLOCK_SOME = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator_evaluation.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator_evaluation.py index f6a0dd631f0c..50bf84d09459 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator_evaluation.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator_evaluation.py @@ -717,12 +717,12 @@ class SectionDetail(proto.Message): message="SummarizationEvaluationMetrics.SectionToken", ) - summarization_evaluation_results: MutableSequence[ - SummarizationEvaluationResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=SummarizationEvaluationResult, + summarization_evaluation_results: MutableSequence[SummarizationEvaluationResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=SummarizationEvaluationResult, + ) ) summarization_evaluation_merged_results_uri: str = proto.Field( proto.STRING, @@ -781,6 +781,7 @@ class InputDataSourceType(proto.Enum): chosen, input_data_config.start_time and input_data_config.end_timestamp must be provided. """ + INPUT_DATA_SOURCE_TYPE_UNSPECIFIED = 0 AGENT_ASSIST_CONVERSATIONS = 1 INSIGHTS_CONVERSATIONS = 2 @@ -886,6 +887,7 @@ class SummaryGenerationOption(proto.Enum): Do not generate new summaries. Only use existing summaries found. """ + SUMMARY_GENERATION_OPTION_UNSPECIFIED = 0 ALWAYS_GENERATE = 1 GENERATE_IF_MISSING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/human_agent_assistant_event.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/human_agent_assistant_event.py index 6522fe287b12..f5308721fe04 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/human_agent_assistant_event.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/human_agent_assistant_event.py @@ -62,12 +62,12 @@ class HumanAgentAssistantEvent(proto.Message): proto.STRING, number=3, ) - suggestion_results: MutableSequence[ - gcd_participant.SuggestionResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=gcd_participant.SuggestionResult, + suggestion_results: MutableSequence[gcd_participant.SuggestionResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=gcd_participant.SuggestionResult, + ) ) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/intent.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/intent.py index a0e480239baa..89b5f629fadf 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/intent.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/intent.py @@ -55,6 +55,7 @@ class IntentView(proto.Enum): INTENT_VIEW_FULL (1): All fields are populated. """ + INTENT_VIEW_UNSPECIFIED = 0 INTENT_VIEW_FULL = 1 @@ -209,6 +210,7 @@ class WebhookState(proto.Enum): intent. Also, each slot filling prompt is forwarded to the webhook. """ + WEBHOOK_STATE_UNSPECIFIED = 0 WEBHOOK_STATE_ENABLED = 1 WEBHOOK_STATE_ENABLED_FOR_SLOT_FILLING = 2 @@ -275,6 +277,7 @@ class Type(proto.Enum): mode, they will be removed during training and it can cause a drop in agent performance. """ + TYPE_UNSPECIFIED = 0 EXAMPLE = 1 TEMPLATE = 2 @@ -546,6 +549,7 @@ class Platform(proto.Enum): GOOGLE_HANGOUTS (11): Google Hangouts. """ + PLATFORM_UNSPECIFIED = 0 FACEBOOK = 1 SLACK = 2 @@ -660,12 +664,12 @@ class Button(proto.Message): proto.STRING, number=3, ) - buttons: MutableSequence[ - "Intent.Message.Card.Button" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Intent.Message.Card.Button", + buttons: MutableSequence["Intent.Message.Card.Button"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Intent.Message.Card.Button", + ) ) class SimpleResponse(proto.Message): @@ -707,12 +711,12 @@ class SimpleResponses(proto.Message): Required. The list of simple responses. """ - simple_responses: MutableSequence[ - "Intent.Message.SimpleResponse" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.SimpleResponse", + simple_responses: MutableSequence["Intent.Message.SimpleResponse"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.SimpleResponse", + ) ) class BasicCard(proto.Message): @@ -785,12 +789,12 @@ class OpenUriAction(proto.Message): number=4, message="Intent.Message.Image", ) - buttons: MutableSequence[ - "Intent.Message.BasicCard.Button" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="Intent.Message.BasicCard.Button", + buttons: MutableSequence["Intent.Message.BasicCard.Button"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="Intent.Message.BasicCard.Button", + ) ) class Suggestion(proto.Message): @@ -816,12 +820,12 @@ class Suggestions(proto.Message): Required. The list of suggested replies. """ - suggestions: MutableSequence[ - "Intent.Message.Suggestion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.Suggestion", + suggestions: MutableSequence["Intent.Message.Suggestion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.Suggestion", + ) ) class LinkOutSuggestion(proto.Message): @@ -896,12 +900,12 @@ class Item(proto.Message): proto.STRING, number=1, ) - items: MutableSequence[ - "Intent.Message.ListSelect.Item" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Intent.Message.ListSelect.Item", + items: MutableSequence["Intent.Message.ListSelect.Item"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Intent.Message.ListSelect.Item", + ) ) subtitle: str = proto.Field( proto.STRING, @@ -950,12 +954,12 @@ class Item(proto.Message): message="Intent.Message.Image", ) - items: MutableSequence[ - "Intent.Message.CarouselSelect.Item" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.CarouselSelect.Item", + items: MutableSequence["Intent.Message.CarouselSelect.Item"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.CarouselSelect.Item", + ) ) class SelectItemInfo(proto.Message): @@ -1079,12 +1083,12 @@ class RbmText(proto.Message): proto.STRING, number=1, ) - rbm_suggestion: MutableSequence[ - "Intent.Message.RbmSuggestion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Intent.Message.RbmSuggestion", + rbm_suggestion: MutableSequence["Intent.Message.RbmSuggestion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Intent.Message.RbmSuggestion", + ) ) class RbmCarouselCard(proto.Message): @@ -1119,6 +1123,7 @@ class CardWidth(proto.Enum): MEDIUM (2): 232 DP. """ + CARD_WIDTH_UNSPECIFIED = 0 SMALL = 1 MEDIUM = 2 @@ -1128,12 +1133,12 @@ class CardWidth(proto.Enum): number=1, enum="Intent.Message.RbmCarouselCard.CardWidth", ) - card_contents: MutableSequence[ - "Intent.Message.RbmCardContent" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Intent.Message.RbmCardContent", + card_contents: MutableSequence["Intent.Message.RbmCardContent"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Intent.Message.RbmCardContent", + ) ) class RbmStandaloneCard(proto.Message): @@ -1168,6 +1173,7 @@ class CardOrientation(proto.Enum): VERTICAL (2): Vertical layout. """ + CARD_ORIENTATION_UNSPECIFIED = 0 HORIZONTAL = 1 VERTICAL = 2 @@ -1184,6 +1190,7 @@ class ThumbnailImageAlignment(proto.Enum): RIGHT (2): Thumbnail preview is right-aligned. """ + THUMBNAIL_IMAGE_ALIGNMENT_UNSPECIFIED = 0 LEFT = 1 RIGHT = 2 @@ -1287,6 +1294,7 @@ class Height(proto.Enum): 264 DP. Not available for rich card carousels when the card width is set to small. """ + HEIGHT_UNSPECIFIED = 0 SHORT = 1 MEDIUM = 2 @@ -1319,12 +1327,12 @@ class Height(proto.Enum): number=3, message="Intent.Message.RbmCardContent.RbmMedia", ) - suggestions: MutableSequence[ - "Intent.Message.RbmSuggestion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Intent.Message.RbmSuggestion", + suggestions: MutableSequence["Intent.Message.RbmSuggestion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Intent.Message.RbmSuggestion", + ) ) class RbmSuggestion(proto.Message): @@ -1515,6 +1523,7 @@ class ResponseMediaType(proto.Enum): AUDIO (1): Response media type is audio. """ + RESPONSE_MEDIA_TYPE_UNSPECIFIED = 0 AUDIO = 1 @@ -1629,6 +1638,7 @@ class ImageDisplayOptions(proto.Enum): Pad the gaps between image and image frame with a blurred copy of the same image. """ + IMAGE_DISPLAY_OPTIONS_UNSPECIFIED = 0 GRAY = 1 WHITE = 2 @@ -1680,6 +1690,7 @@ class UrlTypeHint(proto.Enum): to a canonical URL which refers to AMP content via . """ + URL_TYPE_HINT_UNSPECIFIED = 0 AMP_ACTION = 1 AMP_CONTENT = 2 @@ -1763,24 +1774,24 @@ class TableCard(proto.Message): number=3, message="Intent.Message.Image", ) - column_properties: MutableSequence[ - "Intent.Message.ColumnProperties" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Intent.Message.ColumnProperties", + column_properties: MutableSequence["Intent.Message.ColumnProperties"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Intent.Message.ColumnProperties", + ) ) rows: MutableSequence["Intent.Message.TableCardRow"] = proto.RepeatedField( proto.MESSAGE, number=5, message="Intent.Message.TableCardRow", ) - buttons: MutableSequence[ - "Intent.Message.BasicCard.Button" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="Intent.Message.BasicCard.Button", + buttons: MutableSequence["Intent.Message.BasicCard.Button"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="Intent.Message.BasicCard.Button", + ) ) class ColumnProperties(proto.Message): @@ -1811,6 +1822,7 @@ class HorizontalAlignment(proto.Enum): Text is aligned to the trailing edge of the column. """ + HORIZONTAL_ALIGNMENT_UNSPECIFIED = 0 LEADING = 1 CENTER = 2 @@ -1839,12 +1851,12 @@ class TableCardRow(proto.Message): after this row. """ - cells: MutableSequence[ - "Intent.Message.TableCardCell" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.TableCardCell", + cells: MutableSequence["Intent.Message.TableCardCell"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.TableCardCell", + ) ) divider_after: bool = proto.Field( proto.BOOL, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/participant.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/participant.py index bdd43667dc47..51baa4b7cb39 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/participant.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/participant.py @@ -180,6 +180,7 @@ class Role(proto.Enum): Participant is an end user that has called or chatted with Dialogflow services. """ + ROLE_UNSPECIFIED = 0 HUMAN_AGENT = 1 AUTOMATED_AGENT = 2 @@ -205,6 +206,7 @@ class AgentDesktopSource(proto.Enum): either not currently released or setting this field to the applicable desktop. """ + AGENT_DESKTOP_SOURCE_UNSPECIFIED = 0 LIVE_PERSON = 1 GENESYS_CLOUD = 2 @@ -572,6 +574,7 @@ class AutomatedAgentReplyType(proto.Enum): FINAL (2): Final reply. """ + AUTOMATED_AGENT_REPLY_TYPE_UNSPECIFIED = 0 PARTIAL = 1 FINAL = 2 @@ -679,6 +682,7 @@ class Action(proto.Enum): This action is intended for tool calls that may write data. """ + ACTION_UNSPECIFIED = 0 CANCEL = 1 REVISE = 2 @@ -779,6 +783,7 @@ class Type(proto.Enum): Run knowledge assist with automatic query generation. """ + TYPE_UNSPECIFIED = 0 ARTICLE_SUGGESTION = 1 FAQ = 2 @@ -1087,19 +1092,19 @@ class AnalyzeContentResponse(proto.Message): number=5, message="Message", ) - human_agent_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="SuggestionResult", + human_agent_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="SuggestionResult", + ) ) - end_user_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message="SuggestionResult", + end_user_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message="SuggestionResult", + ) ) dtmf_parameters: "DtmfParameters" = proto.Field( proto.MESSAGE, @@ -1487,19 +1492,19 @@ class StreamingAnalyzeContentResponse(proto.Message): number=6, message="Message", ) - human_agent_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message="SuggestionResult", + human_agent_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message="SuggestionResult", + ) ) - end_user_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="SuggestionResult", + end_user_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="SuggestionResult", + ) ) dtmf_parameters: "DtmfParameters" = proto.Field( proto.MESSAGE, @@ -2204,12 +2209,12 @@ class GeneratorSuggestionAnswer(proto.Message): number=3, ) - generator_suggestion_answers: MutableSequence[ - GeneratorSuggestionAnswer - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=GeneratorSuggestionAnswer, + generator_suggestion_answers: MutableSequence[GeneratorSuggestionAnswer] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=GeneratorSuggestionAnswer, + ) ) latest_message: str = proto.Field( proto.STRING, @@ -2241,12 +2246,12 @@ class SuggestDialogflowAssistsResponse(proto.Message): the conversation. """ - dialogflow_assist_answers: MutableSequence[ - "DialogflowAssistAnswer" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="DialogflowAssistAnswer", + dialogflow_assist_answers: MutableSequence["DialogflowAssistAnswer"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="DialogflowAssistAnswer", + ) ) latest_message: str = proto.Field( proto.STRING, @@ -2701,12 +2706,12 @@ class Segment(proto.Message): number=3, ) - segments: MutableSequence[ - "ResponseMessage.MixedAudio.Segment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ResponseMessage.MixedAudio.Segment", + segments: MutableSequence["ResponseMessage.MixedAudio.Segment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ResponseMessage.MixedAudio.Segment", + ) ) class TelephonyTransferCall(proto.Message): diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/phone_number.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/phone_number.py index 6da839438b50..debe4c0bfabd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/phone_number.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/phone_number.py @@ -80,6 +80,7 @@ class LifecycleState(proto.Enum): Number is pending deletion, and cannot receive calls. """ + LIFECYCLE_STATE_UNSPECIFIED = 0 ACTIVE = 1 DELETE_REQUESTED = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session.py index 45f6c211e47a..630e575ebecc 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session.py @@ -24,11 +24,9 @@ import google.type.latlng_pb2 as latlng_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import agent, context, session_entity_type from google.cloud.dialogflow_v2beta1.types import audio_config as gcd_audio_config -from google.cloud.dialogflow_v2beta1.types import agent -from google.cloud.dialogflow_v2beta1.types import context from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent -from google.cloud.dialogflow_v2beta1.types import session_entity_type __protobuf__ = proto.module( package="google.cloud.dialogflow.v2beta1", @@ -305,12 +303,12 @@ class QueryParameters(proto.Message): proto.BOOL, number=4, ) - session_entity_types: MutableSequence[ - session_entity_type.SessionEntityType - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=session_entity_type.SessionEntityType, + session_entity_types: MutableSequence[session_entity_type.SessionEntityType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=session_entity_type.SessionEntityType, + ) ) payload: struct_pb2.Struct = proto.Field( proto.MESSAGE, @@ -561,12 +559,12 @@ class QueryResult(proto.Message): proto.STRING, number=6, ) - fulfillment_messages: MutableSequence[ - gcd_intent.Intent.Message - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gcd_intent.Intent.Message, + fulfillment_messages: MutableSequence[gcd_intent.Intent.Message] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gcd_intent.Intent.Message, + ) ) webhook_source: str = proto.Field( proto.STRING, @@ -664,6 +662,7 @@ class MatchConfidenceLevel(proto.Enum): HIGH (3): Indicates our confidence is high. """ + MATCH_CONFIDENCE_LEVEL_UNSPECIFIED = 0 LOW = 1 MEDIUM = 2 @@ -932,19 +931,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=5, ) - speech_partial_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=duration_pb2.Duration, + speech_partial_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=duration_pb2.Duration, + ) ) - speech_final_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=duration_pb2.Duration, + speech_final_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=duration_pb2.Duration, + ) ) partial_responses: int = proto.Field( proto.INT32, @@ -962,19 +961,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=11, ) - dtmf_partial_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=12, - message=duration_pb2.Duration, + dtmf_partial_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12, + message=duration_pb2.Duration, + ) ) - dtmf_final_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=13, - message=duration_pb2.Duration, + dtmf_final_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=13, + message=duration_pb2.Duration, + ) ) single_utterance_end_time_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, @@ -1231,6 +1230,7 @@ class MessageType(proto.Enum): be sent with DTMF digits collected up to the time of sending, which represents an intermediate result. """ + MESSAGE_TYPE_UNSPECIFIED = 0 TRANSCRIPT = 1 END_OF_SINGLE_UTTERANCE = 2 @@ -1258,12 +1258,12 @@ class MessageType(proto.Enum): proto.FLOAT, number=6, ) - speech_word_info: MutableSequence[ - gcd_audio_config.SpeechWordInfo - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gcd_audio_config.SpeechWordInfo, + speech_word_info: MutableSequence[gcd_audio_config.SpeechWordInfo] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gcd_audio_config.SpeechWordInfo, + ) ) speech_end_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session_entity_type.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session_entity_type.py index e9649d6145d8..b129f4ace312 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session_entity_type.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session_entity_type.py @@ -97,6 +97,7 @@ class EntityOverrideMode(proto.Enum): [EntityTypes.GetEntityType][google.cloud.dialogflow.v2beta1.EntityTypes.GetEntityType] on the custom entity type and merge. """ + ENTITY_OVERRIDE_MODE_UNSPECIFIED = 0 ENTITY_OVERRIDE_MODE_OVERRIDE = 1 ENTITY_OVERRIDE_MODE_SUPPLEMENT = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/sip_trunk.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/sip_trunk.py index 10b5bc349e6d..5b4dea259f02 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/sip_trunk.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/sip_trunk.py @@ -253,6 +253,7 @@ class State(proto.Enum): KEEPALIVE (4): SIP Trunk connection is keepalive. """ + STATE_UNSPECIFIED = 0 CONNECTED = 1 DISCONNECTED = 2 @@ -284,6 +285,7 @@ class CertificateState(proto.Enum): CERTIFICATE_QUOTA_EXCEEDED (8): Certificate has exhausted its quota. """ + CERTIFICATE_STATE_UNSPECIFIED = 0 CERTIFICATE_VALID = 1 CERTIFICATE_INVALID = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool.py index 942177cca0dd..33d273048f26 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool.py @@ -270,6 +270,7 @@ class ConfirmationRequirement(proto.Enum): NOT_REQUIRED (2): Conformation is not required. """ + CONFIRMATION_REQUIREMENT_UNSPECIFIED = 0 REQUIRED = 1 NOT_REQUIRED = 2 @@ -291,6 +292,7 @@ class MethodType(proto.Enum): PATCH (5): PATCH method. """ + METHOD_TYPE_UNSPECIFIED = 0 GET = 1 POST = 2 @@ -467,6 +469,7 @@ class OperationType(proto.Enum): DELETE (5): Delete operation. """ + OPERATION_TYPE_UNSPECIFIED = 0 LIST = 1 GET = 2 @@ -558,6 +561,7 @@ class RequestLocation(proto.Enum): QUERY_STRING (2): Represents the key in query string. """ + REQUEST_LOCATION_UNSPECIFIED = 0 HEADER = 1 QUERY_STRING = 2 @@ -638,6 +642,7 @@ class OauthGrantType(proto.Enum): Represents the `client credential flow `__. """ + OAUTH_GRANT_TYPE_UNSPECIFIED = 0 CLIENT_CREDENTIAL = 1 @@ -701,6 +706,7 @@ class ServiceAgentAuth(proto.Enum): other Google Cloud APIs after you grant required roles to ``service-@gcp-sa-dialogflow.iam.gserviceaccount.com``. """ + SERVICE_AGENT_AUTH_UNSPECIFIED = 0 ID_TOKEN = 1 ACCESS_TOKEN = 2 @@ -847,13 +853,13 @@ class ServiceDirectoryConfig(proto.Message): proto.STRING, number=3, ) - action_confirmation_requirement: MutableMapping[ - str, ConfirmationRequirement - ] = proto.MapField( - proto.STRING, - proto.ENUM, - number=17, - enum=ConfirmationRequirement, + action_confirmation_requirement: MutableMapping[str, ConfirmationRequirement] = ( + proto.MapField( + proto.STRING, + proto.ENUM, + number=17, + enum=ConfirmationRequirement, + ) ) extension_spec: ExtensionTool = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool_call.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool_call.py index deab17d6f9a5..c93222d4f7eb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool_call.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool_call.py @@ -76,6 +76,7 @@ class State(proto.Enum): The tool call requires confirmation from a human. """ + STATE_UNSPECIFIED = 0 TRIGGERED = 1 NEEDS_CONFIRMATION = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/validation_result.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/validation_result.py index 288de6ac6ff7..3e945f490d9f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/validation_result.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/validation_result.py @@ -70,6 +70,7 @@ class Severity(proto.Enum): CRITICAL (4): The agent may completely fail. """ + SEVERITY_UNSPECIFIED = 0 INFO = 1 WARNING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/version.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/version.py index 794efb21446c..be96494bca60 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/version.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/version.py @@ -94,6 +94,7 @@ class VersionStatus(proto.Enum): FAILED (3): Version training failed. """ + VERSION_STATUS_UNSPECIFIED = 0 IN_PROGRESS = 1 READY = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/webhook.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/webhook.py index ab11d0d272c1..8b10168d6c92 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/webhook.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/webhook.py @@ -20,9 +20,8 @@ import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import context, intent +from google.cloud.dialogflow_v2beta1.types import context, intent, session_entity_type from google.cloud.dialogflow_v2beta1.types import session as gcd_session -from google.cloud.dialogflow_v2beta1.types import session_entity_type __protobuf__ = proto.module( package="google.cloud.dialogflow.v2beta1", @@ -75,12 +74,12 @@ class WebhookRequest(proto.Message): number=2, message=gcd_session.QueryResult, ) - alternative_query_results: MutableSequence[ - gcd_session.QueryResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=gcd_session.QueryResult, + alternative_query_results: MutableSequence[gcd_session.QueryResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=gcd_session.QueryResult, + ) ) original_detect_intent_request: "OriginalDetectIntentRequest" = proto.Field( proto.MESSAGE, @@ -206,12 +205,12 @@ class WebhookResponse(proto.Message): proto.BOOL, number=8, ) - session_entity_types: MutableSequence[ - session_entity_type.SessionEntityType - ] = proto.RepeatedField( - proto.MESSAGE, - number=10, - message=session_entity_type.SessionEntityType, + session_entity_types: MutableSequence[session_entity_type.SessionEntityType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=10, + message=session_entity_type.SessionEntityType, + ) ) diff --git a/packages/google-cloud-dialogflow/mypy.ini b/packages/google-cloud-dialogflow/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-dialogflow/mypy.ini +++ b/packages/google-cloud-dialogflow/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-dialogflow/noxfile.py b/packages/google-cloud-dialogflow/noxfile.py index c4844130aa13..1652ff53f9e7 100644 --- a/packages/google-cloud-dialogflow/noxfile.py +++ b/packages/google-cloud-dialogflow/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_async.py index 9df52b4aa879..e9a94415f3f4 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_async.py @@ -40,9 +40,7 @@ async def sample_create_generator_evaluation(): # Initialize request argument(s) generator_evaluation = dialogflow_v2.GeneratorEvaluation() - generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = ( - "INSIGHTS_CONVERSATIONS" - ) + generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = "INSIGHTS_CONVERSATIONS" generator_evaluation.generator_evaluation_config.output_gcs_bucket_path = ( "output_gcs_bucket_path_value" ) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_sync.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_sync.py index f19dfe565d43..6e832344a7ff 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_sync.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_sync.py @@ -40,9 +40,7 @@ def sample_create_generator_evaluation(): # Initialize request argument(s) generator_evaluation = dialogflow_v2.GeneratorEvaluation() - generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = ( - "INSIGHTS_CONVERSATIONS" - ) + generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = "INSIGHTS_CONVERSATIONS" generator_evaluation.generator_evaluation_config.output_gcs_bucket_path = ( "output_gcs_bucket_path_value" ) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_async.py index eb5b1897226f..c33f71f29d48 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_async.py @@ -40,9 +40,7 @@ async def sample_create_generator_evaluation(): # Initialize request argument(s) generator_evaluation = dialogflow_v2beta1.GeneratorEvaluation() - generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = ( - "INSIGHTS_CONVERSATIONS" - ) + generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = "INSIGHTS_CONVERSATIONS" generator_evaluation.generator_evaluation_config.output_gcs_bucket_path = ( "output_gcs_bucket_path_value" ) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_sync.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_sync.py index 97f5abb99d2d..d0bed81b19d6 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_sync.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_sync.py @@ -40,9 +40,7 @@ def sample_create_generator_evaluation(): # Initialize request argument(s) generator_evaluation = dialogflow_v2beta1.GeneratorEvaluation() - generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = ( - "INSIGHTS_CONVERSATIONS" - ) + generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = "INSIGHTS_CONVERSATIONS" generator_evaluation.generator_evaluation_config.output_gcs_bucket_path = ( "output_gcs_bucket_path_value" ) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/snippet_metadata_google.cloud.dialogflow.v2.json b/packages/google-cloud-dialogflow/samples/generated_samples/snippet_metadata_google.cloud.dialogflow.v2.json index 7071c9f12560..998bb66bf77d 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/snippet_metadata_google.cloud.dialogflow.v2.json +++ b/packages/google-cloud-dialogflow/samples/generated_samples/snippet_metadata_google.cloud.dialogflow.v2.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-dialogflow", - "version": "2.45.0" + "version": "2.46.0" }, "snippets": [ { diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/snippet_metadata_google.cloud.dialogflow.v2beta1.json b/packages/google-cloud-dialogflow/samples/generated_samples/snippet_metadata_google.cloud.dialogflow.v2beta1.json index 6f9c137c3046..2b998825f848 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/snippet_metadata_google.cloud.dialogflow.v2beta1.json +++ b/packages/google-cloud-dialogflow/samples/generated_samples/snippet_metadata_google.cloud.dialogflow.v2beta1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-dialogflow", - "version": "2.45.0" + "version": "2.46.0" }, "snippets": [ { diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_agents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_agents.py index 618a26ee3a51..b04b95ad3217 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_agents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_agents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 from google.cloud.dialogflow_v2.services.agents import ( AgentsAsyncClient, @@ -72,9 +72,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -911,10 +910,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +957,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +995,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1230,9 +1226,7 @@ def test_agents_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4054,9 +4048,9 @@ def test_get_validation_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_validation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_validation_result] = ( + mock_rpc + ) request = {} client.get_validation_result(request) @@ -5604,9 +5598,9 @@ def test_get_validation_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_validation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_validation_result] = ( + mock_rpc + ) request = {} client.get_validation_result(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_answer_records.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_answer_records.py index 805ae29eb4c8..61f770dac5ff 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_answer_records.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_answer_records.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.dialogflow_v2.services.answer_records import ( AnswerRecordsAsyncClient, @@ -64,6 +69,8 @@ transports, ) from google.cloud.dialogflow_v2.types import ( + agent_coaching_instruction, + answer_record, context, generator, intent, @@ -71,8 +78,6 @@ session, tool_call, ) -from google.cloud.dialogflow_v2.types import agent_coaching_instruction -from google.cloud.dialogflow_v2.types import answer_record from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record CRED_INFO_JSON = { @@ -956,10 +961,9 @@ def test_answer_records_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1008,9 @@ def test_answer_records_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1046,9 @@ def test_answer_records_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1293,9 +1295,7 @@ def test_answer_records_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1415,9 +1415,9 @@ def test_list_answer_records_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_answer_records - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_answer_records] = ( + mock_rpc + ) request = {} client.list_answer_records(request) @@ -1954,9 +1954,9 @@ def test_update_answer_record_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_answer_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_answer_record] = ( + mock_rpc + ) request = {} client.update_answer_record(request) @@ -2238,9 +2238,9 @@ def test_list_answer_records_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_answer_records - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_answer_records] = ( + mock_rpc + ) request = {} client.list_answer_records(request) @@ -2498,9 +2498,9 @@ def test_update_answer_record_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_answer_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_answer_record] = ( + mock_rpc + ) request = {} client.update_answer_record(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_contexts.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_contexts.py index 3557a7659df3..0faf1b5f2f3c 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_contexts.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_contexts.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.dialogflow_v2.services.contexts import ( ContextsAsyncClient, @@ -912,10 +917,9 @@ def test_contexts_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +964,9 @@ def test_contexts_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +1002,9 @@ def test_contexts_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1231,9 +1233,7 @@ def test_contexts_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3161,9 +3161,9 @@ def test_delete_all_contexts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_all_contexts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_all_contexts] = ( + mock_rpc + ) request = {} client.delete_all_contexts(request) @@ -4399,9 +4399,9 @@ def test_delete_all_contexts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_all_contexts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_all_contexts] = ( + mock_rpc + ) request = {} client.delete_all_contexts(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_datasets.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_datasets.py index 31e5e5ec4e03..4dc1cfe2be71 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_datasets.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_datasets.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_datasets import ( ConversationDatasetsAsyncClient, @@ -71,11 +71,10 @@ pagers, transports, ) +from google.cloud.dialogflow_v2.types import conversation_dataset, gcs from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset -from google.cloud.dialogflow_v2.types import gcs CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1009,10 +1008,9 @@ def test_conversation_datasets_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1055,9 @@ def test_conversation_datasets_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1096,10 +1093,9 @@ def test_conversation_datasets_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1359,9 +1355,7 @@ def test_conversation_datasets_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_models.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_models.py index d9ee4a5ed8bb..5f0f4e39167d 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_models.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_models.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_models import ( ConversationModelsAsyncClient, @@ -71,10 +71,10 @@ pagers, transports, ) +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -998,10 +998,9 @@ def test_conversation_models_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1045,9 @@ def test_conversation_models_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1083,9 @@ def test_conversation_models_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1340,9 +1337,7 @@ def test_conversation_models_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1834,9 +1829,9 @@ def test_get_conversation_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation_model] = ( + mock_rpc + ) request = {} client.get_conversation_model(request) @@ -4999,9 +4994,9 @@ def test_get_conversation_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation_model] = ( + mock_rpc + ) request = {} client.get_conversation_model(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_profiles.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_profiles.py index ade0fa39bea3..ba380bde30a7 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_profiles.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_profiles.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 google.cloud.dialogflow_v2.services.conversation_profiles import ( ConversationProfilesAsyncClient, @@ -72,12 +72,15 @@ pagers, transports, ) +from google.cloud.dialogflow_v2.types import ( + audio_config, + conversation_profile, + generator, + participant, +) from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import audio_config -from google.cloud.dialogflow_v2.types import conversation_profile -from google.cloud.dialogflow_v2.types import generator, participant CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1011,10 +1014,9 @@ def test_conversation_profiles_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1061,9 @@ def test_conversation_profiles_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1099,9 @@ def test_conversation_profiles_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1361,9 +1361,7 @@ def test_conversation_profiles_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversations.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversations.py index 0bd709e3b5a9..eeaf2869918b 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversations.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversations import ( ConversationsAsyncClient, @@ -63,15 +68,16 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import agent_coaching_instruction, audio_config from google.cloud.dialogflow_v2.types import ( + agent_coaching_instruction, + audio_config, + conversation, conversation_profile, generator, participant, session, tool_call, ) -from google.cloud.dialogflow_v2.types import conversation from google.cloud.dialogflow_v2.types import conversation as gcd_conversation CRED_INFO_JSON = { @@ -955,10 +961,9 @@ def test_conversations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1008,9 @@ def test_conversations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1046,9 @@ def test_conversations_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1292,9 +1295,7 @@ def test_conversations_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1424,9 +1425,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -1792,9 +1793,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -2340,9 +2341,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -2694,9 +2695,9 @@ def test_complete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_conversation] = ( + mock_rpc + ) request = {} client.complete_conversation(request) @@ -4830,9 +4831,9 @@ def test_search_knowledge_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_knowledge - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_knowledge] = ( + mock_rpc + ) request = {} client.search_knowledge(request) @@ -5081,9 +5082,9 @@ def test_generate_suggestions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_suggestions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_suggestions] = ( + mock_rpc + ) request = {} client.generate_suggestions(request) @@ -5355,9 +5356,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -5548,9 +5549,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -5806,9 +5807,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -5987,9 +5988,9 @@ def test_complete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_conversation] = ( + mock_rpc + ) request = {} client.complete_conversation(request) @@ -7086,9 +7087,9 @@ def test_search_knowledge_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_knowledge - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_knowledge] = ( + mock_rpc + ) request = {} client.search_knowledge(request) @@ -7229,9 +7230,9 @@ def test_generate_suggestions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_suggestions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_suggestions] = ( + mock_rpc + ) request = {} client.generate_suggestions(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_documents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_documents.py index e5ad6bc07b63..5f928187b9ab 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_documents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_documents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.dialogflow_v2.services.documents import ( DocumentsAsyncClient, @@ -74,9 +74,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import document +from google.cloud.dialogflow_v2.types import document, gcs from google.cloud.dialogflow_v2.types import document as gcd_document -from google.cloud.dialogflow_v2.types import gcs CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -932,10 +931,9 @@ def test_documents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -980,10 +978,9 @@ def test_documents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1016,9 @@ def test_documents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1255,9 +1251,7 @@ def test_documents_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2562,9 +2556,9 @@ def test_import_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -4610,9 +4604,9 @@ def test_import_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_encryption_spec_service.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_encryption_spec_service.py index 44c5c1985ab2..e816bb41811b 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_encryption_spec_service.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_encryption_spec_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -68,8 +68,8 @@ EncryptionSpecServiceClient, transports, ) -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1005,10 +1005,9 @@ def test_encryption_spec_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1053,10 +1052,9 @@ def test_encryption_spec_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1092,10 +1090,9 @@ def test_encryption_spec_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1355,9 +1352,7 @@ def test_encryption_spec_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1475,9 +1470,9 @@ def test_get_encryption_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_spec] = ( + mock_rpc + ) request = {} client.get_encryption_spec(request) @@ -2094,9 +2089,9 @@ def test_get_encryption_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_spec] = ( + mock_rpc + ) request = {} client.get_encryption_spec(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_entity_types.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_entity_types.py index 9d70f4367c0a..fb0bcb627662 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_entity_types.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 from google.cloud.dialogflow_v2.services.entity_types import ( EntityTypesAsyncClient, @@ -937,10 +937,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1260,9 +1257,7 @@ def test_entity_types_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1380,9 +1375,9 @@ def test_list_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -2303,9 +2298,9 @@ def test_create_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -2687,9 +2682,9 @@ def test_update_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -3047,9 +3042,9 @@ def test_delete_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -4001,9 +3996,9 @@ def test_batch_create_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_entities] = ( + mock_rpc + ) request = {} client.batch_create_entities(request) @@ -4369,9 +4364,9 @@ def test_batch_update_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_entities] = ( + mock_rpc + ) request = {} client.batch_update_entities(request) @@ -4737,9 +4732,9 @@ def test_batch_delete_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_entities] = ( + mock_rpc + ) request = {} client.batch_delete_entities(request) @@ -5035,9 +5030,9 @@ def test_list_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -5479,9 +5474,9 @@ def test_create_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -5675,9 +5670,9 @@ def test_update_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -5872,9 +5867,9 @@ def test_delete_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -6373,9 +6368,9 @@ def test_batch_create_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_entities] = ( + mock_rpc + ) request = {} client.batch_create_entities(request) @@ -6568,9 +6563,9 @@ def test_batch_update_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_entities] = ( + mock_rpc + ) request = {} client.batch_update_entities(request) @@ -6763,9 +6758,9 @@ def test_batch_delete_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_entities] = ( + mock_rpc + ) request = {} client.batch_delete_entities(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_environments.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_environments.py index 6ddecbd57823..7a7b5e211ec2 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_environments.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_environments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.environments import ( EnvironmentsAsyncClient, @@ -930,10 +935,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -978,10 +982,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1020,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1263,9 +1265,7 @@ def test_environments_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1381,9 +1381,9 @@ def test_list_environments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -2185,9 +2185,9 @@ def test_create_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -2448,9 +2448,9 @@ def test_update_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -2706,9 +2706,9 @@ def test_delete_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -3351,9 +3351,9 @@ def test_list_environments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -3730,9 +3730,9 @@ def test_create_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -3879,9 +3879,9 @@ def test_update_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -4019,9 +4019,9 @@ def test_delete_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_fulfillments.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_fulfillments.py index d0684c08d194..a0829cad8791 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_fulfillments.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_fulfillments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.fulfillments import ( FulfillmentsAsyncClient, @@ -929,10 +934,9 @@ def test_fulfillments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +981,9 @@ def test_fulfillments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1019,9 @@ def test_fulfillments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1262,9 +1264,7 @@ def test_fulfillments_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1711,9 +1711,9 @@ def test_update_fulfillment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fulfillment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fulfillment] = ( + mock_rpc + ) request = {} client.update_fulfillment(request) @@ -2176,9 +2176,9 @@ def test_update_fulfillment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fulfillment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fulfillment] = ( + mock_rpc + ) request = {} client.update_fulfillment(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generator_evaluations.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generator_evaluations.py index 0e7d212b20a0..29511caf3f0c 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generator_evaluations.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generator_evaluations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_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 google.cloud.dialogflow_v2.services.generator_evaluations import ( GeneratorEvaluationsAsyncClient, @@ -73,12 +73,16 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import agent_coaching_instruction, generator +from google.cloud.dialogflow_v2.types import ( + agent_coaching_instruction, + generator, + generator_evaluation, + operations, + tool_call, +) from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator_evaluation -from google.cloud.dialogflow_v2.types import operations, tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1012,10 +1016,9 @@ def test_generator_evaluations_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1060,10 +1063,9 @@ def test_generator_evaluations_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1099,10 +1101,9 @@ def test_generator_evaluations_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1362,9 +1363,7 @@ def test_generator_evaluations_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generators.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generators.py index 365e5f3df20f..45b6af44efbb 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generators.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generators.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.dialogflow_v2.services.generators import ( GeneratorsAsyncClient, @@ -63,10 +68,12 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import agent_coaching_instruction -from google.cloud.dialogflow_v2.types import generator +from google.cloud.dialogflow_v2.types import ( + agent_coaching_instruction, + generator, + tool_call, +) from google.cloud.dialogflow_v2.types import generator as gcd_generator -from google.cloud.dialogflow_v2.types import tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -926,10 +933,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -974,10 +980,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1013,10 +1018,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1249,9 +1253,7 @@ def test_generators_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1370,9 +1372,9 @@ def test_create_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -2569,9 +2571,9 @@ def test_delete_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) @@ -2888,9 +2890,9 @@ def test_update_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) @@ -3165,9 +3167,9 @@ def test_create_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -3789,9 +3791,9 @@ def test_delete_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) @@ -3965,9 +3967,9 @@ def test_update_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_intents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_intents.py index 4b919f827893..46bd22e5c0c3 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_intents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_intents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 from google.cloud.dialogflow_v2.services.intents import ( IntentsAsyncClient, @@ -72,8 +72,7 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import context -from google.cloud.dialogflow_v2.types import intent +from google.cloud.dialogflow_v2.types import context, intent from google.cloud.dialogflow_v2.types import intent as gcd_intent CRED_INFO_JSON = { @@ -912,10 +911,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +996,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1231,9 +1227,7 @@ def test_intents_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3393,9 +3387,9 @@ def test_batch_update_intents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_intents] = ( + mock_rpc + ) request = {} client.batch_update_intents(request) @@ -3760,9 +3754,9 @@ def test_batch_delete_intents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_intents] = ( + mock_rpc + ) request = {} client.batch_delete_intents(request) @@ -5061,9 +5055,9 @@ def test_batch_update_intents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_intents] = ( + mock_rpc + ) request = {} client.batch_update_intents(request) @@ -5247,9 +5241,9 @@ def test_batch_delete_intents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_intents] = ( + mock_rpc + ) request = {} client.batch_delete_intents(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_knowledge_bases.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_knowledge_bases.py index 27c9751dcd21..dbe55a239c10 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_knowledge_bases.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_knowledge_bases.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.knowledge_bases import ( KnowledgeBasesAsyncClient, @@ -61,8 +66,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -949,10 +954,9 @@ def test_knowledge_bases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1001,9 @@ def test_knowledge_bases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1036,10 +1039,9 @@ def test_knowledge_bases_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1286,9 +1288,7 @@ def test_knowledge_bases_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1408,9 +1408,9 @@ def test_list_knowledge_bases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_knowledge_bases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_knowledge_bases] = ( + mock_rpc + ) request = {} client.list_knowledge_bases(request) @@ -1956,9 +1956,9 @@ def test_get_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_knowledge_base] = ( + mock_rpc + ) request = {} client.get_knowledge_base(request) @@ -2306,9 +2306,9 @@ def test_create_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_knowledge_base] = ( + mock_rpc + ) request = {} client.create_knowledge_base(request) @@ -2660,9 +2660,9 @@ def test_delete_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_knowledge_base] = ( + mock_rpc + ) request = {} client.delete_knowledge_base(request) @@ -2994,9 +2994,9 @@ def test_update_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_knowledge_base] = ( + mock_rpc + ) request = {} client.update_knowledge_base(request) @@ -3282,9 +3282,9 @@ def test_list_knowledge_bases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_knowledge_bases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_knowledge_bases] = ( + mock_rpc + ) request = {} client.list_knowledge_bases(request) @@ -3542,9 +3542,9 @@ def test_get_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_knowledge_base] = ( + mock_rpc + ) request = {} client.get_knowledge_base(request) @@ -3723,9 +3723,9 @@ def test_create_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_knowledge_base] = ( + mock_rpc + ) request = {} client.create_knowledge_base(request) @@ -3915,9 +3915,9 @@ def test_delete_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_knowledge_base] = ( + mock_rpc + ) request = {} client.delete_knowledge_base(request) @@ -4093,9 +4093,9 @@ def test_update_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_knowledge_base] = ( + mock_rpc + ) request = {} client.update_knowledge_base(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_participants.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_participants.py index 5dac86b304ed..7b35daa64b16 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_participants.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_participants.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,20 +43,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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.type.latlng_pb2 as latlng_pb2 # type: ignore from google.cloud.dialogflow_v2.services.participants import ( ParticipantsAsyncClient, @@ -64,10 +69,15 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import audio_config, context, entity_type -from google.cloud.dialogflow_v2.types import participant +from google.cloud.dialogflow_v2.types import ( + audio_config, + context, + entity_type, + participant, + session, + session_entity_type, +) from google.cloud.dialogflow_v2.types import participant as gcd_participant -from google.cloud.dialogflow_v2.types import session, session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -935,10 +945,9 @@ def test_participants_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +992,9 @@ def test_participants_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1030,9 @@ def test_participants_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1268,9 +1275,7 @@ def test_participants_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1397,9 +1402,9 @@ def test_create_participant_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_participant] = ( + mock_rpc + ) request = {} client.create_participant(request) @@ -2105,9 +2110,9 @@ def test_list_participants_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -2655,9 +2660,9 @@ def test_update_participant_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_participant] = ( + mock_rpc + ) request = {} client.update_participant(request) @@ -3538,9 +3543,9 @@ def test_suggest_articles_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_articles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_articles] = ( + mock_rpc + ) request = {} client.suggest_articles(request) @@ -3875,9 +3880,9 @@ def test_suggest_faq_answers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_faq_answers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_faq_answers] = ( + mock_rpc + ) request = {} client.suggest_faq_answers(request) @@ -4223,9 +4228,9 @@ def test_suggest_smart_replies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_smart_replies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_smart_replies] = ( + mock_rpc + ) request = {} client.suggest_smart_replies(request) @@ -4763,9 +4768,9 @@ def test_create_participant_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_participant] = ( + mock_rpc + ) request = {} client.create_participant(request) @@ -5134,9 +5139,9 @@ def test_list_participants_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -5394,9 +5399,9 @@ def test_update_participant_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_participant] = ( + mock_rpc + ) request = {} client.update_participant(request) @@ -5785,9 +5790,9 @@ def test_suggest_articles_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_articles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_articles] = ( + mock_rpc + ) request = {} client.suggest_articles(request) @@ -5970,9 +5975,9 @@ def test_suggest_faq_answers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_faq_answers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_faq_answers] = ( + mock_rpc + ) request = {} client.suggest_faq_answers(request) @@ -6156,9 +6161,9 @@ def test_suggest_smart_replies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_smart_replies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_smart_replies] = ( + mock_rpc + ) request = {} client.suggest_smart_replies(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_session_entity_types.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_session_entity_types.py index 94c431b0fffa..a2d4c7a4ee15 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_session_entity_types.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_session_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.session_entity_types import ( SessionEntityTypesAsyncClient, @@ -61,11 +66,10 @@ pagers, transports, ) +from google.cloud.dialogflow_v2.types import entity_type, session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import entity_type -from google.cloud.dialogflow_v2.types import session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -989,10 +993,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1040,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1076,10 +1078,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1331,9 +1332,7 @@ def test_session_entity_types_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sessions.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sessions.py index c1c0f05306f8..d8d2356e4bff 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sessions.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sessions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,30 +43,39 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore -import google.type.latlng_pb2 as latlng_pb2 # type: ignore from google.cloud.dialogflow_v2.services.sessions import ( SessionsAsyncClient, SessionsClient, transports, ) -from google.cloud.dialogflow_v2.types import audio_config, context, entity_type -from google.cloud.dialogflow_v2.types import session +from google.cloud.dialogflow_v2.types import ( + audio_config, + context, + entity_type, + session, + session_entity_type, +) from google.cloud.dialogflow_v2.types import session as gcd_session -from google.cloud.dialogflow_v2.types import session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -915,10 +924,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -963,10 +971,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1002,10 +1009,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1234,9 +1240,7 @@ def test_sessions_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sip_trunks.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sip_trunks.py index 2da4e876b929..053699d29c68 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sip_trunks.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sip_trunks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.sip_trunks import ( SipTrunksAsyncClient, @@ -921,10 +926,9 @@ def test_sip_trunks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_sip_trunks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_sip_trunks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1244,9 +1246,7 @@ def test_sip_trunks_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1360,9 +1360,9 @@ def test_create_sip_trunk_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sip_trunk] = ( + mock_rpc + ) request = {} client.create_sip_trunk(request) @@ -1696,9 +1696,9 @@ def test_delete_sip_trunk_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sip_trunk] = ( + mock_rpc + ) request = {} client.delete_sip_trunk(request) @@ -2858,9 +2858,9 @@ def test_update_sip_trunk_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sip_trunk] = ( + mock_rpc + ) request = {} client.update_sip_trunk(request) @@ -3133,9 +3133,9 @@ def test_create_sip_trunk_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sip_trunk] = ( + mock_rpc + ) request = {} client.create_sip_trunk(request) @@ -3323,9 +3323,9 @@ def test_delete_sip_trunk_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sip_trunk] = ( + mock_rpc + ) request = {} client.delete_sip_trunk(request) @@ -3929,9 +3929,9 @@ def test_update_sip_trunk_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sip_trunk] = ( + mock_rpc + ) request = {} client.update_sip_trunk(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_tools.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_tools.py index e45a81224584..a1926875f695 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_tools.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_tools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.dialogflow_v2.services.tools import ( ToolsAsyncClient, @@ -897,10 +902,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -945,10 +949,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +987,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1216,9 +1218,7 @@ def test_tools_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_versions.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_versions.py index ead439d02d00..8125f77fa6e6 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_versions.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_versions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.versions import ( VersionsAsyncClient, @@ -912,10 +917,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +964,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +1002,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1231,9 +1233,7 @@ def test_versions_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_agents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_agents.py index 6e286dd14c74..e7758593e853 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_agents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_agents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 from google.cloud.dialogflow_v2beta1.services.agents import ( AgentsAsyncClient, @@ -72,9 +72,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -911,10 +910,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +957,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +995,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1230,9 +1226,7 @@ def test_agents_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4054,9 +4048,9 @@ def test_get_validation_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_validation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_validation_result] = ( + mock_rpc + ) request = {} client.get_validation_result(request) @@ -5596,9 +5590,9 @@ def test_get_validation_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_validation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_validation_result] = ( + mock_rpc + ) request = {} client.get_validation_result(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_answer_records.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_answer_records.py index 8cf32b11c856..92a0556a5cba 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_answer_records.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_answer_records.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.dialogflow_v2beta1.services.answer_records import ( AnswerRecordsAsyncClient, @@ -64,6 +69,8 @@ transports, ) from google.cloud.dialogflow_v2beta1.types import ( + agent_coaching_instruction, + answer_record, context, generator, intent, @@ -72,8 +79,6 @@ tool_call, ) from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record -from google.cloud.dialogflow_v2beta1.types import agent_coaching_instruction -from google.cloud.dialogflow_v2beta1.types import answer_record CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -956,10 +961,9 @@ def test_answer_records_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1008,9 @@ def test_answer_records_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1046,9 @@ def test_answer_records_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1293,9 +1295,7 @@ def test_answer_records_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1409,9 +1409,9 @@ def test_get_answer_record_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_answer_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_answer_record] = ( + mock_rpc + ) request = {} client.get_answer_record(request) @@ -1668,9 +1668,9 @@ def test_list_answer_records_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_answer_records - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_answer_records] = ( + mock_rpc + ) request = {} client.list_answer_records(request) @@ -2207,9 +2207,9 @@ def test_update_answer_record_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_answer_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_answer_record] = ( + mock_rpc + ) request = {} client.update_answer_record(request) @@ -2489,9 +2489,9 @@ def test_get_answer_record_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_answer_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_answer_record] = ( + mock_rpc + ) request = {} client.get_answer_record(request) @@ -2529,9 +2529,9 @@ def test_list_answer_records_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_answer_records - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_answer_records] = ( + mock_rpc + ) request = {} client.list_answer_records(request) @@ -2689,9 +2689,9 @@ def test_update_answer_record_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_answer_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_answer_record] = ( + mock_rpc + ) request = {} client.update_answer_record(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_contexts.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_contexts.py index 034c389903b0..b30ada46e2f2 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_contexts.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_contexts.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.contexts import ( ContextsAsyncClient, @@ -912,10 +917,9 @@ def test_contexts_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +964,9 @@ def test_contexts_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +1002,9 @@ def test_contexts_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1231,9 +1233,7 @@ def test_contexts_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3161,9 +3161,9 @@ def test_delete_all_contexts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_all_contexts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_all_contexts] = ( + mock_rpc + ) request = {} client.delete_all_contexts(request) @@ -4399,9 +4399,9 @@ def test_delete_all_contexts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_all_contexts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_all_contexts] = ( + mock_rpc + ) request = {} client.delete_all_contexts(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversation_profiles.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversation_profiles.py index 7f19a26e54dc..4dd764490e65 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversation_profiles.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversation_profiles.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 google.cloud.dialogflow_v2beta1.services.conversation_profiles import ( ConversationProfilesAsyncClient, @@ -72,12 +72,15 @@ pagers, transports, ) +from google.cloud.dialogflow_v2beta1.types import ( + audio_config, + conversation_profile, + generator, + participant, +) from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import audio_config -from google.cloud.dialogflow_v2beta1.types import conversation_profile -from google.cloud.dialogflow_v2beta1.types import generator, participant CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1011,10 +1014,9 @@ def test_conversation_profiles_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1061,9 @@ def test_conversation_profiles_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1099,9 @@ def test_conversation_profiles_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1361,9 +1361,7 @@ def test_conversation_profiles_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversations.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversations.py index 7550392bab43..bd0aa206e045 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversations.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.conversations import ( ConversationsAsyncClient, @@ -66,8 +71,7 @@ from google.cloud.dialogflow_v2beta1.types import ( agent_coaching_instruction, audio_config, -) -from google.cloud.dialogflow_v2beta1.types import ( + conversation, conversation_profile, generator, participant, @@ -75,7 +79,6 @@ tool_call, ) from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -958,10 +961,9 @@ def test_conversations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1008,9 @@ def test_conversations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1046,9 @@ def test_conversations_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1295,9 +1295,7 @@ def test_conversations_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1427,9 +1425,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -1795,9 +1793,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -2343,9 +2341,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -2697,9 +2695,9 @@ def test_complete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_conversation] = ( + mock_rpc + ) request = {} client.complete_conversation(request) @@ -3443,9 +3441,9 @@ def test_batch_create_messages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_messages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_messages] = ( + mock_rpc + ) request = {} client.batch_create_messages(request) @@ -5180,9 +5178,9 @@ def test_search_knowledge_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_knowledge - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_knowledge] = ( + mock_rpc + ) request = {} client.search_knowledge(request) @@ -5431,9 +5429,9 @@ def test_generate_suggestions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_suggestions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_suggestions] = ( + mock_rpc + ) request = {} client.generate_suggestions(request) @@ -5705,9 +5703,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -5899,9 +5897,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -6158,9 +6156,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -6340,9 +6338,9 @@ def test_complete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_conversation] = ( + mock_rpc + ) request = {} client.complete_conversation(request) @@ -6738,9 +6736,9 @@ def test_batch_create_messages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_messages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_messages] = ( + mock_rpc + ) request = {} client.batch_create_messages(request) @@ -7634,9 +7632,9 @@ def test_search_knowledge_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_knowledge - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_knowledge] = ( + mock_rpc + ) request = {} client.search_knowledge(request) @@ -7777,9 +7775,9 @@ def test_generate_suggestions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_suggestions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_suggestions] = ( + mock_rpc + ) request = {} client.generate_suggestions(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_documents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_documents.py index ad952902439a..989629a95184 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_documents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_documents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.documents import ( DocumentsAsyncClient, @@ -74,9 +74,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import document +from google.cloud.dialogflow_v2beta1.types import document, gcs from google.cloud.dialogflow_v2beta1.types import document as gcd_document -from google.cloud.dialogflow_v2beta1.types import gcs CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -932,10 +931,9 @@ def test_documents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -980,10 +978,9 @@ def test_documents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1016,9 @@ def test_documents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1255,9 +1251,7 @@ def test_documents_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2562,9 +2556,9 @@ def test_import_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -4365,9 +4359,9 @@ def test_import_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_encryption_spec_service.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_encryption_spec_service.py index a8aa733c9797..ae9ced282b84 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_encryption_spec_service.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_encryption_spec_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -68,8 +68,8 @@ EncryptionSpecServiceClient, transports, ) -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1005,10 +1005,9 @@ def test_encryption_spec_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1053,10 +1052,9 @@ def test_encryption_spec_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1092,10 +1090,9 @@ def test_encryption_spec_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1355,9 +1352,7 @@ def test_encryption_spec_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1475,9 +1470,9 @@ def test_get_encryption_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_spec] = ( + mock_rpc + ) request = {} client.get_encryption_spec(request) @@ -2094,9 +2089,9 @@ def test_get_encryption_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_spec] = ( + mock_rpc + ) request = {} client.get_encryption_spec(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_entity_types.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_entity_types.py index 1b68adec6fa9..a594f0b36329 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_entity_types.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 from google.cloud.dialogflow_v2beta1.services.entity_types import ( EntityTypesAsyncClient, @@ -72,8 +72,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -937,10 +937,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1260,9 +1257,7 @@ def test_entity_types_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1380,9 +1375,9 @@ def test_list_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -2303,9 +2298,9 @@ def test_create_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -2687,9 +2682,9 @@ def test_update_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -3057,9 +3052,9 @@ def test_delete_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -4011,9 +4006,9 @@ def test_batch_create_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_entities] = ( + mock_rpc + ) request = {} client.batch_create_entities(request) @@ -4379,9 +4374,9 @@ def test_batch_update_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_entities] = ( + mock_rpc + ) request = {} client.batch_update_entities(request) @@ -4747,9 +4742,9 @@ def test_batch_delete_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_entities] = ( + mock_rpc + ) request = {} client.batch_delete_entities(request) @@ -5045,9 +5040,9 @@ def test_list_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -5489,9 +5484,9 @@ def test_create_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -5685,9 +5680,9 @@ def test_update_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -5884,9 +5879,9 @@ def test_delete_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -6385,9 +6380,9 @@ def test_batch_create_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_entities] = ( + mock_rpc + ) request = {} client.batch_create_entities(request) @@ -6580,9 +6575,9 @@ def test_batch_update_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_entities] = ( + mock_rpc + ) request = {} client.batch_update_entities(request) @@ -6775,9 +6770,9 @@ def test_batch_delete_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_entities] = ( + mock_rpc + ) request = {} client.batch_delete_entities(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_environments.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_environments.py index fef1d1ba9cd0..64e5df1d1749 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_environments.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_environments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.environments import ( EnvironmentsAsyncClient, @@ -930,10 +935,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -978,10 +982,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1020,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1263,9 +1265,7 @@ def test_environments_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1381,9 +1381,9 @@ def test_list_environments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -2185,9 +2185,9 @@ def test_create_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -2448,9 +2448,9 @@ def test_update_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -2706,9 +2706,9 @@ def test_delete_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -3351,9 +3351,9 @@ def test_list_environments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -3731,9 +3731,9 @@ def test_create_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -3880,9 +3880,9 @@ def test_update_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -4020,9 +4020,9 @@ def test_delete_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_fulfillments.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_fulfillments.py index ce0c3db3fde4..0a83ae5e1258 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_fulfillments.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_fulfillments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,25 +43,30 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.fulfillments import ( FulfillmentsAsyncClient, FulfillmentsClient, transports, ) -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -929,10 +934,9 @@ def test_fulfillments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +981,9 @@ def test_fulfillments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1019,9 @@ def test_fulfillments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1262,9 +1264,7 @@ def test_fulfillments_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1711,9 +1711,9 @@ def test_update_fulfillment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fulfillment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fulfillment] = ( + mock_rpc + ) request = {} client.update_fulfillment(request) @@ -2176,9 +2176,9 @@ def test_update_fulfillment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fulfillment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fulfillment] = ( + mock_rpc + ) request = {} client.update_fulfillment(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generator_evaluations.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generator_evaluations.py index e29bad851978..0b81ad83e091 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generator_evaluations.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generator_evaluations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_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 google.cloud.dialogflow_v2beta1.services.generator_evaluations import ( GeneratorEvaluationsAsyncClient, @@ -73,12 +73,16 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import agent_coaching_instruction, generator +from google.cloud.dialogflow_v2beta1.types import ( + agent_coaching_instruction, + generator, + generator_evaluation, + operations, + tool_call, +) from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator_evaluation -from google.cloud.dialogflow_v2beta1.types import operations, tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1012,10 +1016,9 @@ def test_generator_evaluations_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1060,10 +1063,9 @@ def test_generator_evaluations_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1099,10 +1101,9 @@ def test_generator_evaluations_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1362,9 +1363,7 @@ def test_generator_evaluations_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generators.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generators.py index a406f94d44bb..0df77e06df64 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generators.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generators.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.dialogflow_v2beta1.services.generators import ( GeneratorsAsyncClient, @@ -63,10 +68,12 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import agent_coaching_instruction -from google.cloud.dialogflow_v2beta1.types import generator +from google.cloud.dialogflow_v2beta1.types import ( + agent_coaching_instruction, + generator, + tool_call, +) from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator -from google.cloud.dialogflow_v2beta1.types import tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -926,10 +933,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -974,10 +980,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1013,10 +1018,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1249,9 +1253,7 @@ def test_generators_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1370,9 +1372,9 @@ def test_create_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -2569,9 +2571,9 @@ def test_delete_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) @@ -2888,9 +2890,9 @@ def test_update_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) @@ -3165,9 +3167,9 @@ def test_create_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -3792,9 +3794,9 @@ def test_delete_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) @@ -3969,9 +3971,9 @@ def test_update_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_intents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_intents.py index 21d51e13872c..28ed8f5d6b9a 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_intents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_intents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 from google.cloud.dialogflow_v2beta1.services.intents import ( IntentsAsyncClient, @@ -72,8 +72,7 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import context -from google.cloud.dialogflow_v2beta1.types import intent +from google.cloud.dialogflow_v2beta1.types import context, intent from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent CRED_INFO_JSON = { @@ -912,10 +911,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +996,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1231,9 +1227,7 @@ def test_intents_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3405,9 +3399,9 @@ def test_batch_update_intents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_intents] = ( + mock_rpc + ) request = {} client.batch_update_intents(request) @@ -3772,9 +3766,9 @@ def test_batch_delete_intents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_intents] = ( + mock_rpc + ) request = {} client.batch_delete_intents(request) @@ -5078,9 +5072,9 @@ def test_batch_update_intents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_intents] = ( + mock_rpc + ) request = {} client.batch_update_intents(request) @@ -5264,9 +5258,9 @@ def test_batch_delete_intents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_intents] = ( + mock_rpc + ) request = {} client.batch_delete_intents(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_knowledge_bases.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_knowledge_bases.py index 05891aa27ed9..e0d530f10a3b 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_knowledge_bases.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_knowledge_bases.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.knowledge_bases import ( KnowledgeBasesAsyncClient, @@ -61,8 +66,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -949,10 +954,9 @@ def test_knowledge_bases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1001,9 @@ def test_knowledge_bases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1036,10 +1039,9 @@ def test_knowledge_bases_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1286,9 +1288,7 @@ def test_knowledge_bases_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1408,9 +1408,9 @@ def test_list_knowledge_bases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_knowledge_bases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_knowledge_bases] = ( + mock_rpc + ) request = {} client.list_knowledge_bases(request) @@ -1956,9 +1956,9 @@ def test_get_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_knowledge_base] = ( + mock_rpc + ) request = {} client.get_knowledge_base(request) @@ -2306,9 +2306,9 @@ def test_create_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_knowledge_base] = ( + mock_rpc + ) request = {} client.create_knowledge_base(request) @@ -2660,9 +2660,9 @@ def test_delete_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_knowledge_base] = ( + mock_rpc + ) request = {} client.delete_knowledge_base(request) @@ -2994,9 +2994,9 @@ def test_update_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_knowledge_base] = ( + mock_rpc + ) request = {} client.update_knowledge_base(request) @@ -3282,9 +3282,9 @@ def test_list_knowledge_bases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_knowledge_bases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_knowledge_bases] = ( + mock_rpc + ) request = {} client.list_knowledge_bases(request) @@ -3543,9 +3543,9 @@ def test_get_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_knowledge_base] = ( + mock_rpc + ) request = {} client.get_knowledge_base(request) @@ -3725,9 +3725,9 @@ def test_create_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_knowledge_base] = ( + mock_rpc + ) request = {} client.create_knowledge_base(request) @@ -3918,9 +3918,9 @@ def test_delete_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_knowledge_base] = ( + mock_rpc + ) request = {} client.delete_knowledge_base(request) @@ -4097,9 +4097,9 @@ def test_update_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_knowledge_base] = ( + mock_rpc + ) request = {} client.update_knowledge_base(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_participants.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_participants.py index c1d7f21dd29d..a688b0556048 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_participants.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_participants.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,21 +43,26 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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.struct_pb2 as struct_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.latlng_pb2 as latlng_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.participants import ( ParticipantsAsyncClient, @@ -70,10 +75,11 @@ audio_config, context, entity_type, + participant, + session, + session_entity_type, ) from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant -from google.cloud.dialogflow_v2beta1.types import participant -from google.cloud.dialogflow_v2beta1.types import session, session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -941,10 +947,9 @@ def test_participants_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +994,9 @@ def test_participants_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1032,9 @@ def test_participants_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1274,9 +1277,7 @@ def test_participants_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1401,9 +1402,9 @@ def test_create_participant_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_participant] = ( + mock_rpc + ) request = {} client.create_participant(request) @@ -2103,9 +2104,9 @@ def test_list_participants_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -2651,9 +2652,9 @@ def test_update_participant_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_participant] = ( + mock_rpc + ) request = {} client.update_participant(request) @@ -3685,9 +3686,9 @@ def test_suggest_articles_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_articles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_articles] = ( + mock_rpc + ) request = {} client.suggest_articles(request) @@ -4022,9 +4023,9 @@ def test_suggest_faq_answers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_faq_answers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_faq_answers] = ( + mock_rpc + ) request = {} client.suggest_faq_answers(request) @@ -4370,9 +4371,9 @@ def test_suggest_smart_replies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_smart_replies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_smart_replies] = ( + mock_rpc + ) request = {} client.suggest_smart_replies(request) @@ -4976,9 +4977,9 @@ def test_list_suggestions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_suggestions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_suggestions] = ( + mock_rpc + ) request = {} client.list_suggestions(request) @@ -5423,9 +5424,9 @@ def test_compile_suggestion_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compile_suggestion - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compile_suggestion] = ( + mock_rpc + ) request = {} client.compile_suggestion(request) @@ -5612,9 +5613,9 @@ def test_create_participant_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_participant] = ( + mock_rpc + ) request = {} client.create_participant(request) @@ -5983,9 +5984,9 @@ def test_list_participants_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -6243,9 +6244,9 @@ def test_update_participant_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_participant] = ( + mock_rpc + ) request = {} client.update_participant(request) @@ -6645,9 +6646,9 @@ def test_suggest_articles_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_articles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_articles] = ( + mock_rpc + ) request = {} client.suggest_articles(request) @@ -6830,9 +6831,9 @@ def test_suggest_faq_answers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_faq_answers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_faq_answers] = ( + mock_rpc + ) request = {} client.suggest_faq_answers(request) @@ -7016,9 +7017,9 @@ def test_suggest_smart_replies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_smart_replies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_smart_replies] = ( + mock_rpc + ) request = {} client.suggest_smart_replies(request) @@ -7325,9 +7326,9 @@ def test_list_suggestions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_suggestions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_suggestions] = ( + mock_rpc + ) request = {} client.list_suggestions(request) @@ -7430,9 +7431,9 @@ def test_compile_suggestion_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compile_suggestion - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compile_suggestion] = ( + mock_rpc + ) request = {} client.compile_suggestion(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_phone_numbers.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_phone_numbers.py index 4b26d9f231db..e290a7e69ba0 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_phone_numbers.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_phone_numbers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.phone_numbers import ( PhoneNumbersAsyncClient, @@ -61,8 +66,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -930,10 +935,9 @@ def test_phone_numbers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -978,10 +982,9 @@ def test_phone_numbers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1020,9 @@ def test_phone_numbers_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1263,9 +1265,7 @@ def test_phone_numbers_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1383,9 +1383,9 @@ def test_list_phone_numbers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_phone_numbers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_phone_numbers] = ( + mock_rpc + ) request = {} client.list_phone_numbers(request) @@ -1930,9 +1930,9 @@ def test_update_phone_number_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_phone_number - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_phone_number] = ( + mock_rpc + ) request = {} client.update_phone_number(request) @@ -2296,9 +2296,9 @@ def test_delete_phone_number_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_phone_number - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_phone_number] = ( + mock_rpc + ) request = {} client.delete_phone_number(request) @@ -2650,9 +2650,9 @@ def test_undelete_phone_number_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.undelete_phone_number - ] = mock_rpc + client._transport._wrapped_methods[client._transport.undelete_phone_number] = ( + mock_rpc + ) request = {} client.undelete_phone_number(request) @@ -2930,9 +2930,9 @@ def test_list_phone_numbers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_phone_numbers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_phone_numbers] = ( + mock_rpc + ) request = {} client.list_phone_numbers(request) @@ -3191,9 +3191,9 @@ def test_update_phone_number_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_phone_number - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_phone_number] = ( + mock_rpc + ) request = {} client.update_phone_number(request) @@ -3375,9 +3375,9 @@ def test_delete_phone_number_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_phone_number - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_phone_number] = ( + mock_rpc + ) request = {} client.delete_phone_number(request) @@ -3557,9 +3557,9 @@ def test_undelete_phone_number_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.undelete_phone_number - ] = mock_rpc + client._transport._wrapped_methods[client._transport.undelete_phone_number] = ( + mock_rpc + ) request = {} client.undelete_phone_number(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_session_entity_types.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_session_entity_types.py index a073163618be..b5783ea76f4f 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_session_entity_types.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_session_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.session_entity_types import ( SessionEntityTypesAsyncClient, @@ -61,11 +66,10 @@ pagers, transports, ) +from google.cloud.dialogflow_v2beta1.types import entity_type, session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import entity_type -from google.cloud.dialogflow_v2beta1.types import session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -989,10 +993,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1040,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1076,10 +1078,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1331,9 +1332,7 @@ def test_session_entity_types_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sessions.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sessions.py index 8d4518eb95b2..7f4359a2797e 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sessions.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sessions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,21 +43,26 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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.struct_pb2 as struct_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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.struct_pb2 as struct_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore -import google.type.latlng_pb2 as latlng_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.sessions import ( SessionsAsyncClient, @@ -69,10 +74,10 @@ audio_config, context, entity_type, + session, + session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import session from google.cloud.dialogflow_v2beta1.types import session as gcd_session -from google.cloud.dialogflow_v2beta1.types import session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -921,10 +926,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1240,9 +1242,7 @@ def test_sessions_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sip_trunks.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sip_trunks.py index c89ada29e864..e9ae46ac2cd6 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sip_trunks.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sip_trunks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.sip_trunks import ( SipTrunksAsyncClient, @@ -921,10 +926,9 @@ def test_sip_trunks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_sip_trunks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_sip_trunks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1244,9 +1246,7 @@ def test_sip_trunks_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1360,9 +1360,9 @@ def test_create_sip_trunk_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sip_trunk] = ( + mock_rpc + ) request = {} client.create_sip_trunk(request) @@ -1696,9 +1696,9 @@ def test_delete_sip_trunk_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sip_trunk] = ( + mock_rpc + ) request = {} client.delete_sip_trunk(request) @@ -2858,9 +2858,9 @@ def test_update_sip_trunk_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sip_trunk] = ( + mock_rpc + ) request = {} client.update_sip_trunk(request) @@ -3133,9 +3133,9 @@ def test_create_sip_trunk_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sip_trunk] = ( + mock_rpc + ) request = {} client.create_sip_trunk(request) @@ -3324,9 +3324,9 @@ def test_delete_sip_trunk_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sip_trunk] = ( + mock_rpc + ) request = {} client.delete_sip_trunk(request) @@ -3933,9 +3933,9 @@ def test_update_sip_trunk_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sip_trunk] = ( + mock_rpc + ) request = {} client.update_sip_trunk(request) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_tools.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_tools.py index 639da6947e01..56dace9b4298 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_tools.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_tools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.dialogflow_v2beta1.services.tools import ( ToolsAsyncClient, @@ -897,10 +902,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -945,10 +949,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +987,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1216,9 +1218,7 @@ def test_tools_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_versions.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_versions.py index a7ac311ff7f2..a8f9cc5d70b0 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_versions.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_versions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.versions import ( VersionsAsyncClient, @@ -912,10 +917,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +964,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +1002,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1231,9 +1233,7 @@ def test_versions_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/CHANGELOG.md b/packages/google-cloud-discoveryengine/CHANGELOG.md index d11f794f046d..c323b1ac11fa 100644 --- a/packages/google-cloud-discoveryengine/CHANGELOG.md +++ b/packages/google-cloud-discoveryengine/CHANGELOG.md @@ -4,6 +4,21 @@ [1]: https://pypi.org/project/google-cloud-discoveryengine/#history +## [0.17.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-discoveryengine-v0.16.0...google-cloud-discoveryengine-v0.17.0) (2026-02-12) + + +### Documentation + +* update documentation for search and data store NLQ features ([b483e9218e14736a27c6547c2da15a9ca74c0db9](https://github.com/googleapis/google-cloud-python/commit/b483e9218e14736a27c6547c2da15a9ca74c0db9)) +* other misc documentation updates Clients can specify Natural Language Query Understanding-related fields, as well as CrowdingSpec. These features are available in the V1 APIs. ([b483e9218e14736a27c6547c2da15a9ca74c0db9](https://github.com/googleapis/google-cloud-python/commit/b483e9218e14736a27c6547c2da15a9ca74c0db9)) + + +### Features + +* add output-only field SemanticState to SearchResponse. ([b483e9218e14736a27c6547c2da15a9ca74c0db9](https://github.com/googleapis/google-cloud-python/commit/b483e9218e14736a27c6547c2da15a9ca74c0db9)) +* add Natural Language Query Understanding fields and messages to DiscoveryEngine request, response, and datastore messages ([b483e9218e14736a27c6547c2da15a9ca74c0db9](https://github.com/googleapis/google-cloud-python/commit/b483e9218e14736a27c6547c2da15a9ca74c0db9)) +* add CrowdingSpec to SearchRequest to set crowding settings ([b483e9218e14736a27c6547c2da15a9ca74c0db9](https://github.com/googleapis/google-cloud-python/commit/b483e9218e14736a27c6547c2da15a9ca74c0db9)) + ## [0.16.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-discoveryengine-v0.15.0...google-cloud-discoveryengine-v0.16.0) (2025-12-17) diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine/gapic_version.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine/gapic_version.py index be6c08cee3cf..e0c1fcd503d9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine/gapic_version.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.16.0" # {x-release-please-version} +__version__ = "0.17.0" # {x-release-please-version} diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/__init__.py index 07af17d9eae5..2e0e24f4a28d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.assistant_service import ( AssistantServiceAsyncClient, AssistantServiceClient, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/gapic_version.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/gapic_version.py index be6c08cee3cf..e0c1fcd503d9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/gapic_version.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.16.0" # {x-release-please-version} +__version__ = "0.17.0" # {x-release-please-version} diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/async_client.py index 53976232bc61..1792cec71938 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, Awaitable, @@ -31,13 +31,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -129,7 +129,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AssistantServiceAsyncClient: The constructed client. """ - return AssistantServiceClient.from_service_account_info.__func__(AssistantServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AssistantServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AssistantServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +148,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AssistantServiceAsyncClient: The constructed client. """ - return AssistantServiceClient.from_service_account_file.__func__(AssistantServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AssistantServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AssistantServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/client.py index 630d3a11bff2..f7f1ad501920 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class AssistantServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AssistantServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AssistantServiceTransport]] _transport_registry["grpc"] = AssistantServiceGrpcTransport _transport_registry["grpc_asyncio"] = AssistantServiceGrpcAsyncIOTransport _transport_registry["rest"] = AssistantServiceRestTransport @@ -731,11 +729,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AssistantServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AssistantServiceClient._read_environment_variables() + ) self._client_cert_source = AssistantServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -770,8 +766,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AssistantServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/base.py index cdfff30d1a48..05e08e82a3c1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import assistant_service @@ -214,7 +214,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc.py index c4694cb3571e..b2493d8febcd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import assistant_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc_asyncio.py index b356fdf333fa..a69d350cc2ab 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import assistant_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest.py index 49ba60e14f26..eb3c52e21c77 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -516,9 +516,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAssistantServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAssistantServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -778,9 +776,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAssistantServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAssistantServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAssistantServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/async_client.py index d12071e4501d..0eded8e525c3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -46,9 +46,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1.types import cmek_config_service @@ -132,7 +132,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CmekConfigServiceAsyncClient: The constructed client. """ - return CmekConfigServiceClient.from_service_account_info.__func__(CmekConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CmekConfigServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CmekConfigServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +151,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CmekConfigServiceAsyncClient: The constructed client. """ - return CmekConfigServiceClient.from_service_account_file.__func__(CmekConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CmekConfigServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CmekConfigServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/client.py index 391b46b2719e..a5e8394dda2c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -63,9 +63,9 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1.types import cmek_config_service @@ -83,9 +83,7 @@ class CmekConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CmekConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CmekConfigServiceTransport]] _transport_registry["grpc"] = CmekConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = CmekConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = CmekConfigServiceRestTransport @@ -693,11 +691,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CmekConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CmekConfigServiceClient._read_environment_variables() + ) self._client_cert_source = CmekConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -732,8 +728,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CmekConfigServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/base.py index 150ff4702bab..ef74c8a7b35b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import cmek_config_service @@ -254,7 +254,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc.py index a51541d73d1b..2d0bea4de25f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import cmek_config_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc_asyncio.py index 2e31add97da0..9cad7fc13f34 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import cmek_config_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest.py index c3940fc76f5c..d5108659ab8f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -715,9 +715,7 @@ def __call__( """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseDeleteCmekConfig._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseDeleteCmekConfig._get_http_options() request, metadata = self._interceptor.pre_delete_cmek_config( request, metadata @@ -863,9 +861,7 @@ def __call__( """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseGetCmekConfig._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseGetCmekConfig._get_http_options() request, metadata = self._interceptor.pre_get_cmek_config(request, metadata) transcoded_request = _BaseCmekConfigServiceRestTransport._BaseGetCmekConfig._get_transcoded_request( @@ -1013,9 +1009,7 @@ def __call__( """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseListCmekConfigs._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseListCmekConfigs._get_http_options() request, metadata = self._interceptor.pre_list_cmek_configs( request, metadata @@ -1167,9 +1161,7 @@ def __call__( """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseUpdateCmekConfig._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseUpdateCmekConfig._get_http_options() request, metadata = self._interceptor.pre_update_cmek_config( request, metadata @@ -1359,9 +1351,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1481,9 +1471,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCmekConfigServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1622,9 +1610,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCmekConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/async_client.py index 5097f33da87e..25b51d0d2f93 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -121,7 +121,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_info.__func__(CompletionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CompletionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CompletionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +140,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_file.__func__(CompletionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CompletionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CompletionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/client.py index 5e49aaa990e1..a4c086bd9bf3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -86,9 +86,7 @@ class CompletionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CompletionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CompletionServiceTransport]] _transport_registry["grpc"] = CompletionServiceGrpcTransport _transport_registry["grpc_asyncio"] = CompletionServiceGrpcAsyncIOTransport _transport_registry["rest"] = CompletionServiceRestTransport @@ -632,11 +630,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CompletionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CompletionServiceClient._read_environment_variables() + ) self._client_cert_source = CompletionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -671,8 +667,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CompletionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/base.py index 1bebe5ff3d97..7f7e2a219285 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import ( @@ -270,7 +270,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc.py index 0901a44674cb..ce558fb78d68 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( completion_service, @@ -398,12 +398,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -431,12 +431,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -463,12 +463,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -495,12 +495,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc_asyncio.py index 7ac71da82875..178eb05b2aa0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( completion_service, @@ -407,12 +407,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -441,12 +441,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -474,12 +474,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -507,12 +507,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest.py index b437123e7532..6a27e58d7445 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -775,9 +775,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() request, metadata = self._interceptor.pre_complete_query(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_transcoded_request( @@ -929,9 +927,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_import_completion_suggestions( request, metadata @@ -998,11 +994,10 @@ def __call__( resp = self._interceptor.post_import_completion_suggestions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_completion_suggestions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_completion_suggestions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1091,15 +1086,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_import_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_import_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1163,11 +1155,10 @@ def __call__( resp = self._interceptor.post_import_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1254,9 +1245,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_purge_completion_suggestions( request, metadata @@ -1411,15 +1400,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_purge_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_purge_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1483,11 +1469,10 @@ def __call__( resp = self._interceptor.post_purge_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1531,7 +1516,9 @@ def import_completion_suggestions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._ImportCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_suggestion_deny_list_entries( @@ -1541,7 +1528,9 @@ def import_suggestion_deny_list_entries( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._ImportSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_completion_suggestions( @@ -1551,7 +1540,9 @@ def purge_completion_suggestions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PurgeCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_suggestion_deny_list_entries( @@ -1561,7 +1552,9 @@ def purge_suggestion_deny_list_entries( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PurgeSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -1619,9 +1612,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1741,9 +1732,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1882,9 +1871,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/async_client.py index 434ed35c7a27..6eaeed48bb72 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,15 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.control_service import pagers -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import common, control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service from .client import ControlServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport @@ -128,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_info.__func__(ControlServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ControlServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ControlServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_file.__func__(ControlServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ControlServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ControlServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/client.py index 6d25535e5314..e1ecbee20753 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,15 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.control_service import pagers -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import common, control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport from .transports.grpc import ControlServiceGrpcTransport @@ -85,9 +83,7 @@ class ControlServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ControlServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ControlServiceTransport]] _transport_registry["grpc"] = ControlServiceGrpcTransport _transport_registry["grpc_asyncio"] = ControlServiceGrpcAsyncIOTransport _transport_registry["rest"] = ControlServiceRestTransport @@ -681,11 +677,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ControlServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ControlServiceClient._read_environment_variables() + ) self._client_cert_source = ControlServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -720,8 +714,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ControlServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/pagers.py index 25df6ee7edfc..2b8cc1952926 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/base.py index 60467bbb3a85..e615c03753df 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/base.py @@ -17,21 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1 import gapic_version as package_version -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -264,7 +263,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc.py index ba4906cf4589..ce68de8a060b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc.py @@ -16,24 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc_asyncio.py index beb6a946359f..fd32e13b0024 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,16 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport from .grpc import ControlServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest.py index bfd3164ccf14..e0d00f32cf75 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,14 +28,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseControlServiceRestTransport @@ -1295,9 +1294,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest_base.py index 15d292900de9..e84b88905874 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest_base.py @@ -17,15 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/async_client.py index 16da7cf01d29..0de773f0e739 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, Awaitable, @@ -31,13 +31,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -46,23 +46,23 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.conversational_search_service import ( pagers, ) from google.cloud.discoveryengine_v1.types import ( + answer, + conversation, conversational_search_service, safety, search_service, + session, ) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session from .client import ConversationalSearchServiceClient @@ -173,7 +173,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_info.__func__(ConversationalSearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConversationalSearchServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + ConversationalSearchServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -189,7 +194,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_file.__func__(ConversationalSearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConversationalSearchServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + ConversationalSearchServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -227,7 +237,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationalSearchServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/client.py index 76d618d9beeb..5271d777a6f3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -62,23 +62,23 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.conversational_search_service import ( pagers, ) from google.cloud.discoveryengine_v1.types import ( + answer, + conversation, conversational_search_service, safety, search_service, + session, ) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session from .transports.base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport @@ -95,13 +95,11 @@ class ConversationalSearchServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationalSearchServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = ConversationalSearchServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + ConversationalSearchServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = ConversationalSearchServiceRestTransport def get_transport_class( @@ -827,11 +825,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationalSearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationalSearchServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConversationalSearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -868,8 +864,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationalSearchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/pagers.py index 896deb696acc..d3383add4990 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -233,7 +233,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/__init__.py index 855e35aad0c0..234e039d4add 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationalSearchServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConversationalSearchServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConversationalSearchServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/base.py index f308c4325ff7..e67d297970d1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1 import gapic_version as package_version +from google.cloud.discoveryengine_v1.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -405,7 +407,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc.py index af5dadbdc3f1..8cf4d2787c8f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.discoveryengine_v1.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc_asyncio.py index d5b03df812ea..a6e2effdae50 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,18 +31,16 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest.py index 02f2fe792772..31a6a5551dfc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,16 +28,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -1036,9 +1038,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() request, metadata = self._interceptor.pre_answer_query(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_transcoded_request( @@ -1198,9 +1198,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() request, metadata = self._interceptor.pre_converse_conversation( request, metadata @@ -1358,9 +1356,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1511,9 +1507,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() request, metadata = self._interceptor.pre_create_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_transcoded_request( @@ -1660,9 +1654,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -1769,9 +1761,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() request, metadata = self._interceptor.pre_delete_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_transcoded_request( @@ -1882,9 +1872,7 @@ def __call__( Defines an answer. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() request, metadata = self._interceptor.pre_get_answer(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_transcoded_request( @@ -2031,9 +2019,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -2180,9 +2166,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() request, metadata = self._interceptor.pre_get_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_transcoded_request( @@ -2329,9 +2313,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2480,9 +2462,7 @@ def __call__( Response for ListSessions method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() request, metadata = self._interceptor.pre_list_sessions(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_transcoded_request( @@ -2638,9 +2618,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseStreamAnswerQuery._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseStreamAnswerQuery._get_http_options() request, metadata = self._interceptor.pre_stream_answer_query( request, metadata @@ -2788,9 +2766,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() request, metadata = self._interceptor.pre_update_conversation( request, metadata @@ -2941,9 +2917,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() request, metadata = self._interceptor.pre_update_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_transcoded_request( @@ -3238,9 +3212,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3363,9 +3335,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3506,9 +3476,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest_base.py index 03cc376dbe48..bf68657c28f7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.discoveryengine_v1.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/async_client.py index b66c698ca3da..ee2664ae589f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -46,20 +46,21 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.data_store_service import pagers from google.cloud.discoveryengine_v1.types import ( + cmek_config_service, + common, + data_store, data_store_service, document_processing_config, schema, ) -from google.cloud.discoveryengine_v1.types import cmek_config_service, common -from google.cloud.discoveryengine_v1.types import data_store from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store from .client import DataStoreServiceClient @@ -157,7 +158,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_info.__func__(DataStoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataStoreServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataStoreServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -173,7 +177,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_file.__func__(DataStoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataStoreServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataStoreServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/client.py index f1f77cf1f590..5345e9b3404f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -63,20 +63,21 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.data_store_service import pagers from google.cloud.discoveryengine_v1.types import ( + cmek_config_service, + common, + data_store, data_store_service, document_processing_config, schema, ) -from google.cloud.discoveryengine_v1.types import cmek_config_service, common -from google.cloud.discoveryengine_v1.types import data_store from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport @@ -93,9 +94,7 @@ class DataStoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataStoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataStoreServiceTransport]] _transport_registry["grpc"] = DataStoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataStoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataStoreServiceRestTransport @@ -801,11 +800,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataStoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataStoreServiceClient._read_environment_variables() + ) self._client_cert_source = DataStoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -840,8 +837,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataStoreServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/pagers.py index 7f58cc992a6b..8b24bf65c420 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/base.py index 8ac5db254017..3bc0c9b6e3ad 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version -from google.cloud.discoveryengine_v1.types import data_store +from google.cloud.discoveryengine_v1.types import data_store, data_store_service from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1.types import data_store_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -268,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc.py index 1912e521bbea..2fe1a734933f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import data_store +from google.cloud.discoveryengine_v1.types import data_store, data_store_service from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc_asyncio.py index 28891d658dc4..497b9e11a8d0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import data_store +from google.cloud.discoveryengine_v1.types import data_store, data_store_service from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport from .grpc import DataStoreServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest.py index d32a175d8c25..2bf7ac133a82 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1.types import data_store +from google.cloud.discoveryengine_v1.types import data_store, data_store_service from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1.types import data_store_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataStoreServiceRestTransport @@ -776,9 +775,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() request, metadata = self._interceptor.pre_create_data_store( request, metadata @@ -931,9 +928,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() request, metadata = self._interceptor.pre_delete_data_store( request, metadata @@ -1228,9 +1223,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() request, metadata = self._interceptor.pre_list_data_stores( request, metadata @@ -1382,9 +1375,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() request, metadata = self._interceptor.pre_update_data_store( request, metadata @@ -1584,9 +1575,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1846,9 +1835,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataStoreServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest_base.py index acd1629b2ef9..92ac4b7f6ef7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1.types import data_store +from google.cloud.discoveryengine_v1.types import data_store, data_store_service from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/async_client.py index 0ba715748aff..405d08724dca 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -46,19 +46,19 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.document_service import pagers from google.cloud.discoveryengine_v1.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document from .client import DocumentServiceClient @@ -138,7 +138,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_info.__func__(DocumentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DocumentServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DocumentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +157,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_file.__func__(DocumentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DocumentServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DocumentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/client.py index 73bd510b3bec..88f3dac83526 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -63,19 +63,19 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.document_service import pagers from google.cloud.discoveryengine_v1.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -92,9 +92,7 @@ class DocumentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] _transport_registry["grpc"] = DocumentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentServiceRestTransport @@ -719,11 +717,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -758,8 +754,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/pagers.py index ac51440eeead..5ba173f68090 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/base.py index caead5728e71..8d1f5fcb3e71 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/base.py @@ -17,24 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -327,7 +327,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc.py index a943e1dc764e..65601cd70459 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc.py @@ -16,27 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -582,12 +582,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc_asyncio.py index 7109357da30b..9ad5ad6b3ae3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,19 +31,15 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -599,12 +599,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest.py index 3967a7b1e82a..204304b0e2ec 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest.py @@ -16,27 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.discoveryengine_v1.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -908,9 +908,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() request, metadata = self._interceptor.pre_batch_get_documents_metadata( request, metadata @@ -1066,9 +1064,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() request, metadata = self._interceptor.pre_create_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_transcoded_request( @@ -1213,9 +1209,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() request, metadata = self._interceptor.pre_delete_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_transcoded_request( @@ -1476,9 +1470,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() request, metadata = self._interceptor.pre_import_documents( request, metadata @@ -1782,9 +1774,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() request, metadata = self._interceptor.pre_purge_documents(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_transcoded_request( @@ -1935,9 +1925,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() request, metadata = self._interceptor.pre_update_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_transcoded_request( @@ -2039,7 +2027,9 @@ def batch_get_documents_metadata( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchGetDocumentsMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._BatchGetDocumentsMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_document( @@ -2154,9 +2144,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2416,9 +2404,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest_base.py index 14be07dbca63..49bb32150385 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest_base.py @@ -17,18 +17,18 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/async_client.py index d42da40a2264..aab7c08407b3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -46,17 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.engine_service import pagers -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import common, engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service from .client import EngineServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport @@ -128,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_info.__func__(EngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EngineServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EngineServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_file.__func__(EngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EngineServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EngineServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/client.py index 79da12ef3b62..a6861a2271c8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -63,17 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.engine_service import pagers -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import common, engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport from .transports.grpc import EngineServiceGrpcTransport @@ -657,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EngineServiceClient._read_environment_variables() + ) self._client_cert_source = EngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -696,8 +692,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/pagers.py index ec1fde800ee2..6938785644d6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/base.py index 13e85acfd20d..59b321a6a6ab 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -268,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc.py index c3cfe00e1a7c..ae59f995c113 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc_asyncio.py index af710f3f1ef7..1194c88d4b74 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport from .grpc import EngineServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest.py index 10cf3c1a8e4c..81b53c2226d3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEngineServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest_base.py index 325cff42db74..275ff273c4df 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/async_client.py index f6720459006b..96d8346668a9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -140,7 +140,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_info.__func__(GroundedGenerationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GroundedGenerationServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GroundedGenerationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -156,7 +159,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_file.__func__(GroundedGenerationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GroundedGenerationServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + GroundedGenerationServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -194,7 +202,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GroundedGenerationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/client.py index 27d0861824bb..50769f2988e8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -82,9 +82,7 @@ class GroundedGenerationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GroundedGenerationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport @@ -671,11 +669,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GroundedGenerationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GroundedGenerationServiceClient._read_environment_variables() + ) self._client_cert_source = ( GroundedGenerationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -712,8 +708,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GroundedGenerationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/__init__.py index 0f3052cbd079..ec0eaca83aa8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GroundedGenerationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/base.py index 9f147516dd14..07c5dbe5db1a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import grounded_generation_service @@ -239,7 +239,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc.py index 31f2246b579b..ae1fff974da5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import grounded_generation_service @@ -346,12 +346,12 @@ def stream_generate_grounded_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_generate_grounded_content" not in self._stubs: - self._stubs[ - "stream_generate_grounded_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.discoveryengine.v1.GroundedGenerationService/StreamGenerateGroundedContent", - request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, - response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + self._stubs["stream_generate_grounded_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.discoveryengine.v1.GroundedGenerationService/StreamGenerateGroundedContent", + request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, + response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + ) ) return self._stubs["stream_generate_grounded_content"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc_asyncio.py index f566cd344b8e..0392fa66d9f8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import grounded_generation_service @@ -354,12 +354,12 @@ def stream_generate_grounded_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_generate_grounded_content" not in self._stubs: - self._stubs[ - "stream_generate_grounded_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.discoveryengine.v1.GroundedGenerationService/StreamGenerateGroundedContent", - request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, - response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + self._stubs["stream_generate_grounded_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.discoveryengine.v1.GroundedGenerationService/StreamGenerateGroundedContent", + request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, + response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + ) ) return self._stubs["stream_generate_grounded_content"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest.py index 85d027c4ce30..d7b921d00915 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -424,9 +424,7 @@ def __call__( """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() request, metadata = self._interceptor.pre_check_grounding(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_transcoded_request( @@ -584,9 +582,7 @@ def __call__( Response for the ``GenerateGroundedContent`` method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseGenerateGroundedContent._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseGenerateGroundedContent._get_http_options() request, metadata = self._interceptor.pre_generate_grounded_content( request, metadata @@ -726,7 +722,9 @@ def generate_grounded_content( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateGroundedContent(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateGroundedContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def stream_generate_grounded_content( @@ -737,7 +735,9 @@ def stream_generate_grounded_content( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._StreamGenerateGroundedContent(self._session, self._host, self._interceptor) # type: ignore + return self._StreamGenerateGroundedContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -795,9 +795,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -920,9 +918,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1063,9 +1059,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/async_client.py index e0b60ef2f34c..36773f509876 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -46,19 +46,21 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.identity_mapping_store_service import ( pagers, ) +from google.cloud.discoveryengine_v1.types import ( + cmek_config_service, + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import cmek_config_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store from .client import IdentityMappingStoreServiceClient from .transports.base import DEFAULT_CLIENT_INFO, IdentityMappingStoreServiceTransport @@ -156,7 +158,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IdentityMappingStoreServiceAsyncClient: The constructed client. """ - return IdentityMappingStoreServiceClient.from_service_account_info.__func__(IdentityMappingStoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + IdentityMappingStoreServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + IdentityMappingStoreServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -172,7 +179,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IdentityMappingStoreServiceAsyncClient: The constructed client. """ - return IdentityMappingStoreServiceClient.from_service_account_file.__func__(IdentityMappingStoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + IdentityMappingStoreServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + IdentityMappingStoreServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -210,7 +222,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return IdentityMappingStoreServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return IdentityMappingStoreServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> IdentityMappingStoreServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/client.py index 9bd484fe9218..7fddef8d7e95 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -63,19 +63,21 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.identity_mapping_store_service import ( pagers, ) +from google.cloud.discoveryengine_v1.types import ( + cmek_config_service, + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import cmek_config_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store from .transports.base import DEFAULT_CLIENT_INFO, IdentityMappingStoreServiceTransport from .transports.grpc import IdentityMappingStoreServiceGrpcTransport @@ -91,13 +93,11 @@ class IdentityMappingStoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[IdentityMappingStoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[IdentityMappingStoreServiceTransport]] _transport_registry["grpc"] = IdentityMappingStoreServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = IdentityMappingStoreServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + IdentityMappingStoreServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = IdentityMappingStoreServiceRestTransport def get_transport_class( @@ -729,11 +729,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IdentityMappingStoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IdentityMappingStoreServiceClient._read_environment_variables() + ) self._client_cert_source = ( IdentityMappingStoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -770,8 +768,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IdentityMappingStoreServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/pagers.py index baf9caba7fd4..500e12b1c569 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -154,7 +154,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -240,7 +240,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -323,7 +323,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/__init__.py index 174d9fb7f1c1..4ae6f9190cf3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[IdentityMappingStoreServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[IdentityMappingStoreServiceTransport]] _transport_registry["grpc"] = IdentityMappingStoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = IdentityMappingStoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = IdentityMappingStoreServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/base.py index 9bafeb80b12e..608e9031cfcd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/base.py @@ -17,22 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version +from google.cloud.discoveryengine_v1.types import ( + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -307,7 +309,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc.py index 9905e3da1955..4f7a306d9f12 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1.types import ( + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store from .base import DEFAULT_CLIENT_INFO, IdentityMappingStoreServiceTransport @@ -366,12 +368,12 @@ def create_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_identity_mapping_store" not in self._stubs: - self._stubs[ - "create_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/CreateIdentityMappingStore", - request_serializer=identity_mapping_store_service.CreateIdentityMappingStoreRequest.serialize, - response_deserializer=gcd_identity_mapping_store.IdentityMappingStore.deserialize, + self._stubs["create_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/CreateIdentityMappingStore", + request_serializer=identity_mapping_store_service.CreateIdentityMappingStoreRequest.serialize, + response_deserializer=gcd_identity_mapping_store.IdentityMappingStore.deserialize, + ) ) return self._stubs["create_identity_mapping_store"] @@ -397,12 +399,12 @@ def get_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_identity_mapping_store" not in self._stubs: - self._stubs[ - "get_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/GetIdentityMappingStore", - request_serializer=identity_mapping_store_service.GetIdentityMappingStoreRequest.serialize, - response_deserializer=identity_mapping_store.IdentityMappingStore.deserialize, + self._stubs["get_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/GetIdentityMappingStore", + request_serializer=identity_mapping_store_service.GetIdentityMappingStoreRequest.serialize, + response_deserializer=identity_mapping_store.IdentityMappingStore.deserialize, + ) ) return self._stubs["get_identity_mapping_store"] @@ -428,12 +430,12 @@ def delete_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_identity_mapping_store" not in self._stubs: - self._stubs[ - "delete_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/DeleteIdentityMappingStore", - request_serializer=identity_mapping_store_service.DeleteIdentityMappingStoreRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/DeleteIdentityMappingStore", + request_serializer=identity_mapping_store_service.DeleteIdentityMappingStoreRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_identity_mapping_store"] @@ -548,12 +550,12 @@ def list_identity_mapping_stores( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_identity_mapping_stores" not in self._stubs: - self._stubs[ - "list_identity_mapping_stores" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/ListIdentityMappingStores", - request_serializer=identity_mapping_store_service.ListIdentityMappingStoresRequest.serialize, - response_deserializer=identity_mapping_store_service.ListIdentityMappingStoresResponse.deserialize, + self._stubs["list_identity_mapping_stores"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/ListIdentityMappingStores", + request_serializer=identity_mapping_store_service.ListIdentityMappingStoresRequest.serialize, + response_deserializer=identity_mapping_store_service.ListIdentityMappingStoresResponse.deserialize, + ) ) return self._stubs["list_identity_mapping_stores"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc_asyncio.py index 051c342a8e43..31630b32346e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,16 +31,15 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1.types import ( + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store from .base import DEFAULT_CLIENT_INFO, IdentityMappingStoreServiceTransport from .grpc import IdentityMappingStoreServiceGrpcTransport @@ -376,12 +378,12 @@ def create_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_identity_mapping_store" not in self._stubs: - self._stubs[ - "create_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/CreateIdentityMappingStore", - request_serializer=identity_mapping_store_service.CreateIdentityMappingStoreRequest.serialize, - response_deserializer=gcd_identity_mapping_store.IdentityMappingStore.deserialize, + self._stubs["create_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/CreateIdentityMappingStore", + request_serializer=identity_mapping_store_service.CreateIdentityMappingStoreRequest.serialize, + response_deserializer=gcd_identity_mapping_store.IdentityMappingStore.deserialize, + ) ) return self._stubs["create_identity_mapping_store"] @@ -407,12 +409,12 @@ def get_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_identity_mapping_store" not in self._stubs: - self._stubs[ - "get_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/GetIdentityMappingStore", - request_serializer=identity_mapping_store_service.GetIdentityMappingStoreRequest.serialize, - response_deserializer=identity_mapping_store.IdentityMappingStore.deserialize, + self._stubs["get_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/GetIdentityMappingStore", + request_serializer=identity_mapping_store_service.GetIdentityMappingStoreRequest.serialize, + response_deserializer=identity_mapping_store.IdentityMappingStore.deserialize, + ) ) return self._stubs["get_identity_mapping_store"] @@ -438,12 +440,12 @@ def delete_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_identity_mapping_store" not in self._stubs: - self._stubs[ - "delete_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/DeleteIdentityMappingStore", - request_serializer=identity_mapping_store_service.DeleteIdentityMappingStoreRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/DeleteIdentityMappingStore", + request_serializer=identity_mapping_store_service.DeleteIdentityMappingStoreRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_identity_mapping_store"] @@ -558,12 +560,12 @@ def list_identity_mapping_stores( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_identity_mapping_stores" not in self._stubs: - self._stubs[ - "list_identity_mapping_stores" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/ListIdentityMappingStores", - request_serializer=identity_mapping_store_service.ListIdentityMappingStoresRequest.serialize, - response_deserializer=identity_mapping_store_service.ListIdentityMappingStoresResponse.deserialize, + self._stubs["list_identity_mapping_stores"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/ListIdentityMappingStores", + request_serializer=identity_mapping_store_service.ListIdentityMappingStoresRequest.serialize, + response_deserializer=identity_mapping_store_service.ListIdentityMappingStoresResponse.deserialize, + ) ) return self._stubs["list_identity_mapping_stores"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest.py index 68b7eaefc5f3..730252fde194 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest.py @@ -16,25 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1.types import ( + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseIdentityMappingStoreServiceRestTransport @@ -903,9 +905,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseCreateIdentityMappingStore._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseCreateIdentityMappingStore._get_http_options() request, metadata = self._interceptor.pre_create_identity_mapping_store( request, metadata @@ -974,11 +974,10 @@ def __call__( resp = self._interceptor.post_create_identity_mapping_store(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_identity_mapping_store_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_identity_mapping_store_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1069,9 +1068,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseDeleteIdentityMappingStore._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseDeleteIdentityMappingStore._get_http_options() request, metadata = self._interceptor.pre_delete_identity_mapping_store( request, metadata @@ -1133,11 +1130,10 @@ def __call__( resp = self._interceptor.post_delete_identity_mapping_store(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_identity_mapping_store_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_identity_mapping_store_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1223,9 +1219,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseGetIdentityMappingStore._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseGetIdentityMappingStore._get_http_options() request, metadata = self._interceptor.pre_get_identity_mapping_store( request, metadata @@ -1379,9 +1373,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseImportIdentityMappings._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseImportIdentityMappings._get_http_options() request, metadata = self._interceptor.pre_import_identity_mappings( request, metadata @@ -1532,9 +1524,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseListIdentityMappings._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseListIdentityMappings._get_http_options() request, metadata = self._interceptor.pre_list_identity_mappings( request, metadata @@ -1689,9 +1679,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseListIdentityMappingStores._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseListIdentityMappingStores._get_http_options() request, metadata = self._interceptor.pre_list_identity_mapping_stores( request, metadata @@ -1849,9 +1837,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BasePurgeIdentityMappings._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BasePurgeIdentityMappings._get_http_options() request, metadata = self._interceptor.pre_purge_identity_mappings( request, metadata @@ -1953,7 +1939,9 @@ def create_identity_mapping_store( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateIdentityMappingStore(self._session, self._host, self._interceptor) # type: ignore + return self._CreateIdentityMappingStore( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_identity_mapping_store( @@ -1964,7 +1952,9 @@ def delete_identity_mapping_store( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteIdentityMappingStore(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteIdentityMappingStore( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_identity_mapping_store( @@ -1975,7 +1965,9 @@ def get_identity_mapping_store( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetIdentityMappingStore(self._session, self._host, self._interceptor) # type: ignore + return self._GetIdentityMappingStore( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_identity_mappings( @@ -1986,7 +1978,9 @@ def import_identity_mappings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportIdentityMappings(self._session, self._host, self._interceptor) # type: ignore + return self._ImportIdentityMappings( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_identity_mappings( @@ -2008,7 +2002,9 @@ def list_identity_mapping_stores( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListIdentityMappingStores(self._session, self._host, self._interceptor) # type: ignore + return self._ListIdentityMappingStores( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_identity_mappings( @@ -2077,9 +2073,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2202,9 +2196,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseIdentityMappingStoreServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2345,9 +2337,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseIdentityMappingStoreServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest_base.py index ace057d7e5c4..74a5147b4aa9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest_base.py @@ -22,11 +22,13 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1.types import ( + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store from .base import DEFAULT_CLIENT_INFO, IdentityMappingStoreServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/async_client.py index f4dcc28e55ec..ec4558bb9cd1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -119,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_info.__func__(ProjectServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ProjectServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ProjectServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_file.__func__(ProjectServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ProjectServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ProjectServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/client.py index 10cd23d67229..fadb617598a3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -82,9 +82,7 @@ class ProjectServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ProjectServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ProjectServiceTransport]] _transport_registry["grpc"] = ProjectServiceGrpcTransport _transport_registry["grpc_asyncio"] = ProjectServiceGrpcAsyncIOTransport _transport_registry["rest"] = ProjectServiceRestTransport @@ -619,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProjectServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProjectServiceClient._read_environment_variables() + ) self._client_cert_source = ProjectServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -658,8 +654,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProjectServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/base.py index ae7560ff42db..46aed4832d39 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import project_service @@ -207,7 +207,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc.py index f34176357d51..20180a1891c8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import project_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc_asyncio.py index 4b559d1624d2..8f554808682f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import project_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest.py index 482f43f126c9..10d1aedea0ec 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -541,9 +541,7 @@ def __call__( """ - http_options = ( - _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() request, metadata = self._interceptor.pre_provision_project( request, metadata @@ -699,9 +697,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/async_client.py index bc75f18dbbf6..c991a562dda4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_info.__func__(RankServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + RankServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(RankServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_file.__func__(RankServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + RankServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(RankServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/client.py index 4fcd57f9801d..eb2ec6938f87 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -620,11 +620,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RankServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RankServiceClient._read_environment_variables() + ) self._client_cert_source = RankServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -659,8 +657,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RankServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/base.py index be797ff6eaa2..8ec782153d25 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import rank_service @@ -202,7 +202,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc.py index da47ea55a36c..40c03d1a0a98 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import rank_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc_asyncio.py index 356285718df1..27b8c1f06443 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import rank_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest.py index ec034858eae5..17f3ba62efaf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/async_client.py index c1ce0fab69d5..f96da53cefe5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -127,7 +127,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_info.__func__(RecommendationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + RecommendationServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(RecommendationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +146,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_file.__func__(RecommendationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + RecommendationServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(RecommendationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +187,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return RecommendationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return RecommendationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> RecommendationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/client.py index da8f6cb53cf7..3e76334c85b9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -80,9 +80,7 @@ class RecommendationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RecommendationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport @@ -702,11 +700,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RecommendationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RecommendationServiceClient._read_environment_variables() + ) self._client_cert_source = RecommendationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -741,8 +737,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RecommendationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/__init__.py index f21f53c111bf..a09bbaaf4d43 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RecommendationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/base.py index 9e05afb6a448..8c76810dd732 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import recommendation_service @@ -205,7 +205,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc.py index 87a59a304273..32fd9d9d20d3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import recommendation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc_asyncio.py index f7813777b005..00c1040d1029 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import recommendation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest.py index 5720b3cc98b0..e121d2ad9933 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -358,9 +358,7 @@ def __call__( """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() request, metadata = self._interceptor.pre_recommend(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseRecommend._get_transcoded_request( @@ -522,9 +520,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -647,9 +643,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -788,9 +782,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/async_client.py index 266e8b8dbfab..fdd8ae5b03a8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -46,15 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.schema_service import pagers -from google.cloud.discoveryengine_v1.types import schema +from google.cloud.discoveryengine_v1.types import schema, schema_service from google.cloud.discoveryengine_v1.types import schema as gcd_schema -from google.cloud.discoveryengine_v1.types import schema_service from .client import SchemaServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport @@ -126,7 +125,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): @@ -142,7 +144,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 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/client.py index 0b61cbad7747..28984a8521dc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -63,15 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.schema_service import pagers -from google.cloud.discoveryengine_v1.types import schema +from google.cloud.discoveryengine_v1.types import schema, schema_service from google.cloud.discoveryengine_v1.types import schema as gcd_schema -from google.cloud.discoveryengine_v1.types import schema_service from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport from .transports.grpc import SchemaServiceGrpcTransport @@ -653,11 +652,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SchemaServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SchemaServiceClient._read_environment_variables() + ) self._client_cert_source = SchemaServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -692,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SchemaServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/pagers.py index 39d3aa982444..84d8c61f58e5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/base.py index ee24a9b4b2ea..a656c50a5828 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import schema, schema_service @@ -266,7 +266,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc.py index ff6e12c5ed53..0f6f919718cd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import schema, schema_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc_asyncio.py index 86e834072ee1..910c630c5f69 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import schema, schema_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest.py index 44a41c97d89f..f0361cf358f4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/async_client.py index 29a56caccd71..d273b69f6045 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -128,7 +128,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_info.__func__(SearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SearchServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SearchServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +147,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_file.__func__(SearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SearchServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SearchServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/client.py index 47b4aab95c27..33daab8ddab5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -747,11 +747,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchServiceClient._read_environment_variables() + ) self._client_cert_source = SearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -786,8 +784,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/pagers.py index d3a0656343e3..07e7f8b65a42 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/base.py index 0e02ac12238f..cb311690d5f3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import search_service @@ -216,7 +216,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc.py index 75d3d2e6b966..6f2b0a432c19 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import search_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc_asyncio.py index ce258458a3c8..023fa53f0633 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import search_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest.py index 202f27b30213..db80fada9e9d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/async_client.py index 10674bf3a75e..83c98590e4bc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -128,7 +128,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_info.__func__(SearchTuningServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SearchTuningServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SearchTuningServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +147,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_file.__func__(SearchTuningServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SearchTuningServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SearchTuningServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -182,7 +188,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SearchTuningServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/client.py index 26603da2c6a9..cb42d45e0b35 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -85,9 +85,7 @@ class SearchTuningServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SearchTuningServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport @@ -655,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchTuningServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchTuningServiceClient._read_environment_variables() + ) self._client_cert_source = SearchTuningServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchTuningServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/__init__.py index d759f5c3cdcd..170e258db18b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SearchTuningServiceRestInterceptor, SearchTuningServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SearchTuningServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/base.py index 99533ff5857d..a3a89e0763b5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import search_tuning_service @@ -224,7 +224,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc.py index 517cd9fa2925..661c6737fc1e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import search_tuning_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc_asyncio.py index 2230de5a3f2e..e5d052c9dfa5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import search_tuning_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest.py index 9db2c97d12ab..b1d581e030b3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -601,9 +601,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() request, metadata = self._interceptor.pre_list_custom_models( request, metadata @@ -756,9 +754,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() request, metadata = self._interceptor.pre_train_custom_model( request, metadata @@ -928,9 +924,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1051,9 +1045,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1192,9 +1184,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/async_client.py index f7c3a38698df..452559dfff23 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,14 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.cloud.discoveryengine_v1.types import common, serving_config_service from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import serving_config_service from .client import ServingConfigServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport @@ -123,7 +122,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_info.__func__(ServingConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ServingConfigServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ServingConfigServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +141,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_file.__func__(ServingConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ServingConfigServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ServingConfigServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -177,7 +182,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ServingConfigServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/client.py index bc2bbfd73d91..0e7e6692e1ed 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,14 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.cloud.discoveryengine_v1.types import common, serving_config_service from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import serving_config_service from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport from .transports.grpc import ServingConfigServiceGrpcTransport @@ -84,9 +83,7 @@ class ServingConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ServingConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport @@ -634,11 +631,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServingConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServingConfigServiceClient._read_environment_variables() + ) self._client_cert_source = ServingConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -673,8 +668,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServingConfigServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/__init__.py index 6bdd4697d637..5e6ab0b7e7f9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ServingConfigServiceRestInterceptor, ServingConfigServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ServingConfigServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/base.py index 2ce88a05aa15..e521dfb1fadb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config @@ -206,7 +206,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc.py index d1c6a2fa0b24..018b75549665 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config from google.cloud.discoveryengine_v1.types import serving_config_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc_asyncio.py index a4f8d822aa90..e8093083ed15 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config from google.cloud.discoveryengine_v1.types import serving_config_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest.py index 308ca01f41d5..8f87ea9e4109 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -365,9 +365,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() request, metadata = self._interceptor.pre_update_serving_config( request, metadata @@ -533,9 +531,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -656,9 +652,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -797,9 +791,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/async_client.py index 5fcf6c8538d5..a576f1ed2e81 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,14 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.session_service import pagers -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session +from google.cloud.discoveryengine_v1.types import conversational_search_service, session from google.cloud.discoveryengine_v1.types import session as gcd_session from .client import SessionServiceClient @@ -132,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_info.__func__(SessionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SessionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SessionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +150,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_file.__func__(SessionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SessionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SessionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/client.py index 753da777aecc..5341a08f7337 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,14 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.session_service import pagers -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session +from google.cloud.discoveryengine_v1.types import conversational_search_service, session from google.cloud.discoveryengine_v1.types import session as gcd_session from .transports.base import DEFAULT_CLIENT_INFO, SessionServiceTransport @@ -85,9 +84,7 @@ class SessionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionServiceTransport]] _transport_registry["grpc"] = SessionServiceGrpcTransport _transport_registry["grpc_asyncio"] = SessionServiceGrpcAsyncIOTransport _transport_registry["rest"] = SessionServiceRestTransport @@ -759,11 +756,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionServiceClient._read_environment_variables() + ) self._client_cert_source = SessionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -798,8 +793,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/pagers.py index 81daa2b85b5d..2238be26d6c3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/base.py index 180ea1989ce9..e445d62f61a1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1 import gapic_version as package_version -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session +from google.cloud.discoveryengine_v1.types import conversational_search_service, session from google.cloud.discoveryengine_v1.types import session as gcd_session DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -264,7 +263,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc.py index 92b3130a8610..61404f493c9d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session +from google.cloud.discoveryengine_v1.types import conversational_search_service, session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc_asyncio.py index fe624a05ea5c..a8421d84a150 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,15 +31,10 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session +from google.cloud.discoveryengine_v1.types import conversational_search_service, session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest.py index c6e861a596d1..9a4bfb27f61c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,13 +28,10 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session +from google.cloud.discoveryengine_v1.types import conversational_search_service, session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -1292,9 +1291,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest_base.py index 8c6594f67616..b7e76e05e787 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest_base.py @@ -17,14 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session +from google.cloud.discoveryengine_v1.types import conversational_search_service, session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/async_client.py index b4689cbb6f94..217a15961051 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -46,10 +46,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.site_search_engine_service import pagers from google.cloud.discoveryengine_v1.types import ( @@ -139,7 +139,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_info.__func__(SiteSearchEngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SiteSearchEngineServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SiteSearchEngineServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +158,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_file.__func__(SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SiteSearchEngineServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -193,7 +201,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SiteSearchEngineServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/client.py index a51dccda9d7b..9e3469155f67 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -63,10 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.site_search_engine_service import pagers from google.cloud.discoveryengine_v1.types import ( @@ -88,9 +88,7 @@ class SiteSearchEngineServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport @@ -684,11 +682,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SiteSearchEngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SiteSearchEngineServiceClient._read_environment_variables() + ) self._client_cert_source = ( SiteSearchEngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -725,8 +721,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SiteSearchEngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/pagers.py index 02ccb3146820..12373407d5ba 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -315,7 +315,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/__init__.py index 5443c0c10cf1..0c91743e9878 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/base.py index 65593c566922..02c7c6d992ff 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import ( @@ -418,7 +418,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc.py index 082f14f87f21..e2da5052cbc1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( site_search_engine, @@ -657,12 +657,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -689,12 +689,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -782,12 +782,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc_asyncio.py index 2614081a8a1b..dccb9b396db2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( site_search_engine, @@ -671,12 +671,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -703,12 +703,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -797,12 +797,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest.py index adce64f18954..527de9a148bb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1354,9 +1354,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_create_target_sites( request, metadata @@ -1510,9 +1508,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_verify_target_sites( request, metadata @@ -1666,9 +1662,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_http_options() request, metadata = self._interceptor.pre_create_sitemap(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_transcoded_request( @@ -1822,9 +1816,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() request, metadata = self._interceptor.pre_create_target_site( request, metadata @@ -1979,9 +1971,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_http_options() request, metadata = self._interceptor.pre_delete_sitemap(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_transcoded_request( @@ -2129,9 +2119,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() request, metadata = self._interceptor.pre_delete_target_site( request, metadata @@ -2285,9 +2273,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_disable_advanced_site_search( request, metadata @@ -2442,9 +2428,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_enable_advanced_site_search( request, metadata @@ -2600,9 +2584,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() request, metadata = self._interceptor.pre_fetch_domain_verification_status( request, metadata @@ -2670,11 +2652,10 @@ def __call__( resp = self._interceptor.post_fetch_domain_verification_status(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_domain_verification_status_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_domain_verification_status_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2761,9 +2742,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_http_options() request, metadata = self._interceptor.pre_fetch_sitemaps(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_transcoded_request( @@ -2918,9 +2897,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() request, metadata = self._interceptor.pre_get_site_search_engine( request, metadata @@ -3073,9 +3050,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() request, metadata = self._interceptor.pre_get_target_site(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_transcoded_request( @@ -3225,9 +3200,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() request, metadata = self._interceptor.pre_list_target_sites( request, metadata @@ -3384,9 +3357,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() request, metadata = self._interceptor.pre_recrawl_uris(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_transcoded_request( @@ -3538,9 +3509,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() request, metadata = self._interceptor.pre_update_target_site( request, metadata @@ -3644,7 +3613,9 @@ def batch_create_target_sites( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchCreateTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_verify_target_sites( @@ -3655,7 +3626,9 @@ def batch_verify_target_sites( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchVerifyTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchVerifyTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_sitemap( @@ -3706,7 +3679,9 @@ def disable_advanced_site_search( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DisableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._DisableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def enable_advanced_site_search( @@ -3717,7 +3692,9 @@ def enable_advanced_site_search( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._EnableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._EnableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_domain_verification_status( @@ -3728,7 +3705,9 @@ def fetch_domain_verification_status( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchDomainVerificationStatus(self._session, self._host, self._interceptor) # type: ignore + return self._FetchDomainVerificationStatus( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_sitemaps( @@ -3849,9 +3828,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3974,9 +3951,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -4115,9 +4090,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/async_client.py index f1a0c3a0f575..56af79286ffa 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -47,10 +47,10 @@ import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.any_pb2 as any_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.types import ( common, @@ -132,7 +132,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_info.__func__(UserEventServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + UserEventServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(UserEventServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +151,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_file.__func__(UserEventServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + UserEventServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(UserEventServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/client.py index f1387138f37d..b4a078faf4b4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -64,10 +64,10 @@ import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.any_pb2 as any_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1.types import ( common, @@ -91,9 +91,7 @@ class UserEventServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[UserEventServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[UserEventServiceTransport]] _transport_registry["grpc"] = UserEventServiceGrpcTransport _transport_registry["grpc_asyncio"] = UserEventServiceGrpcAsyncIOTransport _transport_registry["rest"] = UserEventServiceRestTransport @@ -687,11 +685,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UserEventServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UserEventServiceClient._read_environment_variables() + ) self._client_cert_source = UserEventServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -726,8 +722,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UserEventServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/base.py index f46cc3dc7d66..7448f018ff22 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/base.py @@ -18,15 +18,15 @@ import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import ( @@ -264,7 +264,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc.py index 9a3c5ee60071..5625f87121bc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( import_config, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc_asyncio.py index c0935a777e2a..7c9fff2fd578 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc_asyncio.py @@ -17,10 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -29,10 +32,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( import_config, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest.py index 1f931c897a8c..0ff07b94bbd1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -762,9 +762,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() request, metadata = self._interceptor.pre_collect_user_event( request, metadata @@ -914,9 +912,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() request, metadata = self._interceptor.pre_import_user_events( request, metadata @@ -1069,9 +1065,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() request, metadata = self._interceptor.pre_purge_user_events( request, metadata @@ -1224,9 +1218,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() request, metadata = self._interceptor.pre_write_user_event( request, metadata @@ -1409,9 +1401,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1671,9 +1661,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseUserEventServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/async_client.py index 10a2900c4665..6ce7728210a3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -122,7 +122,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: UserLicenseServiceAsyncClient: The constructed client. """ - return UserLicenseServiceClient.from_service_account_info.__func__(UserLicenseServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + UserLicenseServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(UserLicenseServiceAsyncClient, 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: UserLicenseServiceAsyncClient: The constructed client. """ - return UserLicenseServiceClient.from_service_account_file.__func__(UserLicenseServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + UserLicenseServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(UserLicenseServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -176,7 +182,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return UserLicenseServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return UserLicenseServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> UserLicenseServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/client.py index 7ada0c39a667..6b489f39880b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -83,9 +83,7 @@ class UserLicenseServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[UserLicenseServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[UserLicenseServiceTransport]] _transport_registry["grpc"] = UserLicenseServiceGrpcTransport _transport_registry["grpc_asyncio"] = UserLicenseServiceGrpcAsyncIOTransport _transport_registry["rest"] = UserLicenseServiceRestTransport @@ -651,11 +649,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UserLicenseServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UserLicenseServiceClient._read_environment_variables() + ) self._client_cert_source = UserLicenseServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -690,8 +686,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UserLicenseServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/pagers.py index 5fbeea13004a..76b08b24d865 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/__init__.py index 39a4af2019a0..f6f6820dcb5c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import UserLicenseServiceRestInterceptor, UserLicenseServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[UserLicenseServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[UserLicenseServiceTransport]] _transport_registry["grpc"] = UserLicenseServiceGrpcTransport _transport_registry["grpc_asyncio"] = UserLicenseServiceGrpcAsyncIOTransport _transport_registry["rest"] = UserLicenseServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/base.py index ef0ae8a80c54..7a0c399209d9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import user_license_service @@ -224,7 +224,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc.py index 6623b0fe8af6..15c1c4876943 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import user_license_service @@ -392,12 +392,12 @@ def batch_update_user_licenses( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_user_licenses" not in self._stubs: - self._stubs[ - "batch_update_user_licenses" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.UserLicenseService/BatchUpdateUserLicenses", - request_serializer=user_license_service.BatchUpdateUserLicensesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["batch_update_user_licenses"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.UserLicenseService/BatchUpdateUserLicenses", + request_serializer=user_license_service.BatchUpdateUserLicensesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["batch_update_user_licenses"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc_asyncio.py index b3d4161debc7..044f9c0d47a4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import user_license_service @@ -401,12 +401,12 @@ def batch_update_user_licenses( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_user_licenses" not in self._stubs: - self._stubs[ - "batch_update_user_licenses" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.UserLicenseService/BatchUpdateUserLicenses", - request_serializer=user_license_service.BatchUpdateUserLicensesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["batch_update_user_licenses"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.UserLicenseService/BatchUpdateUserLicenses", + request_serializer=user_license_service.BatchUpdateUserLicensesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["batch_update_user_licenses"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest.py index 187eb13d4c9a..10725af4b2cc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -603,9 +603,7 @@ def __call__( """ - http_options = ( - _BaseUserLicenseServiceRestTransport._BaseBatchUpdateUserLicenses._get_http_options() - ) + http_options = _BaseUserLicenseServiceRestTransport._BaseBatchUpdateUserLicenses._get_http_options() request, metadata = self._interceptor.pre_batch_update_user_licenses( request, metadata @@ -758,9 +756,7 @@ def __call__( """ - http_options = ( - _BaseUserLicenseServiceRestTransport._BaseListUserLicenses._get_http_options() - ) + http_options = _BaseUserLicenseServiceRestTransport._BaseListUserLicenses._get_http_options() request, metadata = self._interceptor.pre_list_user_licenses( request, metadata @@ -860,7 +856,9 @@ def batch_update_user_licenses( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchUpdateUserLicenses(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateUserLicenses( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_user_licenses( @@ -929,9 +927,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseUserLicenseServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseUserLicenseServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1052,9 +1048,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseUserLicenseServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseUserLicenseServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseUserLicenseServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1193,9 +1187,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseUserLicenseServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseUserLicenseServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseUserLicenseServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/__init__.py index 3f1ce1433670..0dfa5d6c1265 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/__init__.py @@ -13,15 +13,25 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .answer import Answer -from .assist_answer import AssistAnswer, AssistantContent, AssistantGroundedContent -from .assistant import Assistant +from .answer import ( + Answer, +) +from .assist_answer import ( + AssistAnswer, + AssistantContent, + AssistantGroundedContent, +) +from .assistant import ( + Assistant, +) from .assistant_service import ( AssistUserMetadata, StreamAssistRequest, StreamAssistResponse, ) -from .chunk import Chunk +from .chunk import ( + Chunk, +) from .cmek_config_service import ( CmekConfig, DeleteCmekConfigMetadata, @@ -47,9 +57,18 @@ SolutionType, UserInfo, ) -from .completion import CompletionSuggestion, SuggestionDenyListEntry -from .completion_service import CompleteQueryRequest, CompleteQueryResponse -from .control import Condition, Control +from .completion import ( + CompletionSuggestion, + SuggestionDenyListEntry, +) +from .completion_service import ( + CompleteQueryRequest, + CompleteQueryResponse, +) +from .control import ( + Condition, + Control, +) from .control_service import ( CreateControlRequest, DeleteControlRequest, @@ -84,7 +103,9 @@ UpdateConversationRequest, UpdateSessionRequest, ) -from .custom_tuning_model import CustomTuningModel +from .custom_tuning_model import ( + CustomTuningModel, +) from .data_store import ( AdvancedSiteSearchConfig, DataStore, @@ -101,8 +122,12 @@ ListDataStoresResponse, UpdateDataStoreRequest, ) -from .document import Document -from .document_processing_config import DocumentProcessingConfig +from .document import ( + Document, +) +from .document_processing_config import ( + DocumentProcessingConfig, +) from .document_service import ( BatchGetDocumentsMetadataRequest, BatchGetDocumentsMetadataResponse, @@ -113,7 +138,9 @@ ListDocumentsResponse, UpdateDocumentRequest, ) -from .engine import Engine +from .engine import ( + Engine, +) from .engine_service import ( CreateEngineMetadata, CreateEngineRequest, @@ -132,8 +159,14 @@ GenerateGroundedContentResponse, GroundedGenerationContent, ) -from .grounding import FactChunk, GroundingFact -from .identity_mapping_store import IdentityMappingEntry, IdentityMappingStore +from .grounding import ( + FactChunk, + GroundingFact, +) +from .identity_mapping_store import ( + IdentityMappingEntry, + IdentityMappingStore, +) from .identity_mapping_store_service import ( CreateIdentityMappingStoreRequest, DeleteIdentityMappingStoreMetadata, @@ -172,8 +205,13 @@ ImportUserEventsResponse, SpannerSource, ) -from .project import Project -from .project_service import ProvisionProjectMetadata, ProvisionProjectRequest +from .project import ( + Project, +) +from .project_service import ( + ProvisionProjectMetadata, + ProvisionProjectRequest, +) from .purge_config import ( PurgeCompletionSuggestionsMetadata, PurgeCompletionSuggestionsRequest, @@ -189,10 +227,22 @@ PurgeUserEventsRequest, PurgeUserEventsResponse, ) -from .rank_service import RankingRecord, RankRequest, RankResponse -from .recommendation_service import RecommendRequest, RecommendResponse -from .safety import HarmCategory, SafetyRating -from .schema import Schema +from .rank_service import ( + RankingRecord, + RankRequest, + RankResponse, +) +from .recommendation_service import ( + RecommendRequest, + RecommendResponse, +) +from .safety import ( + HarmCategory, + SafetyRating, +) +from .schema import ( + Schema, +) from .schema_service import ( CreateSchemaMetadata, CreateSchemaRequest, @@ -204,7 +254,10 @@ UpdateSchemaMetadata, UpdateSchemaRequest, ) -from .search_service import SearchRequest, SearchResponse +from .search_service import ( + SearchRequest, + SearchResponse, +) from .search_tuning_service import ( ListCustomModelsRequest, ListCustomModelsResponse, @@ -212,9 +265,16 @@ TrainCustomModelRequest, TrainCustomModelResponse, ) -from .serving_config import ServingConfig -from .serving_config_service import UpdateServingConfigRequest -from .session import Query, Session +from .serving_config import ( + ServingConfig, +) +from .serving_config_service import ( + UpdateServingConfigRequest, +) +from .session import ( + Query, + Session, +) from .site_search_engine import ( Sitemap, SiteSearchEngine, @@ -266,8 +326,13 @@ TransactionInfo, UserEvent, ) -from .user_event_service import CollectUserEventRequest, WriteUserEventRequest -from .user_license import UserLicense +from .user_event_service import ( + CollectUserEventRequest, + WriteUserEventRequest, +) +from .user_license import ( + UserLicense, +) from .user_license_service import ( BatchUpdateUserLicensesMetadata, BatchUpdateUserLicensesRequest, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/answer.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/answer.py index 3c25ba805728..12ad486b4592 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/answer.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/answer.py @@ -88,6 +88,7 @@ class State(proto.Enum): STREAMING (4): Answer generation is currently in progress. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -161,6 +162,7 @@ class AnswerSkippedReason(proto.Enum): is not answerable, the answer is not relevant to the query, or the answer is not well-formatted. """ + ANSWER_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_ANSWER_SEEKING_QUERY_IGNORED = 2 @@ -544,6 +546,7 @@ class State(proto.Enum): SUCCEEDED (3): Step has succeeded. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -772,6 +775,7 @@ class Type(proto.Enum): USER_DEFINED_CLASSIFICATION_QUERY (5): User defined query classification type. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assist_answer.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assist_answer.py index 3709ae87a66c..3bc4df748f5b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assist_answer.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assist_answer.py @@ -63,6 +63,7 @@ class State(proto.Enum): SKIPPED (4): Assist operation has been skipped. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -84,6 +85,7 @@ class AssistSkippedReason(proto.Enum): (e.g., the query or the answer contained a banned phrase). """ + ASSIST_SKIPPED_REASON_UNSPECIFIED = 0 NON_ASSIST_SEEKING_QUERY_IGNORED = 1 CUSTOMER_POLICY_VIOLATION = 2 @@ -253,6 +255,7 @@ class Outcome(proto.Enum): cancelled. There may or may not be a partial output present. """ + OUTCOME_UNSPECIFIED = 0 OUTCOME_OK = 1 OUTCOME_FAILED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/chunk.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/chunk.py index 86ec67ca18ef..040afd17ad77 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/chunk.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/chunk.py @@ -92,6 +92,7 @@ class StructureType(proto.Enum): CHECKBOX_STRUCTURE (3): Checkbox structure. """ + STRUCTURE_TYPE_UNSPECIFIED = 0 SHAREHOLDER_STRUCTURE = 1 SIGNATURE_STRUCTURE = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/cmek_config_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/cmek_config_service.py index f387d6f4fd56..bada27c7bcc4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/cmek_config_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/cmek_config_service.py @@ -156,6 +156,7 @@ class State(proto.Enum): The KMS key is soft deleted. Some cleanup policy will eventually be applied. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -179,6 +180,7 @@ class NotebookLMState(proto.Enum): NOTEBOOK_LM_NOT_ENABLED (3): The NotebookLM is not enabled. """ + NOTEBOOK_LM_STATE_UNSPECIFIED = 0 NOTEBOOK_LM_NOT_READY = 1 NOTEBOOK_LM_READY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/common.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/common.py index ee09c5fad591..be1a0a5ae4dd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/common.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/common.py @@ -53,6 +53,7 @@ class IndustryVertical(proto.Enum): HEALTHCARE_FHIR (7): The healthcare FHIR vertical. """ + INDUSTRY_VERTICAL_UNSPECIFIED = 0 GENERIC = 1 MEDIA = 2 @@ -78,6 +79,7 @@ class SolutionType(proto.Enum): data stores must enrolled with ``SOLUTION_TYPE_CHAT`` solution. """ + SOLUTION_TYPE_UNSPECIFIED = 0 SOLUTION_TYPE_RECOMMENDATION = 1 SOLUTION_TYPE_SEARCH = 2 @@ -100,6 +102,7 @@ class SearchUseCase(proto.Enum): Browse use case. Expects the traffic has an empty [query][google.cloud.discoveryengine.v1.SearchRequest.query]. """ + SEARCH_USE_CASE_UNSPECIFIED = 0 SEARCH_USE_CASE_SEARCH = 1 SEARCH_USE_CASE_BROWSE = 2 @@ -119,6 +122,7 @@ class SearchTier(proto.Enum): SEARCH_TIER_ENTERPRISE (2): Enterprise tier. """ + SEARCH_TIER_UNSPECIFIED = 0 SEARCH_TIER_STANDARD = 1 SEARCH_TIER_ENTERPRISE = 2 @@ -134,6 +138,7 @@ class SearchAddOn(proto.Enum): SEARCH_ADD_ON_LLM (1): Large language model add-on. """ + SEARCH_ADD_ON_UNSPECIFIED = 0 SEARCH_ADD_ON_LLM = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion.py index f7f45960f38e..3a07432eb602 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion.py @@ -54,6 +54,7 @@ class MatchOperator(proto.Enum): CONTAINS (2): If the suggestion contains the block_phrase, then block it. """ + MATCH_OPERATOR_UNSPECIFIED = 0 EXACT_MATCH = 1 CONTAINS = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control.py index 9eb7fb217c7d..0bc1a527a64d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control.py @@ -282,6 +282,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. For example, ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -298,6 +299,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversation.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversation.py index 37752b7196e6..9104da481710 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversation.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversation.py @@ -68,6 +68,7 @@ class State(proto.Enum): COMPLETED (2): Conversation has been completed. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 COMPLETED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversational_search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversational_search_service.py index aad34b52e1c8..7861e1e5e032 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversational_search_service.py @@ -20,8 +20,8 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import answer as gcd_answer +from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import safety, search_service from google.cloud.discoveryengine_v1.types import session as gcd_session @@ -197,12 +197,12 @@ class ConverseConversationResponse(proto.Message): number=2, message=gcd_conversation.Conversation, ) - search_results: MutableSequence[ - search_service.SearchResponse.SearchResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=search_service.SearchResponse.SearchResult, + search_results: MutableSequence[search_service.SearchResponse.SearchResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=search_service.SearchResponse.SearchResult, + ) ) @@ -502,6 +502,7 @@ class HarmBlockThreshold(proto.Enum): OFF (5): Turn off the safety filter. """ + HARM_BLOCK_THRESHOLD_UNSPECIFIED = 0 BLOCK_LOW_AND_ABOVE = 1 BLOCK_MEDIUM_AND_ABOVE = 2 @@ -573,6 +574,7 @@ class FilteringLevel(proto.Enum): FILTERING_LEVEL_HIGH (2): Filter answers based on a high threshold. """ + FILTERING_LEVEL_UNSPECIFIED = 0 FILTERING_LEVEL_LOW = 1 FILTERING_LEVEL_HIGH = 2 @@ -1095,6 +1097,7 @@ class Type(proto.Enum): USER_DEFINED_CLASSIFICATION_QUERY (5): User defined query classification type. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 @@ -1150,6 +1153,7 @@ class ModelType(proto.Enum): Large query rephraser model. Gemini 1.0 Pro model. """ + MODEL_TYPE_UNSPECIFIED = 0 SMALL = 1 LARGE = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/custom_tuning_model.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/custom_tuning_model.py index 124abaa9c6b9..708ad455753e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/custom_tuning_model.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/custom_tuning_model.py @@ -83,6 +83,7 @@ class ModelState(proto.Enum): Input data validation failed. Model training didn't start. """ + MODEL_STATE_UNSPECIFIED = 0 TRAINING_PAUSED = 1 TRAINING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store.py index 3b3407b0a6ce..9da99073008b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store.py @@ -20,11 +20,10 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.discoveryengine_v1.types import cmek_config_service, common, schema from google.cloud.discoveryengine_v1.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1.types import cmek_config_service, common -from google.cloud.discoveryengine_v1.types import schema __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -178,6 +177,7 @@ class ContentConfig(proto.Enum): workspace data store are specified in the [WorkspaceConfig][google.cloud.discoveryengine.v1.WorkspaceConfig]. """ + CONTENT_CONFIG_UNSPECIFIED = 0 NO_CONTENT = 1 CONTENT_REQUIRED = 2 @@ -376,6 +376,7 @@ class Mode(proto.Enum): Natural Language Query Understanding is enabled. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -432,6 +433,7 @@ class Type(proto.Enum): GOOGLE_PEOPLE (8): Workspace Data Store contains People data """ + TYPE_UNSPECIFIED = 0 GOOGLE_DRIVE = 1 GOOGLE_MAIL = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document.py index ac8ef9e15c23..394d09fcdc41 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document.py @@ -226,12 +226,12 @@ class AccessRestriction(proto.Message): number=2, ) - readers: MutableSequence[ - "Document.AclInfo.AccessRestriction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.AclInfo.AccessRestriction", + readers: MutableSequence["Document.AclInfo.AccessRestriction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.AclInfo.AccessRestriction", + ) ) class IndexStatus(proto.Message): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_service.py index 9524558cba34..973d9939e895 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_service.py @@ -391,6 +391,7 @@ class State(proto.Enum): The [Document][google.cloud.discoveryengine.v1.Document] is not indexed. """ + STATE_UNSPECIFIED = 0 INDEXED = 1 NOT_IN_TARGET_SITE = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine.py index 80e89fa33f4c..c63025765bb9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine.py @@ -229,6 +229,7 @@ class TrainingState(proto.Enum): TRAINING (2): The engine is training. """ + TRAINING_STATE_UNSPECIFIED = 0 PAUSED = 1 TRAINING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounded_generation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounded_generation_service.py index 31c733582e6a..07ca656f8cbc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounded_generation_service.py @@ -258,6 +258,7 @@ class Version(proto.Enum): The V1 model which is evaluating each source independently. """ + VERSION_UNSPECIFIED = 0 V1_INDEPENDENT = 1 @@ -325,12 +326,12 @@ class InlineSource(proto.Message): author of the content). """ - grounding_facts: MutableSequence[ - grounding.GroundingFact - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=grounding.GroundingFact, + grounding_facts: MutableSequence[grounding.GroundingFact] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=grounding.GroundingFact, + ) ) attributes: MutableMapping[str, str] = proto.MapField( proto.STRING, @@ -558,6 +559,7 @@ class Source(proto.Enum): GOOGLE_MAPS (4): Google Maps. """ + SOURCE_UNSPECIFIED = 0 VERTEX_AI_SEARCH = 1 GOOGLE_SEARCH = 3 @@ -620,6 +622,7 @@ class Version(proto.Enum): The V1 model which is evaluating each source independently. """ + VERSION_UNSPECIFIED = 0 V1_INDEPENDENT = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/import_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/import_config.py index 26044c39631c..a1fcc7e2dbf2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/import_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/import_config.py @@ -278,6 +278,7 @@ class Type(proto.Enum): JSON (7): JSON type. """ + TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -298,6 +299,7 @@ class Encoding(proto.Enum): BINARY (2): Binary encoding. """ + ENCODING_UNSPECIFIED = 0 TEXT = 1 BINARY = 2 @@ -346,12 +348,12 @@ class BigtableColumnFamily(proto.Message): number=3, enum="BigtableOptions.Type", ) - columns: MutableSequence[ - "BigtableOptions.BigtableColumn" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="BigtableOptions.BigtableColumn", + columns: MutableSequence["BigtableOptions.BigtableColumn"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="BigtableOptions.BigtableColumn", + ) ) class BigtableColumn(proto.Message): @@ -1056,6 +1058,7 @@ class ReconciliationMode(proto.Enum): deleted if they are not present in the source location. """ + RECONCILIATION_MODE_UNSPECIFIED = 0 INCREMENTAL = 1 FULL = 2 @@ -1237,12 +1240,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - entries: MutableSequence[ - completion.SuggestionDenyListEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.SuggestionDenyListEntry, + entries: MutableSequence[completion.SuggestionDenyListEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.SuggestionDenyListEntry, + ) ) inline_source: InlineSource = proto.Field( @@ -1365,12 +1368,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - suggestions: MutableSequence[ - completion.CompletionSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.CompletionSuggestion, + suggestions: MutableSequence[completion.CompletionSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.CompletionSuggestion, + ) ) inline_source: InlineSource = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project.py index 4966eb0f0c2b..7e9c020cf37d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project.py @@ -98,6 +98,7 @@ class State(proto.Enum): The project has declined or revoked the agreement to terms of service. """ + STATE_UNSPECIFIED = 0 TERMS_ACCEPTED = 1 TERMS_PENDING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/safety.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/safety.py index 19274c56b9f2..6691a56fee8c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/safety.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/safety.py @@ -46,6 +46,7 @@ class HarmCategory(proto.Enum): HARM_CATEGORY_CIVIC_INTEGRITY (5): The harm category is civic integrity. """ + HARM_CATEGORY_UNSPECIFIED = 0 HARM_CATEGORY_HATE_SPEECH = 1 HARM_CATEGORY_DANGEROUS_CONTENT = 2 @@ -90,6 +91,7 @@ class HarmProbability(proto.Enum): HIGH (4): High level of harm. """ + HARM_PROBABILITY_UNSPECIFIED = 0 NEGLIGIBLE = 1 LOW = 2 @@ -111,6 +113,7 @@ class HarmSeverity(proto.Enum): HARM_SEVERITY_HIGH (4): High level of harm severity. """ + HARM_SEVERITY_UNSPECIFIED = 0 HARM_SEVERITY_NEGLIGIBLE = 1 HARM_SEVERITY_LOW = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_service.py index 4a1105ede641..c85a6b516e5a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_service.py @@ -475,6 +475,7 @@ class RankingExpressionBackend(proto.Enum): RANK_BY_FORMULA (4): Ranking by custom formula. """ + RANKING_EXPRESSION_BACKEND_UNSPECIFIED = 0 BYOE = 1 CLEARBOX = 2 @@ -499,6 +500,7 @@ class RelevanceThreshold(proto.Enum): HIGH (4): High relevance threshold. """ + RELEVANCE_THRESHOLD_UNSPECIFIED = 0 LOWEST = 1 LOW = 2 @@ -866,6 +868,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. For example, ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -882,6 +885,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -991,6 +995,7 @@ class Condition(proto.Enum): Automatic query expansion built by the Search API. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 AUTO = 2 @@ -1034,6 +1039,7 @@ class Mode(proto.Enum): Search API. Search will be based on the corrected query if found. """ + MODE_UNSPECIFIED = 0 SUGGESTION_ONLY = 1 AUTO = 2 @@ -1083,6 +1089,7 @@ class SearchResultMode(proto.Enum): [DocumentProcessingConfig.chunking_config][google.cloud.discoveryengine.v1.DocumentProcessingConfig.chunking_config] is specified. """ + SEARCH_RESULT_MODE_UNSPECIFIED = 0 DOCUMENTS = 1 CHUNKS = 2 @@ -1495,6 +1502,7 @@ class FilterExtractionCondition(proto.Enum): ENABLED (2): Enables NL filter extraction. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1520,6 +1528,7 @@ class ExtractedFilterBehavior(proto.Enum): Results that pass the filters will be boosted up to higher ranks in the result set. """ + EXTRACTED_FILTER_BEHAVIOR_UNSPECIFIED = 0 HARD_FILTER = 1 SOFT_BOOST = 2 @@ -1529,11 +1538,11 @@ class ExtractedFilterBehavior(proto.Enum): number=1, enum="SearchRequest.NaturalLanguageQueryUnderstandingSpec.FilterExtractionCondition", ) - geo_search_query_detection_field_names: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=2, + geo_search_query_detection_field_names: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=2, + ) ) extracted_filter_behavior: "SearchRequest.NaturalLanguageQueryUnderstandingSpec.ExtractedFilterBehavior" = proto.Field( proto.ENUM, @@ -1573,6 +1582,7 @@ class Condition(proto.Enum): ideal for single-API implementations (e.g., debouncing). """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1606,6 +1616,7 @@ class MatchHighlightingCondition(proto.Enum): MATCH_HIGHLIGHTING_ENABLED (2): Enables match highlighting on all documents. """ + MATCH_HIGHLIGHTING_CONDITION_UNSPECIFIED = 0 MATCH_HIGHLIGHTING_DISABLED = 1 MATCH_HIGHLIGHTING_ENABLED = 2 @@ -1655,6 +1666,7 @@ class Mode(proto.Enum): DEMOTE_CROWDED_RESULTS_TO_END (2): Demote crowded results to the later pages. """ + MODE_UNSPECIFIED = 0 DROP_CROWDED_RESULTS = 1 DEMOTE_CROWDED_RESULTS_TO_END = 2 @@ -1985,6 +1997,7 @@ class SemanticState(proto.Enum): Semantic search was enabled for this search response. """ + SEMANTIC_STATE_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -2207,12 +2220,12 @@ class FacetValue(proto.Message): proto.STRING, number=1, ) - values: MutableSequence[ - "SearchResponse.Facet.FacetValue" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="SearchResponse.Facet.FacetValue", + values: MutableSequence["SearchResponse.Facet.FacetValue"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="SearchResponse.Facet.FacetValue", + ) ) dynamic_facet: bool = proto.Field( proto.BOOL, @@ -2306,6 +2319,7 @@ class SummarySkippedReason(proto.Enum): Google skips the summary if the time out. """ + SUMMARY_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_SUMMARY_SEEKING_QUERY_IGNORED = 2 @@ -2350,12 +2364,12 @@ class CitationMetadata(proto.Message): Citations for segments. """ - citations: MutableSequence[ - "SearchResponse.Summary.Citation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SearchResponse.Summary.Citation", + citations: MutableSequence["SearchResponse.Summary.Citation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SearchResponse.Summary.Citation", + ) ) class Citation(proto.Message): @@ -2379,12 +2393,12 @@ class Citation(proto.Message): proto.INT64, number=2, ) - sources: MutableSequence[ - "SearchResponse.Summary.CitationSource" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.CitationSource", + sources: MutableSequence["SearchResponse.Summary.CitationSource"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.CitationSource", + ) ) class CitationSource(proto.Message): @@ -2482,12 +2496,12 @@ class SummaryWithMetadata(proto.Message): number=2, message="SearchResponse.Summary.CitationMetadata", ) - references: MutableSequence[ - "SearchResponse.Summary.Reference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.Reference", + references: MutableSequence["SearchResponse.Summary.Reference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.Reference", + ) ) summary_text: str = proto.Field( @@ -2637,6 +2651,7 @@ class Comparison(proto.Enum): GREATER_THAN (5): Denotes greater than ``>`` operator. """ + COMPARISON_UNSPECIFIED = 0 EQUALS = 1 LESS_THAN_EQUALS = 2 @@ -2916,12 +2931,12 @@ def raw_page(self): number=19, message=SessionInfo, ) - search_link_promotions: MutableSequence[ - common.SearchLinkPromotion - ] = proto.RepeatedField( - proto.MESSAGE, - number=23, - message=common.SearchLinkPromotion, + search_link_promotions: MutableSequence[common.SearchLinkPromotion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=23, + message=common.SearchLinkPromotion, + ) ) semantic_state: SemanticState = proto.Field( proto.ENUM, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_tuning_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_tuning_service.py index 14128efa7b90..be111fdb0007 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_tuning_service.py @@ -65,12 +65,12 @@ class ListCustomModelsResponse(proto.Message): List of custom tuning models. """ - models: MutableSequence[ - custom_tuning_model.CustomTuningModel - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=custom_tuning_model.CustomTuningModel, + models: MutableSequence[custom_tuning_model.CustomTuningModel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=custom_tuning_model.CustomTuningModel, + ) ) diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session.py index c2fbfea66277..6467d8a939d2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session.py @@ -73,6 +73,7 @@ class State(proto.Enum): IN_PROGRESS (1): The session is currently open. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine.py index 0af23da38e14..62d50a7e5591 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine.py @@ -103,6 +103,7 @@ class Type(proto.Enum): EXCLUDE (2): Exclude the target site. """ + TYPE_UNSPECIFIED = 0 INCLUDE = 1 EXCLUDE = 2 @@ -135,6 +136,7 @@ class IndexingStatus(proto.Enum): CANCELLED (6): The target site change is cancelled. """ + INDEXING_STATUS_UNSPECIFIED = 0 PENDING = 1 FAILED = 2 @@ -251,6 +253,7 @@ class SiteVerificationState(proto.Enum): Site exempt from verification, e.g., a public website that opens to all. """ + SITE_VERIFICATION_STATE_UNSPECIFIED = 0 VERIFIED = 1 UNVERIFIED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine_service.py index eeb81b405ffd..20a22dc2f146 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine_service.py @@ -371,12 +371,12 @@ class ListTargetSitesResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -424,12 +424,12 @@ class BatchCreateTargetSitesResponse(proto.Message): TargetSites created. """ - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) @@ -829,6 +829,7 @@ class CorpusType(proto.Enum): Denotes a crawling attempt for the mobile version of a page. """ + CORPUS_TYPE_UNSPECIFIED = 0 DESKTOP = 1 MOBILE = 2 @@ -1084,12 +1085,12 @@ class FetchDomainVerificationStatusResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license.py index 4414ab35aa16..4026316e1eba 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license.py @@ -84,6 +84,7 @@ class LicenseAssignmentState(proto.Enum): cannot get license assigned will be assigned NO_LICENSE state(License could be unassigned by admin). """ + LICENSE_ASSIGNMENT_STATE_UNSPECIFIED = 0 ASSIGNED = 1 UNASSIGNED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/__init__.py index f0a8f6bae06d..96aac6493ce2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.acl_config_service import ( AclConfigServiceAsyncClient, AclConfigServiceClient, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/gapic_version.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/gapic_version.py index be6c08cee3cf..e0c1fcd503d9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/gapic_version.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.16.0" # {x-release-please-version} +__version__ = "0.17.0" # {x-release-please-version} diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/async_client.py index d035bf351f59..ceba61a2cf62 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -119,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AclConfigServiceAsyncClient: The constructed client. """ - return AclConfigServiceClient.from_service_account_info.__func__(AclConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AclConfigServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AclConfigServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AclConfigServiceAsyncClient: The constructed client. """ - return AclConfigServiceClient.from_service_account_file.__func__(AclConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AclConfigServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AclConfigServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/client.py index 13fab280986f..91736c1b5c07 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -84,9 +84,7 @@ class AclConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AclConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AclConfigServiceTransport]] _transport_registry["grpc"] = AclConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = AclConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = AclConfigServiceRestTransport @@ -625,11 +623,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AclConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AclConfigServiceClient._read_environment_variables() + ) self._client_cert_source = AclConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +660,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AclConfigServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/base.py index 44390077ff35..cedd0381f98c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import acl_config, acl_config_service @@ -216,7 +216,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc.py index 43d56bd1e0cd..690f9177c77b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import acl_config, acl_config_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc_asyncio.py index 3cdaf8d90c3a..4360f2c52f9c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import acl_config, acl_config_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest.py index 546972609cc5..1384e40ffc6d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -556,9 +556,7 @@ def __call__( Access Control Configuration. """ - http_options = ( - _BaseAclConfigServiceRestTransport._BaseUpdateAclConfig._get_http_options() - ) + http_options = _BaseAclConfigServiceRestTransport._BaseUpdateAclConfig._get_http_options() request, metadata = self._interceptor.pre_update_acl_config( request, metadata @@ -725,9 +723,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAclConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAclConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -987,9 +983,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAclConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAclConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAclConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/async_client.py index 3b270f6f1071..3c36e6d33fd5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.chunk_service import pagers from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service @@ -118,7 +118,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ChunkServiceAsyncClient: The constructed client. """ - return ChunkServiceClient.from_service_account_info.__func__(ChunkServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ChunkServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ChunkServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +137,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ChunkServiceAsyncClient: The constructed client. """ - return ChunkServiceClient.from_service_account_file.__func__(ChunkServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ChunkServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ChunkServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/client.py index fe8b7ce09061..675ff0ed9644 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.chunk_service import pagers from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service @@ -657,11 +657,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ChunkServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ChunkServiceClient._read_environment_variables() + ) self._client_cert_source = ChunkServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -696,8 +694,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ChunkServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/pagers.py index d149f9181cf4..5190cc5840d4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/base.py index 5d30ffaf1b4d..c336bae22563 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service @@ -218,7 +218,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc.py index 46433ded4f84..ca6d1de32de6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc_asyncio.py index 5698a2ab1916..0875a3d6df2d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest.py index 1a05ebd9eaeb..e0a991595fb3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/async_client.py index 4f37ec8e82ef..c117654ed551 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -121,7 +121,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_info.__func__(CompletionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CompletionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CompletionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +140,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_file.__func__(CompletionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CompletionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CompletionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/client.py index c6cc04f0e0ca..13d60b45a582 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -86,9 +86,7 @@ class CompletionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CompletionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CompletionServiceTransport]] _transport_registry["grpc"] = CompletionServiceGrpcTransport _transport_registry["grpc_asyncio"] = CompletionServiceGrpcAsyncIOTransport _transport_registry["rest"] = CompletionServiceRestTransport @@ -632,11 +630,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CompletionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CompletionServiceClient._read_environment_variables() + ) self._client_cert_source = CompletionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -671,8 +667,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CompletionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/base.py index 338a6ae926ab..4397648dd17a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import ( @@ -270,7 +270,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc.py index e45e1cf97665..7ea49500c0d4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( completion_service, @@ -398,12 +398,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -431,12 +431,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -463,12 +463,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -495,12 +495,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc_asyncio.py index 7959c031d026..66deca2f1c41 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( completion_service, @@ -407,12 +407,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -441,12 +441,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -474,12 +474,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -507,12 +507,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest.py index 8e5cbbd44292..f37365589020 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -765,9 +765,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() request, metadata = self._interceptor.pre_complete_query(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_transcoded_request( @@ -919,9 +917,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_import_completion_suggestions( request, metadata @@ -988,11 +984,10 @@ def __call__( resp = self._interceptor.post_import_completion_suggestions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_completion_suggestions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_completion_suggestions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1081,15 +1076,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_import_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_import_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1153,11 +1145,10 @@ def __call__( resp = self._interceptor.post_import_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1244,9 +1235,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_purge_completion_suggestions( request, metadata @@ -1401,15 +1390,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_purge_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_purge_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1473,11 +1459,10 @@ def __call__( resp = self._interceptor.post_purge_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1521,7 +1506,9 @@ def import_completion_suggestions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._ImportCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_suggestion_deny_list_entries( @@ -1531,7 +1518,9 @@ def import_suggestion_deny_list_entries( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._ImportSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_completion_suggestions( @@ -1541,7 +1530,9 @@ def purge_completion_suggestions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PurgeCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_suggestion_deny_list_entries( @@ -1551,7 +1542,9 @@ def purge_suggestion_deny_list_entries( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PurgeSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -1609,9 +1602,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1731,9 +1722,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1872,9 +1861,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/async_client.py index b7d1a77cff3a..df0da30b48fb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,15 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.control_service import pagers -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import common, control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service from .client import ControlServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport @@ -126,7 +124,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_info.__func__(ControlServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ControlServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ControlServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_file.__func__(ControlServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ControlServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ControlServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/client.py index 72c85a775822..230553ce1773 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,15 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.control_service import pagers -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import common, control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport from .transports.grpc import ControlServiceGrpcTransport @@ -85,9 +83,7 @@ class ControlServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ControlServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ControlServiceTransport]] _transport_registry["grpc"] = ControlServiceGrpcTransport _transport_registry["grpc_asyncio"] = ControlServiceGrpcAsyncIOTransport _transport_registry["rest"] = ControlServiceRestTransport @@ -655,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ControlServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ControlServiceClient._read_environment_variables() + ) self._client_cert_source = ControlServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ControlServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/pagers.py index 4fdfefa8c941..16384256b24a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/base.py index b12e41f8a1d1..2703ee92ec4e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/base.py @@ -17,21 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -264,7 +263,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc.py index ce1a058777fd..5f6c6044992a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc.py @@ -16,24 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc_asyncio.py index 7e67a75b53d5..5d3090593277 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,16 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport from .grpc import ControlServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest.py index 68928dec33ea..57cae66c0172 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,14 +28,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseControlServiceRestTransport @@ -1295,9 +1294,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest_base.py index ccdfa689c983..d2ca1b8a6fed 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest_base.py @@ -17,15 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/async_client.py index 93a840e665f4..1ce86cdeec12 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,22 +44,22 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.conversational_search_service import ( pagers, ) from google.cloud.discoveryengine_v1alpha.types import ( + answer, + conversation, conversational_search_service, search_service, + session, ) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import answer -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from .client import ConversationalSearchServiceClient @@ -164,7 +164,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_info.__func__(ConversationalSearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConversationalSearchServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + ConversationalSearchServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -180,7 +185,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_file.__func__(ConversationalSearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConversationalSearchServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + ConversationalSearchServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -218,7 +228,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationalSearchServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/client.py index fcffb4436f52..b4446bcfa866 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,22 +61,22 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.conversational_search_service import ( pagers, ) from google.cloud.discoveryengine_v1alpha.types import ( + answer, + conversation, conversational_search_service, search_service, + session, ) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import answer -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from .transports.base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport @@ -93,13 +93,11 @@ class ConversationalSearchServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationalSearchServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = ConversationalSearchServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + ConversationalSearchServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = ConversationalSearchServiceRestTransport def get_transport_class( @@ -797,11 +795,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationalSearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationalSearchServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConversationalSearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -838,8 +834,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationalSearchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/pagers.py index b6329666a180..3d50c1f24914 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -233,7 +233,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/__init__.py index 855e35aad0c0..234e039d4add 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationalSearchServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConversationalSearchServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConversationalSearchServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/base.py index eba5a3dfcd26..c564d0802694 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha import gapic_version as package_version +from google.cloud.discoveryengine_v1alpha.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import answer -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -388,7 +390,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc.py index 94cef2dba925..c565de9a8d36 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import answer -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc_asyncio.py index 3fc2e84968c0..7524be43cabd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,18 +31,16 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import answer -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest.py index 6f2e119c6355..8eb38647eaa8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,16 +28,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1alpha.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import answer -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -977,9 +979,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() request, metadata = self._interceptor.pre_answer_query(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_transcoded_request( @@ -1139,9 +1139,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() request, metadata = self._interceptor.pre_converse_conversation( request, metadata @@ -1299,9 +1297,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1452,9 +1448,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() request, metadata = self._interceptor.pre_create_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_transcoded_request( @@ -1601,9 +1595,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -1710,9 +1702,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() request, metadata = self._interceptor.pre_delete_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_transcoded_request( @@ -1823,9 +1813,7 @@ def __call__( Defines an answer. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() request, metadata = self._interceptor.pre_get_answer(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_transcoded_request( @@ -1972,9 +1960,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -2121,9 +2107,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() request, metadata = self._interceptor.pre_get_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_transcoded_request( @@ -2270,9 +2254,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2421,9 +2403,7 @@ def __call__( Response for ListSessions method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() request, metadata = self._interceptor.pre_list_sessions(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_transcoded_request( @@ -2576,9 +2556,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() request, metadata = self._interceptor.pre_update_conversation( request, metadata @@ -2729,9 +2707,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() request, metadata = self._interceptor.pre_update_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_transcoded_request( @@ -3015,9 +2991,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3140,9 +3114,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3283,9 +3255,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest_base.py index ad13c4a27ea8..9c4c513525c0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import answer -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/async_client.py index 62f4ec89841e..7ca137f76370 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -46,22 +46,24 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.data_store_service import pagers +from google.cloud.discoveryengine_v1alpha.types import ( + common, + data_store, + data_store_service, + document_processing_config, + schema, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service -from google.cloud.discoveryengine_v1alpha.types import schema from .client import DataStoreServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport @@ -142,7 +144,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_info.__func__(DataStoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataStoreServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataStoreServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +163,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_file.__func__(DataStoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataStoreServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataStoreServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/client.py index 875bc5ca3afb..8551cd2c1488 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -63,22 +63,24 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.data_store_service import pagers +from google.cloud.discoveryengine_v1alpha.types import ( + common, + data_store, + data_store_service, + document_processing_config, + schema, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service -from google.cloud.discoveryengine_v1alpha.types import schema from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport from .transports.grpc import DataStoreServiceGrpcTransport @@ -94,9 +96,7 @@ class DataStoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataStoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataStoreServiceTransport]] _transport_registry["grpc"] = DataStoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataStoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataStoreServiceRestTransport @@ -711,11 +711,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataStoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataStoreServiceClient._read_environment_variables() + ) self._client_cert_source = DataStoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -750,8 +748,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataStoreServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/pagers.py index bf1af67548e6..685146234277 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/base.py index 388a7b6830d8..08c03b56c711 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/base.py @@ -17,24 +17,26 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version +from google.cloud.discoveryengine_v1alpha.types import ( + data_store, + data_store_service, + document_processing_config, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -306,7 +308,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc.py index 6b4a0fe42fa0..19a29af2ff9a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc.py @@ -16,27 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + data_store, + data_store_service, + document_processing_config, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport @@ -522,12 +524,12 @@ def get_document_processing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_document_processing_config" not in self._stubs: - self._stubs[ - "get_document_processing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DataStoreService/GetDocumentProcessingConfig", - request_serializer=data_store_service.GetDocumentProcessingConfigRequest.serialize, - response_deserializer=document_processing_config.DocumentProcessingConfig.deserialize, + self._stubs["get_document_processing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DataStoreService/GetDocumentProcessingConfig", + request_serializer=data_store_service.GetDocumentProcessingConfigRequest.serialize, + response_deserializer=document_processing_config.DocumentProcessingConfig.deserialize, + ) ) return self._stubs["get_document_processing_config"] @@ -562,12 +564,12 @@ def update_document_processing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_document_processing_config" not in self._stubs: - self._stubs[ - "update_document_processing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DataStoreService/UpdateDocumentProcessingConfig", - request_serializer=data_store_service.UpdateDocumentProcessingConfigRequest.serialize, - response_deserializer=gcd_document_processing_config.DocumentProcessingConfig.deserialize, + self._stubs["update_document_processing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DataStoreService/UpdateDocumentProcessingConfig", + request_serializer=data_store_service.UpdateDocumentProcessingConfigRequest.serialize, + response_deserializer=gcd_document_processing_config.DocumentProcessingConfig.deserialize, + ) ) return self._stubs["update_document_processing_config"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc_asyncio.py index be0a75a2844a..a7e0993e1559 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,18 +31,17 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + data_store, + data_store_service, + document_processing_config, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport from .grpc import DataStoreServiceGrpcTransport @@ -532,12 +534,12 @@ def get_document_processing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_document_processing_config" not in self._stubs: - self._stubs[ - "get_document_processing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DataStoreService/GetDocumentProcessingConfig", - request_serializer=data_store_service.GetDocumentProcessingConfigRequest.serialize, - response_deserializer=document_processing_config.DocumentProcessingConfig.deserialize, + self._stubs["get_document_processing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DataStoreService/GetDocumentProcessingConfig", + request_serializer=data_store_service.GetDocumentProcessingConfigRequest.serialize, + response_deserializer=document_processing_config.DocumentProcessingConfig.deserialize, + ) ) return self._stubs["get_document_processing_config"] @@ -572,12 +574,12 @@ def update_document_processing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_document_processing_config" not in self._stubs: - self._stubs[ - "update_document_processing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DataStoreService/UpdateDocumentProcessingConfig", - request_serializer=data_store_service.UpdateDocumentProcessingConfigRequest.serialize, - response_deserializer=gcd_document_processing_config.DocumentProcessingConfig.deserialize, + self._stubs["update_document_processing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DataStoreService/UpdateDocumentProcessingConfig", + request_serializer=data_store_service.UpdateDocumentProcessingConfigRequest.serialize, + response_deserializer=gcd_document_processing_config.DocumentProcessingConfig.deserialize, + ) ) return self._stubs["update_document_processing_config"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest.py index abb738d6d362..411dc4a9ca40 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest.py @@ -16,27 +16,29 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1alpha.types import ( + data_store, + data_store_service, + document_processing_config, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataStoreServiceRestTransport @@ -890,9 +892,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() request, metadata = self._interceptor.pre_create_data_store( request, metadata @@ -1045,9 +1045,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() request, metadata = self._interceptor.pre_delete_data_store( request, metadata @@ -1349,9 +1347,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseGetDocumentProcessingConfig._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseGetDocumentProcessingConfig._get_http_options() request, metadata = self._interceptor.pre_get_document_processing_config( request, metadata @@ -1415,11 +1411,10 @@ def __call__( resp = self._interceptor.post_get_document_processing_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_document_processing_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_document_processing_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1507,9 +1502,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() request, metadata = self._interceptor.pre_list_data_stores( request, metadata @@ -1661,9 +1654,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() request, metadata = self._interceptor.pre_update_data_store( request, metadata @@ -1825,9 +1816,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseUpdateDocumentProcessingConfig._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseUpdateDocumentProcessingConfig._get_http_options() request, metadata = self._interceptor.pre_update_document_processing_config( request, metadata @@ -1896,11 +1885,10 @@ def __call__( resp = self._interceptor.post_update_document_processing_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_document_processing_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_document_processing_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1966,7 +1954,9 @@ def get_document_processing_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetDocumentProcessingConfig(self._session, self._host, self._interceptor) # type: ignore + return self._GetDocumentProcessingConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_data_stores( @@ -1998,7 +1988,9 @@ def update_document_processing_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateDocumentProcessingConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDocumentProcessingConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -2056,9 +2048,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2318,9 +2308,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataStoreServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest_base.py index a651b272c3a3..18d42b365f04 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest_base.py @@ -22,13 +22,15 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1alpha.types import ( + data_store, + data_store_service, + document_processing_config, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/async_client.py index 17dfd00e0116..0ca03fcdde9a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -46,19 +46,19 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.document_service import pagers from google.cloud.discoveryengine_v1alpha.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document from .client import DocumentServiceClient @@ -134,7 +134,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_info.__func__(DocumentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DocumentServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DocumentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -150,7 +153,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_file.__func__(DocumentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DocumentServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DocumentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/client.py index 44964351a4b6..5090002c5738 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -63,19 +63,19 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.document_service import pagers from google.cloud.discoveryengine_v1alpha.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -92,9 +92,7 @@ class DocumentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] _transport_registry["grpc"] = DocumentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentServiceRestTransport @@ -691,11 +689,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -730,8 +726,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/pagers.py index a6d2f86a14a2..31e49e7cdbf9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/base.py index eb2180ba7391..603833a7777d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/base.py @@ -17,24 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -341,7 +341,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc.py index 38b393b679d0..4c53ec3ef7f0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc.py @@ -16,27 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -616,12 +616,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc_asyncio.py index e44060a23127..50adb6c7009c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,19 +31,15 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -634,12 +634,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest.py index 32ac86745b4c..a7f3adf0932b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest.py @@ -16,27 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.discoveryengine_v1alpha.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -955,9 +955,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() request, metadata = self._interceptor.pre_batch_get_documents_metadata( request, metadata @@ -1113,9 +1111,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() request, metadata = self._interceptor.pre_create_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_transcoded_request( @@ -1260,9 +1256,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() request, metadata = self._interceptor.pre_delete_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_transcoded_request( @@ -1525,9 +1519,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseGetProcessedDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseGetProcessedDocument._get_http_options() request, metadata = self._interceptor.pre_get_processed_document( request, metadata @@ -1675,9 +1667,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() request, metadata = self._interceptor.pre_import_documents( request, metadata @@ -1981,9 +1971,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() request, metadata = self._interceptor.pre_purge_documents(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_transcoded_request( @@ -2134,9 +2122,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() request, metadata = self._interceptor.pre_update_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_transcoded_request( @@ -2238,7 +2224,9 @@ def batch_get_documents_metadata( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchGetDocumentsMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._BatchGetDocumentsMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_document( @@ -2363,9 +2351,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2625,9 +2611,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest_base.py index a614793d5964..755d4b0f7a05 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest_base.py @@ -17,18 +17,18 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/async_client.py index 5d3f271c4415..d1c35b4be7d0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -46,17 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.engine_service import pagers -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import common, engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service from .client import EngineServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport @@ -128,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_info.__func__(EngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EngineServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EngineServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_file.__func__(EngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EngineServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EngineServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/client.py index b1c443cf1818..fa598f001590 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -63,17 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.engine_service import pagers -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import common, engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport from .transports.grpc import EngineServiceGrpcTransport @@ -657,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EngineServiceClient._read_environment_variables() + ) self._client_cert_source = EngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -696,8 +692,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/pagers.py index 50ef5dbbc624..0bad1d478b5d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/base.py index b67a19088c40..451a8ce6ce18 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -310,7 +309,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc.py index 804660e8de71..565fb01e454c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc_asyncio.py index e31cf83803e6..bd1a08c71af9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport from .grpc import EngineServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest.py index 03432fab6c21..0c37c8eabd6d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEngineServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest_base.py index 3ad4bdc6c541..89df4a29cd59 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/async_client.py index d7a7fb96c487..d19e3c8658d8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -119,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EstimateBillingServiceAsyncClient: The constructed client. """ - return EstimateBillingServiceClient.from_service_account_info.__func__(EstimateBillingServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EstimateBillingServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EstimateBillingServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +138,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EstimateBillingServiceAsyncClient: The constructed client. """ - return EstimateBillingServiceClient.from_service_account_file.__func__(EstimateBillingServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EstimateBillingServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + EstimateBillingServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -173,7 +181,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return EstimateBillingServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return EstimateBillingServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> EstimateBillingServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/client.py index 9b0c91f24b2d..6e70990a880a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -82,9 +82,7 @@ class EstimateBillingServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EstimateBillingServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EstimateBillingServiceTransport]] _transport_registry["grpc"] = EstimateBillingServiceGrpcTransport _transport_registry["grpc_asyncio"] = EstimateBillingServiceGrpcAsyncIOTransport _transport_registry["rest"] = EstimateBillingServiceRestTransport @@ -625,11 +623,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EstimateBillingServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EstimateBillingServiceClient._read_environment_variables() + ) self._client_cert_source = EstimateBillingServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +660,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EstimateBillingServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/__init__.py index 3a94a649d916..3c5e8b0ce3cc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[EstimateBillingServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[EstimateBillingServiceTransport]] _transport_registry["grpc"] = EstimateBillingServiceGrpcTransport _transport_registry["grpc_asyncio"] = EstimateBillingServiceGrpcAsyncIOTransport _transport_registry["rest"] = EstimateBillingServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/base.py index af03ce1f2ae2..8b3a0394d23f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service @@ -207,7 +207,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc.py index b8595639994d..1511693abd37 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc_asyncio.py index 81ab1944b72a..940de33439ee 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest.py index c56ddc899287..291156325f30 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -532,9 +532,7 @@ def __call__( """ - http_options = ( - _BaseEstimateBillingServiceRestTransport._BaseEstimateDataSize._get_http_options() - ) + http_options = _BaseEstimateBillingServiceRestTransport._BaseEstimateDataSize._get_http_options() request, metadata = self._interceptor.pre_estimate_data_size( request, metadata @@ -695,9 +693,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEstimateBillingServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseEstimateBillingServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -820,9 +816,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseEstimateBillingServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseEstimateBillingServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseEstimateBillingServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -961,9 +955,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseEstimateBillingServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseEstimateBillingServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseEstimateBillingServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/async_client.py index 747c9085d4c7..aba58e33d8b3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -46,15 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.evaluation_service import pagers +from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service from google.cloud.discoveryengine_v1alpha.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1alpha.types import evaluation -from google.cloud.discoveryengine_v1alpha.types import evaluation_service from .client import EvaluationServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport @@ -144,7 +143,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EvaluationServiceAsyncClient: The constructed client. """ - return EvaluationServiceClient.from_service_account_info.__func__(EvaluationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EvaluationServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EvaluationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -160,7 +162,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EvaluationServiceAsyncClient: The constructed client. """ - return EvaluationServiceClient.from_service_account_file.__func__(EvaluationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EvaluationServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EvaluationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/client.py index 4caa9185880c..9902123196f9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -63,15 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.evaluation_service import pagers +from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service from google.cloud.discoveryengine_v1alpha.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1alpha.types import evaluation -from google.cloud.discoveryengine_v1alpha.types import evaluation_service from .transports.base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport from .transports.grpc import EvaluationServiceGrpcTransport @@ -87,9 +86,7 @@ class EvaluationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EvaluationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EvaluationServiceTransport]] _transport_registry["grpc"] = EvaluationServiceGrpcTransport _transport_registry["grpc_asyncio"] = EvaluationServiceGrpcAsyncIOTransport _transport_registry["rest"] = EvaluationServiceRestTransport @@ -794,11 +791,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EvaluationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EvaluationServiceClient._read_environment_variables() + ) self._client_cert_source = EvaluationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -833,8 +828,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EvaluationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/pagers.py index daa00c99e2d8..9674263f1972 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/base.py index ab3f4c82ed02..66e3da41d100 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service @@ -255,7 +255,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc.py index 344488b60937..abe9bef6ecbf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc_asyncio.py index b35d2cf49836..9b67b710af3f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest.py index 6a3af1645805..247582add31f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -709,9 +709,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseCreateEvaluation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseCreateEvaluation._get_http_options() request, metadata = self._interceptor.pre_create_evaluation( request, metadata @@ -865,9 +863,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_evaluation(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_transcoded_request( @@ -1015,9 +1011,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListEvaluationResults._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListEvaluationResults._get_http_options() request, metadata = self._interceptor.pre_list_evaluation_results( request, metadata @@ -1173,9 +1167,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListEvaluations._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListEvaluations._get_http_options() request, metadata = self._interceptor.pre_list_evaluations( request, metadata @@ -1363,9 +1355,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1485,9 +1475,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1626,9 +1614,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/async_client.py index 0612b2bb6a49..3740033a93d7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -130,7 +130,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_info.__func__(GroundedGenerationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GroundedGenerationServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GroundedGenerationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +149,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_file.__func__(GroundedGenerationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GroundedGenerationServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + GroundedGenerationServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -184,7 +192,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GroundedGenerationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/client.py index 933f8ea0ca3a..e2284f1c9c4b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -83,9 +83,7 @@ class GroundedGenerationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GroundedGenerationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport @@ -631,11 +629,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GroundedGenerationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GroundedGenerationServiceClient._read_environment_variables() + ) self._client_cert_source = ( GroundedGenerationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -672,8 +668,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GroundedGenerationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/__init__.py index 0f3052cbd079..ec0eaca83aa8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GroundedGenerationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/base.py index 75f2969807a6..5758b88d33d4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import grounded_generation_service @@ -205,7 +205,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc.py index 641c6645ab89..6a93c5ba06b9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import grounded_generation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc_asyncio.py index fbd280c7e258..32f5a99fa861 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import grounded_generation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest.py index a13211031044..1eb5255ef26d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -364,9 +364,7 @@ def __call__( """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() request, metadata = self._interceptor.pre_check_grounding(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_transcoded_request( @@ -532,9 +530,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -657,9 +653,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -800,9 +794,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/async_client.py index 39176cf6265d..90b2132cffe2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -46,13 +46,12 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service from .client import ProjectServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ProjectServiceTransport @@ -122,7 +121,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_info.__func__(ProjectServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ProjectServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ProjectServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -138,7 +140,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_file.__func__(ProjectServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ProjectServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ProjectServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/client.py index ab08011f0f56..6f6a50731aeb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -63,13 +63,12 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service from .transports.base import DEFAULT_CLIENT_INFO, ProjectServiceTransport from .transports.grpc import ProjectServiceGrpcTransport @@ -85,9 +84,7 @@ class ProjectServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ProjectServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ProjectServiceTransport]] _transport_registry["grpc"] = ProjectServiceGrpcTransport _transport_registry["grpc_asyncio"] = ProjectServiceGrpcAsyncIOTransport _transport_registry["rest"] = ProjectServiceRestTransport @@ -622,11 +619,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProjectServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProjectServiceClient._read_environment_variables() + ) self._client_cert_source = ProjectServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -661,8 +656,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProjectServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/base.py index b618d29ff4c7..980aaa827b57 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -237,7 +236,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc.py index 08f815e86000..3f02be789d03 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service from .base import DEFAULT_CLIENT_INFO, ProjectServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc_asyncio.py index 4589504386c2..f745047a47bd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service from .base import DEFAULT_CLIENT_INFO, ProjectServiceTransport from .grpc import ProjectServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest.py index 5f97e5d8a3e6..5347c4252566 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseProjectServiceRestTransport @@ -794,9 +793,7 @@ def __call__( """ - http_options = ( - _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() request, metadata = self._interceptor.pre_provision_project( request, metadata @@ -948,9 +945,7 @@ def __call__( """ - http_options = ( - _BaseProjectServiceRestTransport._BaseReportConsentChange._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseReportConsentChange._get_http_options() request, metadata = self._interceptor.pre_report_consent_change( request, metadata @@ -1124,9 +1119,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest_base.py index adc8d22d3e57..6bd4ddcf0ad3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service from .base import DEFAULT_CLIENT_INFO, ProjectServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/async_client.py index 477f0ce1aec9..6e22b2f91e2c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_info.__func__(RankServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + RankServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(RankServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_file.__func__(RankServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + RankServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(RankServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/client.py index 51eff83719fe..4ad7eb0234c3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -620,11 +620,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RankServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RankServiceClient._read_environment_variables() + ) self._client_cert_source = RankServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -659,8 +657,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RankServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/base.py index 08c2e2d31db4..baae369fab4e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import rank_service @@ -202,7 +202,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc.py index 3473ec70e031..6d31de27a950 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import rank_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc_asyncio.py index 74f232c7fe0b..a179765257b6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import rank_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest.py index 5addf747c92e..b2f2cabb22ed 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/async_client.py index f8aaf7121b36..cd2572a50ff5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -127,7 +127,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_info.__func__(RecommendationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + RecommendationServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(RecommendationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +146,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_file.__func__(RecommendationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + RecommendationServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(RecommendationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +187,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return RecommendationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return RecommendationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> RecommendationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/client.py index 4245e9b5ae1c..67462f7442a5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -80,9 +80,7 @@ class RecommendationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RecommendationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport @@ -702,11 +700,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RecommendationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RecommendationServiceClient._read_environment_variables() + ) self._client_cert_source = RecommendationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -741,8 +737,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RecommendationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/__init__.py index f21f53c111bf..a09bbaaf4d43 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RecommendationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/base.py index 6f8d6fbda49e..8d3ef10867de 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import recommendation_service @@ -205,7 +205,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc.py index 422bf5d8587f..5a24c9e2674c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import recommendation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc_asyncio.py index c653d05e7799..76baf925f206 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import recommendation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest.py index 186cb85db951..1af2e9dfaccf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -358,9 +358,7 @@ def __call__( """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() request, metadata = self._interceptor.pre_recommend(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseRecommend._get_transcoded_request( @@ -522,9 +520,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -647,9 +643,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -788,9 +782,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/async_client.py index 9bb4767cb8b2..ee4bb2588382 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -46,16 +46,18 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.sample_query_service import pagers +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service from .client import SampleQueryServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport @@ -131,7 +133,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SampleQueryServiceAsyncClient: The constructed client. """ - return SampleQueryServiceClient.from_service_account_info.__func__(SampleQueryServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SampleQueryServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SampleQueryServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +152,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SampleQueryServiceAsyncClient: The constructed client. """ - return SampleQueryServiceClient.from_service_account_file.__func__(SampleQueryServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SampleQueryServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SampleQueryServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -185,7 +193,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SampleQueryServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SampleQueryServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SampleQueryServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/client.py index 94ad2bd0b99f..721f8c8536da 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -63,16 +63,18 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.sample_query_service import pagers +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service from .transports.base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport from .transports.grpc import SampleQueryServiceGrpcTransport @@ -88,9 +90,7 @@ class SampleQueryServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SampleQueryServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SampleQueryServiceTransport]] _transport_registry["grpc"] = SampleQueryServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQueryServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQueryServiceRestTransport @@ -660,11 +660,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SampleQueryServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SampleQueryServiceClient._read_environment_variables() + ) self._client_cert_source = SampleQueryServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -699,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SampleQueryServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/pagers.py index 71fe2d9f2ec8..a8d44b6b58b5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/__init__.py index 0f5acb01b776..f8fb6800d64a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SampleQueryServiceRestInterceptor, SampleQueryServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SampleQueryServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SampleQueryServiceTransport]] _transport_registry["grpc"] = SampleQueryServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQueryServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQueryServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/base.py index ef120c60b486..0f1c2ef8ab9e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/base.py @@ -17,22 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha import gapic_version as package_version +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -284,7 +286,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc.py index 4588364e10ad..8175e39c922f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc_asyncio.py index 0c3d2c3da1c0..738275902907 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,17 +31,15 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport from .grpc import SampleQueryServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest.py index f6f726c95615..62758dd41387 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest.py @@ -16,25 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSampleQueryServiceRestTransport @@ -786,9 +788,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseCreateSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseCreateSampleQuery._get_http_options() request, metadata = self._interceptor.pre_create_sample_query( request, metadata @@ -936,9 +936,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseDeleteSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseDeleteSampleQuery._get_http_options() request, metadata = self._interceptor.pre_delete_sample_query( request, metadata @@ -1053,9 +1051,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseGetSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseGetSampleQuery._get_http_options() request, metadata = self._interceptor.pre_get_sample_query( request, metadata @@ -1206,9 +1202,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseImportSampleQueries._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseImportSampleQueries._get_http_options() request, metadata = self._interceptor.pre_import_sample_queries( request, metadata @@ -1363,9 +1357,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseListSampleQueries._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseListSampleQueries._get_http_options() request, metadata = self._interceptor.pre_list_sample_queries( request, metadata @@ -1517,9 +1509,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseUpdateSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseUpdateSampleQuery._get_http_options() request, metadata = self._interceptor.pre_update_sample_query( request, metadata @@ -1727,9 +1717,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1850,9 +1838,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1991,9 +1977,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSampleQueryServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest_base.py index a955884041c5..807191aeea28 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest_base.py @@ -17,16 +17,18 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/async_client.py index a0eb4c2af2d6..faf9de8a50af 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,19 +44,21 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.sample_query_set_service import ( pagers, ) +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service from .client import SampleQuerySetServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport @@ -134,7 +136,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SampleQuerySetServiceAsyncClient: The constructed client. """ - return SampleQuerySetServiceClient.from_service_account_info.__func__(SampleQuerySetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SampleQuerySetServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SampleQuerySetServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -150,7 +155,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SampleQuerySetServiceAsyncClient: The constructed client. """ - return SampleQuerySetServiceClient.from_service_account_file.__func__(SampleQuerySetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SampleQuerySetServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SampleQuerySetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -188,7 +196,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SampleQuerySetServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SampleQuerySetServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SampleQuerySetServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/client.py index 123871443f53..0cbec5a71ac6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,19 +61,21 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.sample_query_set_service import ( pagers, ) +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service from .transports.base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport from .transports.grpc import SampleQuerySetServiceGrpcTransport @@ -89,9 +91,7 @@ class SampleQuerySetServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SampleQuerySetServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SampleQuerySetServiceTransport]] _transport_registry["grpc"] = SampleQuerySetServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQuerySetServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQuerySetServiceRestTransport @@ -656,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SampleQuerySetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SampleQuerySetServiceClient._read_environment_variables() + ) self._client_cert_source = SampleQuerySetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -695,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SampleQuerySetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/pagers.py index 5c20e99b761d..f8ce2109c621 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/__init__.py index 44ad1aa56225..a953bda6fade 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SampleQuerySetServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SampleQuerySetServiceTransport]] _transport_registry["grpc"] = SampleQuerySetServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQuerySetServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQuerySetServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/base.py index 43ed6a020de1..8730e751611b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha import gapic_version as package_version +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -274,7 +276,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc.py index 7478dc63007c..c2feda6f2bff 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc_asyncio.py index 2d7fd341200a..5f3ff2d31ecc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,18 +31,16 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport from .grpc import SampleQuerySetServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest.py index 05fcfe32cd32..77f1ce6ed248 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,16 +28,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSampleQuerySetServiceRestTransport @@ -565,9 +567,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseCreateSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseCreateSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_create_sample_query_set( request, metadata @@ -719,9 +719,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseDeleteSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseDeleteSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_delete_sample_query_set( request, metadata @@ -840,9 +838,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseGetSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseGetSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_get_sample_query_set( request, metadata @@ -994,9 +990,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseListSampleQuerySets._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseListSampleQuerySets._get_http_options() request, metadata = self._interceptor.pre_list_sample_query_sets( request, metadata @@ -1154,9 +1148,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseUpdateSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseUpdateSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_update_sample_query_set( request, metadata @@ -1365,9 +1357,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1490,9 +1480,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1631,9 +1619,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest_base.py index 04037b2c6b7f..37d2c5776ade 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/async_client.py index a0fa25b17a74..7e0aa37f4d7c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -46,15 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.schema_service import pagers -from google.cloud.discoveryengine_v1alpha.types import schema +from google.cloud.discoveryengine_v1alpha.types import schema, schema_service from google.cloud.discoveryengine_v1alpha.types import schema as gcd_schema -from google.cloud.discoveryengine_v1alpha.types import schema_service from .client import SchemaServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport @@ -126,7 +125,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): @@ -142,7 +144,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 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/client.py index ea1dd48ab2f1..eb31e4308986 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -63,15 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.schema_service import pagers -from google.cloud.discoveryengine_v1alpha.types import schema +from google.cloud.discoveryengine_v1alpha.types import schema, schema_service from google.cloud.discoveryengine_v1alpha.types import schema as gcd_schema -from google.cloud.discoveryengine_v1alpha.types import schema_service from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport from .transports.grpc import SchemaServiceGrpcTransport @@ -653,11 +652,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SchemaServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SchemaServiceClient._read_environment_variables() + ) self._client_cert_source = SchemaServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -692,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SchemaServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/pagers.py index f5efd716d3d5..f6ee53f16567 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/base.py index 8cf873d2f1ca..279eb7b45647 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import schema, schema_service @@ -266,7 +266,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc.py index 4e7f33fbe9ff..80d03a65b75a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import schema, schema_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc_asyncio.py index 2e7b5673ea53..65edb1a2d5d4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import schema, schema_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest.py index 04aa182e9ce0..f84ed363b954 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/async_client.py index f18a4ef0ba91..c04663ba1942 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -128,7 +128,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_info.__func__(SearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SearchServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SearchServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +147,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_file.__func__(SearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SearchServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SearchServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/client.py index 4210b449ccaa..1b0dd833ea79 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -747,11 +747,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchServiceClient._read_environment_variables() + ) self._client_cert_source = SearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -786,8 +784,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/pagers.py index 58b027b8b742..379653b2a8c2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/base.py index d239671add7e..8742a35a76bf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import search_service @@ -202,7 +202,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc.py index 9030580c8efb..3d74e1a3ea1b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc_asyncio.py index 555da5238e97..60c2f8107bcf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest.py index d4feaa473f18..a866396e7505 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/async_client.py index 9d2fc80d330d..93a83a182084 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -128,7 +128,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_info.__func__(SearchTuningServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SearchTuningServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SearchTuningServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +147,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_file.__func__(SearchTuningServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SearchTuningServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SearchTuningServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -182,7 +188,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SearchTuningServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/client.py index 31dac4e35928..de88d9d2e3f2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -85,9 +85,7 @@ class SearchTuningServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SearchTuningServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport @@ -655,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchTuningServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchTuningServiceClient._read_environment_variables() + ) self._client_cert_source = SearchTuningServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchTuningServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/__init__.py index d759f5c3cdcd..170e258db18b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SearchTuningServiceRestInterceptor, SearchTuningServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SearchTuningServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/base.py index 51cc4c7ce83f..68c4c3f38f2a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import search_tuning_service @@ -224,7 +224,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc.py index d44cf1faaece..e9e841d2d6fc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_tuning_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc_asyncio.py index f8a5cb229b0f..6f5b376ef66e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_tuning_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest.py index 20ac7c90d10e..7f23ece525f4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -591,9 +591,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() request, metadata = self._interceptor.pre_list_custom_models( request, metadata @@ -746,9 +744,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() request, metadata = self._interceptor.pre_train_custom_model( request, metadata @@ -918,9 +914,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1041,9 +1035,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1182,9 +1174,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/async_client.py index 461f26266bcc..b73963647cde 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,18 +44,20 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.serving_config_service import pagers +from google.cloud.discoveryengine_v1alpha.types import ( + common, + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service from .client import ServingConfigServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport @@ -127,7 +129,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_info.__func__(ServingConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ServingConfigServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ServingConfigServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +148,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_file.__func__(ServingConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ServingConfigServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ServingConfigServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +189,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ServingConfigServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/client.py index 69d2b19bc15f..96de7b3d47f4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,18 +61,20 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.serving_config_service import pagers +from google.cloud.discoveryengine_v1alpha.types import ( + common, + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport from .transports.grpc import ServingConfigServiceGrpcTransport @@ -88,9 +90,7 @@ class ServingConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ServingConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport @@ -638,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServingConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServingConfigServiceClient._read_environment_variables() + ) self._client_cert_source = ServingConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServingConfigServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/pagers.py index 24a16678965c..051dfede9559 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/__init__.py index 6bdd4697d637..5e6ab0b7e7f9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ServingConfigServiceRestInterceptor, ServingConfigServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ServingConfigServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/base.py index a0afef2ea85a..76337c5d454c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/base.py @@ -17,22 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version +from google.cloud.discoveryengine_v1alpha.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -240,7 +242,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc.py index a05f1bdc3f4f..9679ff61f295 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc_asyncio.py index 3f137c837306..2cbd5722f858 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,16 +31,15 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport from .grpc import ServingConfigServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest.py index e475ede325f4..3cce427fd89d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +27,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1alpha.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseServingConfigServiceRestTransport @@ -483,9 +485,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseGetServingConfig._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseGetServingConfig._get_http_options() request, metadata = self._interceptor.pre_get_serving_config( request, metadata @@ -635,9 +635,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseListServingConfigs._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseListServingConfigs._get_http_options() request, metadata = self._interceptor.pre_list_serving_configs( request, metadata @@ -796,9 +794,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() request, metadata = self._interceptor.pre_update_serving_config( request, metadata @@ -985,9 +981,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1108,9 +1102,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1249,9 +1241,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest_base.py index 1f589b60cac7..5a276268f655 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest_base.py @@ -22,11 +22,13 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1alpha.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/async_client.py index 72fb4403c507..7711613ec57f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,16 +44,18 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.session_service import pagers -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import session +from google.cloud.discoveryengine_v1alpha.types import ( + conversational_search_service, + session, + session_service, +) from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service from .client import SessionServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SessionServiceTransport @@ -129,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_info.__func__(SessionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SessionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SessionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +150,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_file.__func__(SessionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SessionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SessionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/client.py index c2d046151cc3..c1d0956bf9d1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,16 +61,18 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.session_service import pagers -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import session +from google.cloud.discoveryengine_v1alpha.types import ( + conversational_search_service, + session, + session_service, +) from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service from .transports.base import DEFAULT_CLIENT_INFO, SessionServiceTransport from .transports.grpc import SessionServiceGrpcTransport @@ -86,9 +88,7 @@ class SessionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionServiceTransport]] _transport_registry["grpc"] = SessionServiceGrpcTransport _transport_registry["grpc_asyncio"] = SessionServiceGrpcAsyncIOTransport _transport_registry["rest"] = SessionServiceRestTransport @@ -732,11 +732,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionServiceClient._read_environment_variables() + ) self._client_cert_source = SessionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -771,8 +769,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/pagers.py index d78399681d46..e93d5e7702e8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -149,7 +149,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -231,7 +231,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -307,7 +307,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/base.py index 91552ec4e549..61d249491785 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/base.py @@ -17,22 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import session +from google.cloud.discoveryengine_v1alpha.types import ( + conversational_search_service, + session, + session_service, +) from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -282,7 +284,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc.py index 115360245cc7..6ad3cfb2dad2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import session +from google.cloud.discoveryengine_v1alpha.types import ( + conversational_search_service, + session, + session_service, +) from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc_asyncio.py index a50fc2c13582..92699cea3b1e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,15 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import session +from google.cloud.discoveryengine_v1alpha.types import ( + conversational_search_service, + session, + session_service, +) from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport from .grpc import SessionServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest.py index 9328e395691a..aa82db74c96d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,15 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import session +from google.cloud.discoveryengine_v1alpha.types import ( + conversational_search_service, + session, + session_service, +) from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionServiceRestTransport @@ -1516,9 +1518,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest_base.py index f1585d5305b4..f0d5241d0f70 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest_base.py @@ -17,16 +17,18 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import session +from google.cloud.discoveryengine_v1alpha.types import ( + conversational_search_service, + session, + session_service, +) from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/async_client.py index 6c1c702c6732..10a77246976e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -46,10 +46,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.site_search_engine_service import ( pagers, @@ -139,7 +139,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_info.__func__(SiteSearchEngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SiteSearchEngineServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SiteSearchEngineServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +158,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_file.__func__(SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SiteSearchEngineServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -193,7 +201,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SiteSearchEngineServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/client.py index 6e9c5ff39242..eead5f824949 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -63,10 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.site_search_engine_service import ( pagers, @@ -90,9 +90,7 @@ class SiteSearchEngineServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport @@ -662,11 +660,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SiteSearchEngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SiteSearchEngineServiceClient._read_environment_variables() + ) self._client_cert_source = ( SiteSearchEngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -703,8 +699,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SiteSearchEngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/pagers.py index e27d863f6e4d..a773918f5ee4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -315,7 +315,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/__init__.py index 5443c0c10cf1..0c91743e9878 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/base.py index 06979ffb4e17..d5dfd6f8358c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import ( @@ -404,7 +404,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc.py index 8f382f491cae..390023833684 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( site_search_engine, @@ -573,12 +573,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -605,12 +605,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -698,12 +698,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] @@ -730,12 +730,12 @@ def set_uri_pattern_document_data( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_uri_pattern_document_data" not in self._stubs: - self._stubs[ - "set_uri_pattern_document_data" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/SetUriPatternDocumentData", - request_serializer=site_search_engine_service.SetUriPatternDocumentDataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_uri_pattern_document_data"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/SetUriPatternDocumentData", + request_serializer=site_search_engine_service.SetUriPatternDocumentDataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_uri_pattern_document_data"] @@ -762,12 +762,12 @@ def get_uri_pattern_document_data( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_uri_pattern_document_data" not in self._stubs: - self._stubs[ - "get_uri_pattern_document_data" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/GetUriPatternDocumentData", - request_serializer=site_search_engine_service.GetUriPatternDocumentDataRequest.serialize, - response_deserializer=site_search_engine_service.GetUriPatternDocumentDataResponse.deserialize, + self._stubs["get_uri_pattern_document_data"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/GetUriPatternDocumentData", + request_serializer=site_search_engine_service.GetUriPatternDocumentDataRequest.serialize, + response_deserializer=site_search_engine_service.GetUriPatternDocumentDataResponse.deserialize, + ) ) return self._stubs["get_uri_pattern_document_data"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc_asyncio.py index 2ed1e259fb54..c2d953c2421f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( site_search_engine, @@ -585,12 +585,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -617,12 +617,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -711,12 +711,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] @@ -743,12 +743,12 @@ def set_uri_pattern_document_data( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_uri_pattern_document_data" not in self._stubs: - self._stubs[ - "set_uri_pattern_document_data" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/SetUriPatternDocumentData", - request_serializer=site_search_engine_service.SetUriPatternDocumentDataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_uri_pattern_document_data"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/SetUriPatternDocumentData", + request_serializer=site_search_engine_service.SetUriPatternDocumentDataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_uri_pattern_document_data"] @@ -775,12 +775,12 @@ def get_uri_pattern_document_data( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_uri_pattern_document_data" not in self._stubs: - self._stubs[ - "get_uri_pattern_document_data" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/GetUriPatternDocumentData", - request_serializer=site_search_engine_service.GetUriPatternDocumentDataRequest.serialize, - response_deserializer=site_search_engine_service.GetUriPatternDocumentDataResponse.deserialize, + self._stubs["get_uri_pattern_document_data"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/GetUriPatternDocumentData", + request_serializer=site_search_engine_service.GetUriPatternDocumentDataRequest.serialize, + response_deserializer=site_search_engine_service.GetUriPatternDocumentDataResponse.deserialize, + ) ) return self._stubs["get_uri_pattern_document_data"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest.py index 49b240c69c64..234ca1eeec56 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1287,9 +1287,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_create_target_sites( request, metadata @@ -1443,9 +1441,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_verify_target_sites( request, metadata @@ -1599,9 +1595,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() request, metadata = self._interceptor.pre_create_target_site( request, metadata @@ -1756,9 +1750,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() request, metadata = self._interceptor.pre_delete_target_site( request, metadata @@ -1912,9 +1904,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_disable_advanced_site_search( request, metadata @@ -2069,9 +2059,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_enable_advanced_site_search( request, metadata @@ -2227,9 +2215,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() request, metadata = self._interceptor.pre_fetch_domain_verification_status( request, metadata @@ -2297,11 +2283,10 @@ def __call__( resp = self._interceptor.post_fetch_domain_verification_status(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_domain_verification_status_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_domain_verification_status_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2389,9 +2374,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() request, metadata = self._interceptor.pre_get_site_search_engine( request, metadata @@ -2544,9 +2527,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() request, metadata = self._interceptor.pre_get_target_site(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_transcoded_request( @@ -2699,9 +2680,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetUriPatternDocumentData._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetUriPatternDocumentData._get_http_options() request, metadata = self._interceptor.pre_get_uri_pattern_document_data( request, metadata @@ -2767,11 +2746,10 @@ def __call__( resp = self._interceptor.post_get_uri_pattern_document_data(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_uri_pattern_document_data_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_uri_pattern_document_data_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2858,9 +2836,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() request, metadata = self._interceptor.pre_list_target_sites( request, metadata @@ -3017,9 +2993,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() request, metadata = self._interceptor.pre_recrawl_uris(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_transcoded_request( @@ -3174,9 +3148,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseSetUriPatternDocumentData._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseSetUriPatternDocumentData._get_http_options() request, metadata = self._interceptor.pre_set_uri_pattern_document_data( request, metadata @@ -3243,11 +3215,10 @@ def __call__( resp = self._interceptor.post_set_uri_pattern_document_data(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_uri_pattern_document_data_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_uri_pattern_document_data_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3333,9 +3304,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() request, metadata = self._interceptor.pre_update_target_site( request, metadata @@ -3439,7 +3408,9 @@ def batch_create_target_sites( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchCreateTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_verify_target_sites( @@ -3450,7 +3421,9 @@ def batch_verify_target_sites( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchVerifyTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchVerifyTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_target_site( @@ -3481,7 +3454,9 @@ def disable_advanced_site_search( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DisableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._DisableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def enable_advanced_site_search( @@ -3492,7 +3467,9 @@ def enable_advanced_site_search( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._EnableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._EnableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_domain_verification_status( @@ -3503,7 +3480,9 @@ def fetch_domain_verification_status( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchDomainVerificationStatus(self._session, self._host, self._interceptor) # type: ignore + return self._FetchDomainVerificationStatus( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_site_search_engine( @@ -3535,7 +3514,9 @@ def get_uri_pattern_document_data( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetUriPatternDocumentData(self._session, self._host, self._interceptor) # type: ignore + return self._GetUriPatternDocumentData( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_target_sites( @@ -3567,7 +3548,9 @@ def set_uri_pattern_document_data( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetUriPatternDocumentData(self._session, self._host, self._interceptor) # type: ignore + return self._SetUriPatternDocumentData( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_target_site( @@ -3635,9 +3618,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3760,9 +3741,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3901,9 +3880,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/async_client.py index f3e58db8b616..5d13caa28702 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -47,10 +47,10 @@ import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.any_pb2 as any_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( common, @@ -132,7 +132,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_info.__func__(UserEventServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + UserEventServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(UserEventServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +151,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_file.__func__(UserEventServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + UserEventServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(UserEventServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/client.py index 210a6ab07015..ae5e5b13f801 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -64,10 +64,10 @@ import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.any_pb2 as any_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( common, @@ -91,9 +91,7 @@ class UserEventServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[UserEventServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[UserEventServiceTransport]] _transport_registry["grpc"] = UserEventServiceGrpcTransport _transport_registry["grpc_asyncio"] = UserEventServiceGrpcAsyncIOTransport _transport_registry["rest"] = UserEventServiceRestTransport @@ -687,11 +685,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UserEventServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UserEventServiceClient._read_environment_variables() + ) self._client_cert_source = UserEventServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -726,8 +722,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UserEventServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/base.py index 148440dfcb54..58082410998c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/base.py @@ -18,15 +18,15 @@ import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import ( @@ -264,7 +264,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc.py index c78ac7f61115..9cd0d70e75dc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( import_config, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc_asyncio.py index b57aeb05ed5c..b0ce463918f5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc_asyncio.py @@ -17,10 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -29,10 +32,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( import_config, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest.py index 58f62ca79dc0..279ad70e4e65 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -752,9 +752,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() request, metadata = self._interceptor.pre_collect_user_event( request, metadata @@ -904,9 +902,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() request, metadata = self._interceptor.pre_import_user_events( request, metadata @@ -1059,9 +1055,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() request, metadata = self._interceptor.pre_purge_user_events( request, metadata @@ -1214,9 +1208,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() request, metadata = self._interceptor.pre_write_user_event( request, metadata @@ -1399,9 +1391,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1661,9 +1651,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseUserEventServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/__init__.py index 5d1b94d52bc5..5699c3ac92d9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/__init__.py @@ -13,11 +13,24 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .acl_config import AclConfig -from .acl_config_service import GetAclConfigRequest, UpdateAclConfigRequest -from .answer import Answer -from .chunk import Chunk -from .chunk_service import GetChunkRequest, ListChunksRequest, ListChunksResponse +from .acl_config import ( + AclConfig, +) +from .acl_config_service import ( + GetAclConfigRequest, + UpdateAclConfigRequest, +) +from .answer import ( + Answer, +) +from .chunk import ( + Chunk, +) +from .chunk_service import ( + GetChunkRequest, + ListChunksRequest, + ListChunksResponse, +) from .common import ( CustomAttribute, CustomFineTuningSpec, @@ -35,9 +48,18 @@ SolutionType, UserInfo, ) -from .completion import CompletionSuggestion, SuggestionDenyListEntry -from .completion_service import CompleteQueryRequest, CompleteQueryResponse -from .control import Condition, Control +from .completion import ( + CompletionSuggestion, + SuggestionDenyListEntry, +) +from .completion_service import ( + CompleteQueryRequest, + CompleteQueryResponse, +) +from .control import ( + Condition, + Control, +) from .control_service import ( CreateControlRequest, DeleteControlRequest, @@ -72,8 +94,14 @@ UpdateConversationRequest, UpdateSessionRequest, ) -from .custom_tuning_model import CustomTuningModel -from .data_store import DataStore, LanguageInfo, WorkspaceConfig +from .custom_tuning_model import ( + CustomTuningModel, +) +from .data_store import ( + DataStore, + LanguageInfo, + WorkspaceConfig, +) from .data_store_service import ( CreateDataStoreMetadata, CreateDataStoreRequest, @@ -86,8 +114,13 @@ UpdateDataStoreRequest, UpdateDocumentProcessingConfigRequest, ) -from .document import Document, ProcessedDocument -from .document_processing_config import DocumentProcessingConfig +from .document import ( + Document, + ProcessedDocument, +) +from .document_processing_config import ( + DocumentProcessingConfig, +) from .document_service import ( BatchGetDocumentsMetadataRequest, BatchGetDocumentsMetadataResponse, @@ -99,7 +132,9 @@ ListDocumentsResponse, UpdateDocumentRequest, ) -from .engine import Engine +from .engine import ( + Engine, +) from .engine_service import ( CreateEngineMetadata, CreateEngineRequest, @@ -120,7 +155,10 @@ EstimateDataSizeRequest, EstimateDataSizeResponse, ) -from .evaluation import Evaluation, QualityMetrics +from .evaluation import ( + Evaluation, + QualityMetrics, +) from .evaluation_service import ( CreateEvaluationMetadata, CreateEvaluationRequest, @@ -135,7 +173,10 @@ CheckGroundingResponse, CheckGroundingSpec, ) -from .grounding import FactChunk, GroundingFact +from .grounding import ( + FactChunk, + GroundingFact, +) from .import_config import ( AlloyDbSource, BigQuerySource, @@ -163,7 +204,9 @@ ImportUserEventsResponse, SpannerSource, ) -from .project import Project +from .project import ( + Project, +) from .project_service import ( GetProjectRequest, ProvisionProjectMetadata, @@ -185,9 +228,18 @@ PurgeUserEventsRequest, PurgeUserEventsResponse, ) -from .rank_service import RankingRecord, RankRequest, RankResponse -from .recommendation_service import RecommendRequest, RecommendResponse -from .sample_query import SampleQuery +from .rank_service import ( + RankingRecord, + RankRequest, + RankResponse, +) +from .recommendation_service import ( + RecommendRequest, + RecommendResponse, +) +from .sample_query import ( + SampleQuery, +) from .sample_query_service import ( CreateSampleQueryRequest, DeleteSampleQueryRequest, @@ -196,7 +248,9 @@ ListSampleQueriesResponse, UpdateSampleQueryRequest, ) -from .sample_query_set import SampleQuerySet +from .sample_query_set import ( + SampleQuerySet, +) from .sample_query_set_service import ( CreateSampleQuerySetRequest, DeleteSampleQuerySetRequest, @@ -205,7 +259,10 @@ ListSampleQuerySetsResponse, UpdateSampleQuerySetRequest, ) -from .schema import FieldConfig, Schema +from .schema import ( + FieldConfig, + Schema, +) from .schema_service import ( CreateSchemaMetadata, CreateSchemaRequest, @@ -217,7 +274,10 @@ UpdateSchemaMetadata, UpdateSchemaRequest, ) -from .search_service import SearchRequest, SearchResponse +from .search_service import ( + SearchRequest, + SearchResponse, +) from .search_tuning_service import ( ListCustomModelsRequest, ListCustomModelsResponse, @@ -225,7 +285,9 @@ TrainCustomModelRequest, TrainCustomModelResponse, ) -from .serving_config import ServingConfig +from .serving_config import ( + ServingConfig, +) from .serving_config_service import ( GetServingConfigRequest, ListServingConfigsRequest, @@ -242,8 +304,15 @@ Session, VideoCharacteristics, ) -from .session_service import ListFilesRequest, ListFilesResponse -from .site_search_engine import SiteSearchEngine, SiteVerificationInfo, TargetSite +from .session_service import ( + ListFilesRequest, + ListFilesResponse, +) +from .site_search_engine import ( + SiteSearchEngine, + SiteVerificationInfo, + TargetSite, +) from .site_search_engine_service import ( BatchCreateTargetSiteMetadata, BatchCreateTargetSitesRequest, @@ -288,7 +357,10 @@ TransactionInfo, UserEvent, ) -from .user_event_service import CollectUserEventRequest, WriteUserEventRequest +from .user_event_service import ( + CollectUserEventRequest, + WriteUserEventRequest, +) __all__ = ( "AclConfig", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/answer.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/answer.py index cdf9284e5992..af2550c27a42 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/answer.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/answer.py @@ -73,6 +73,7 @@ class State(proto.Enum): SUCCEEDED (3): Answer generation has succeeded. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -118,6 +119,7 @@ class AnswerSkippedReason(proto.Enum): policy violation detected. The policy is defined by the customer. """ + ANSWER_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_ANSWER_SEEKING_QUERY_IGNORED = 2 @@ -425,6 +427,7 @@ class State(proto.Enum): SUCCEEDED (3): Step has succeeded. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -649,6 +652,7 @@ class Type(proto.Enum): JAIL_BREAKING_QUERY (3): Jail-breaking query classification type. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/common.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/common.py index 9419297699e0..8578fcfda540 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/common.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/common.py @@ -56,6 +56,7 @@ class IndustryVertical(proto.Enum): HEALTHCARE_FHIR (7): The healthcare FHIR vertical. """ + INDUSTRY_VERTICAL_UNSPECIFIED = 0 GENERIC = 1 MEDIA = 2 @@ -81,6 +82,7 @@ class SolutionType(proto.Enum): data stores must enrolled with ``SOLUTION_TYPE_CHAT`` solution. """ + SOLUTION_TYPE_UNSPECIFIED = 0 SOLUTION_TYPE_RECOMMENDATION = 1 SOLUTION_TYPE_SEARCH = 2 @@ -103,6 +105,7 @@ class SearchUseCase(proto.Enum): Browse use case. Expects the traffic has an empty [query][google.cloud.discoveryengine.v1alpha.SearchRequest.query]. """ + SEARCH_USE_CASE_UNSPECIFIED = 0 SEARCH_USE_CASE_SEARCH = 1 SEARCH_USE_CASE_BROWSE = 2 @@ -122,6 +125,7 @@ class SearchTier(proto.Enum): SEARCH_TIER_ENTERPRISE (2): Enterprise tier. """ + SEARCH_TIER_UNSPECIFIED = 0 SEARCH_TIER_STANDARD = 1 SEARCH_TIER_ENTERPRISE = 2 @@ -137,6 +141,7 @@ class SearchAddOn(proto.Enum): SEARCH_ADD_ON_LLM (1): Large language model add-on. """ + SEARCH_ADD_ON_UNSPECIFIED = 0 SEARCH_ADD_ON_LLM = 1 @@ -155,6 +160,7 @@ class FileOriginType(proto.Enum): The file was generated from other files by an internal process. """ + FILE_ORIGIN_TYPE_UNSPECIFIED = 0 USER_PROVIDED = 1 AI_GENERATED = 2 @@ -391,6 +397,7 @@ class IdpType(proto.Enum): THIRD_PARTY (2): Third party provider. """ + IDP_TYPE_UNSPECIFIED = 0 GSUITE = 1 THIRD_PARTY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion.py index db1f8d363f04..1a97c01c6b23 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion.py @@ -54,6 +54,7 @@ class MatchOperator(proto.Enum): CONTAINS (2): If the suggestion contains the block_phrase, then block it. """ + MATCH_OPERATOR_UNSPECIFIED = 0 EXACT_MATCH = 1 CONTAINS = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversation.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversation.py index beef0a19c1dd..697e36379992 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversation.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversation.py @@ -68,6 +68,7 @@ class State(proto.Enum): COMPLETED (2): Conversation has been completed. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 COMPLETED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversational_search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversational_search_service.py index a06851cfbee2..d73c484be3af 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversational_search_service.py @@ -20,10 +20,9 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1alpha.types import answer as gcd_answer -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import search_service +from google.cloud.discoveryengine_v1alpha.types import common, search_service +from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1alpha.types import session as gcd_session __protobuf__ = proto.module( @@ -204,12 +203,12 @@ class ConverseConversationResponse(proto.Message): proto.STRING, number=6, ) - search_results: MutableSequence[ - search_service.SearchResponse.SearchResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=search_service.SearchResponse.SearchResult, + search_results: MutableSequence[search_service.SearchResponse.SearchResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=search_service.SearchResponse.SearchResult, + ) ) @@ -935,6 +934,7 @@ class Type(proto.Enum): JAIL_BREAKING_QUERY (3): Jail-breaking query classification type. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/custom_tuning_model.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/custom_tuning_model.py index ff626b6c1103..aa009d3b2708 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/custom_tuning_model.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/custom_tuning_model.py @@ -78,6 +78,7 @@ class ModelState(proto.Enum): Input data validation failed. Model training didn't start. """ + MODEL_STATE_UNSPECIFIED = 0 TRAINING_PAUSED = 1 TRAINING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store.py index bb375615926c..002357aa0c60 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store.py @@ -20,11 +20,10 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import common, schema from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import schema __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -149,6 +148,7 @@ class ContentConfig(proto.Enum): workspace data store are specified in the [WorkspaceConfig][google.cloud.discoveryengine.v1alpha.WorkspaceConfig]. """ + CONTENT_CONFIG_UNSPECIFIED = 0 NO_CONTENT = 1 CONTENT_REQUIRED = 2 @@ -289,6 +289,7 @@ class Type(proto.Enum): GOOGLE_KEEP (7): Workspace Data Store contains Keep data """ + TYPE_UNSPECIFIED = 0 GOOGLE_DRIVE = 1 GOOGLE_MAIL = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document.py index 4a417356d5da..1b59bea76655 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document.py @@ -212,12 +212,12 @@ class AccessRestriction(proto.Message): number=2, ) - readers: MutableSequence[ - "Document.AclInfo.AccessRestriction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.AclInfo.AccessRestriction", + readers: MutableSequence["Document.AclInfo.AccessRestriction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.AclInfo.AccessRestriction", + ) ) class IndexStatus(proto.Message): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_service.py index b779488cdefe..26ba6eb55e7e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_service.py @@ -317,6 +317,7 @@ class ProcessedDocumentType(proto.Enum): Returns the converted Image bytes (as JPEG or PNG) if available. """ + PROCESSED_DOCUMENT_TYPE_UNSPECIFIED = 0 PARSED_DOCUMENT = 1 CHUNKED_DOCUMENT = 2 @@ -333,6 +334,7 @@ class ProcessedDocumentFormat(proto.Enum): Output format is a JSON string representation of processed document. """ + PROCESSED_DOCUMENT_FORMAT_UNSPECIFIED = 0 JSON = 1 @@ -446,6 +448,7 @@ class State(proto.Enum): [Document][google.cloud.discoveryengine.v1alpha.Document] is not indexed. """ + STATE_UNSPECIFIED = 0 INDEXED = 1 NOT_IN_TARGET_SITE = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine.py index 0670ddd06fa1..30c153efad78 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine.py @@ -238,6 +238,7 @@ class TrainingState(proto.Enum): TRAINING (2): The engine is training. """ + TRAINING_STATE_UNSPECIFIED = 0 PAUSED = 1 TRAINING = 2 @@ -443,6 +444,7 @@ class ServingState(proto.Enum): The engine is trained on tuned hyperparameters and can be queried. """ + SERVING_STATE_UNSPECIFIED = 0 INACTIVE = 1 ACTIVE = 2 @@ -463,6 +465,7 @@ class DataState(proto.Enum): data. Error messages can be queried via Stackdriver. """ + DATA_STATE_UNSPECIFIED = 0 DATA_OK = 1 DATA_ERROR = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation.py index 9f24c4c612ba..914d589f3bce 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation.py @@ -92,6 +92,7 @@ class State(proto.Enum): FAILED (4): The evaluation failed. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/import_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/import_config.py index beced459e63d..a2c383f67323 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/import_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/import_config.py @@ -286,6 +286,7 @@ class Type(proto.Enum): JSON (7): JSON type. """ + TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -306,6 +307,7 @@ class Encoding(proto.Enum): BINARY (2): Binary encoding. """ + ENCODING_UNSPECIFIED = 0 TEXT = 1 BINARY = 2 @@ -354,12 +356,12 @@ class BigtableColumnFamily(proto.Message): number=3, enum="BigtableOptions.Type", ) - columns: MutableSequence[ - "BigtableOptions.BigtableColumn" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="BigtableOptions.BigtableColumn", + columns: MutableSequence["BigtableOptions.BigtableColumn"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="BigtableOptions.BigtableColumn", + ) ) class BigtableColumn(proto.Message): @@ -1043,6 +1045,7 @@ class ReconciliationMode(proto.Enum): deleted if they are not present in the source location. """ + RECONCILIATION_MODE_UNSPECIFIED = 0 INCREMENTAL = 1 FULL = 2 @@ -1220,12 +1223,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - entries: MutableSequence[ - completion.SuggestionDenyListEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.SuggestionDenyListEntry, + entries: MutableSequence[completion.SuggestionDenyListEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.SuggestionDenyListEntry, + ) ) inline_source: InlineSource = proto.Field( @@ -1348,12 +1351,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - suggestions: MutableSequence[ - completion.CompletionSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.CompletionSuggestion, + suggestions: MutableSequence[completion.CompletionSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.CompletionSuggestion, + ) ) inline_source: InlineSource = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project.py index ec562cc5d8cc..e2d625c48658 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project.py @@ -98,6 +98,7 @@ class State(proto.Enum): The project has declined or revoked the agreement to terms of service. """ + STATE_UNSPECIFIED = 0 TERMS_ACCEPTED = 1 TERMS_PENDING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project_service.py index 1b8fe4e3315b..89ffdf2c316d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project_service.py @@ -127,6 +127,7 @@ class ConsentChangeAction(proto.Enum): ACCEPT (1): User accepts service terms. """ + CONSENT_CHANGE_ACTION_UNSPECIFIED = 0 ACCEPT = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/recommendation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/recommendation_service.py index ddc5f7a3fd50..685185c83902 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/recommendation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/recommendation_service.py @@ -20,8 +20,8 @@ import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import user_event as gcd_user_event from google.cloud.discoveryengine_v1alpha.types import document as gcd_document +from google.cloud.discoveryengine_v1alpha.types import user_event as gcd_user_event __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set_service.py index f772a6587a36..327209056113 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set_service.py @@ -135,12 +135,12 @@ class ListSampleQuerySetsResponse(proto.Message): def raw_page(self): return self - sample_query_sets: MutableSequence[ - gcd_sample_query_set.SampleQuerySet - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_sample_query_set.SampleQuerySet, + sample_query_sets: MutableSequence[gcd_sample_query_set.SampleQuerySet] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_sample_query_set.SampleQuerySet, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema.py index edfb8f7c588e..328e0eabd71e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema.py @@ -306,6 +306,7 @@ class FieldType(proto.Enum): date and time. e.g. ``"2015-01-01"`` or ``"2015-01-01T12:10:30Z"`` """ + FIELD_TYPE_UNSPECIFIED = 0 OBJECT = 1 STRING = 2 @@ -326,6 +327,7 @@ class IndexableOption(proto.Enum): INDEXABLE_DISABLED (2): Indexable option disabled for a schema field. """ + INDEXABLE_OPTION_UNSPECIFIED = 0 INDEXABLE_ENABLED = 1 INDEXABLE_DISABLED = 2 @@ -343,6 +345,7 @@ class DynamicFacetableOption(proto.Enum): Dynamic facetable option disabled for a schema field. """ + DYNAMIC_FACETABLE_OPTION_UNSPECIFIED = 0 DYNAMIC_FACETABLE_ENABLED = 1 DYNAMIC_FACETABLE_DISABLED = 2 @@ -359,6 +362,7 @@ class SearchableOption(proto.Enum): Searchable option disabled for a schema field. """ + SEARCHABLE_OPTION_UNSPECIFIED = 0 SEARCHABLE_ENABLED = 1 SEARCHABLE_DISABLED = 2 @@ -376,6 +380,7 @@ class RetrievableOption(proto.Enum): Retrievable option disabled for a schema field. """ + RETRIEVABLE_OPTION_UNSPECIFIED = 0 RETRIEVABLE_ENABLED = 1 RETRIEVABLE_DISABLED = 2 @@ -393,6 +398,7 @@ class CompletableOption(proto.Enum): Completable option disabled for a schema field. """ + COMPLETABLE_OPTION_UNSPECIFIED = 0 COMPLETABLE_ENABLED = 1 COMPLETABLE_DISABLED = 2 @@ -409,6 +415,7 @@ class FilterableOption(proto.Enum): Filterable option disabled for a schema field. """ + FILTERABLE_OPTION_UNSPECIFIED = 0 FILTERABLE_ENABLED = 1 FILTERABLE_DISABLED = 2 @@ -430,6 +437,7 @@ class AdvancedSiteSearchDataSource(proto.Enum): SCHEMA_ORG (4): Retrieve value from schema.org data. """ + ADVANCED_SITE_SEARCH_DATA_SOURCE_UNSPECIFIED = 0 METATAGS = 1 PAGEMAP = 2 @@ -479,12 +487,12 @@ class AdvancedSiteSearchDataSource(proto.Enum): proto.STRING, number=7, ) - advanced_site_search_data_sources: MutableSequence[ - AdvancedSiteSearchDataSource - ] = proto.RepeatedField( - proto.ENUM, - number=10, - enum=AdvancedSiteSearchDataSource, + advanced_site_search_data_sources: MutableSequence[AdvancedSiteSearchDataSource] = ( + proto.RepeatedField( + proto.ENUM, + number=10, + enum=AdvancedSiteSearchDataSource, + ) ) schema_org_paths: MutableSequence[str] = proto.RepeatedField( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_service.py index 3b45d5ce6fca..72961420aeb8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_service.py @@ -437,6 +437,7 @@ class RelevanceThreshold(proto.Enum): HIGH (4): High relevance threshold. """ + RELEVANCE_THRESHOLD_UNSPECIFIED = 0 LOWEST = 1 LOW = 2 @@ -456,6 +457,7 @@ class RankingExpressionBackend(proto.Enum): RANK_BY_FORMULA (4): Ranking by custom formula. """ + RANKING_EXPRESSION_BACKEND_UNSPECIFIED = 0 RANK_BY_EMBEDDING = 3 RANK_BY_FORMULA = 4 @@ -792,6 +794,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. For example, ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -808,6 +811,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -917,6 +921,7 @@ class Condition(proto.Enum): Automatic query expansion built by the Search API. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 AUTO = 2 @@ -960,6 +965,7 @@ class Mode(proto.Enum): Search API. Search will be based on the corrected query if found. """ + MODE_UNSPECIFIED = 0 SUGGESTION_ONLY = 1 AUTO = 2 @@ -1009,6 +1015,7 @@ class SearchResultMode(proto.Enum): [DataStore.DocumentProcessingConfig.chunking_config][] is specified. """ + SEARCH_RESULT_MODE_UNSPECIFIED = 0 DOCUMENTS = 1 CHUNKS = 2 @@ -1419,6 +1426,7 @@ class FilterExtractionCondition(proto.Enum): ENABLED (2): Enables NL filter extraction. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1428,11 +1436,11 @@ class FilterExtractionCondition(proto.Enum): number=1, enum="SearchRequest.NaturalLanguageQueryUnderstandingSpec.FilterExtractionCondition", ) - geo_search_query_detection_field_names: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=2, + geo_search_query_detection_field_names: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=2, + ) ) class SearchAsYouTypeSpec(proto.Message): @@ -1458,6 +1466,7 @@ class Condition(proto.Enum): ENABLED (2): Enables Search As You Type. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1964,12 +1973,12 @@ class FacetValue(proto.Message): proto.STRING, number=1, ) - values: MutableSequence[ - "SearchResponse.Facet.FacetValue" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="SearchResponse.Facet.FacetValue", + values: MutableSequence["SearchResponse.Facet.FacetValue"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="SearchResponse.Facet.FacetValue", + ) ) dynamic_facet: bool = proto.Field( proto.BOOL, @@ -2102,6 +2111,7 @@ class SummarySkippedReason(proto.Enum): [SearchRequest.ContentSearchSpec.SummarySpec.ignore_non_answer_seeking_query] is set to ``true``. """ + SUMMARY_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_SUMMARY_SEEKING_QUERY_IGNORED = 2 @@ -2145,12 +2155,12 @@ class CitationMetadata(proto.Message): Citations for segments. """ - citations: MutableSequence[ - "SearchResponse.Summary.Citation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SearchResponse.Summary.Citation", + citations: MutableSequence["SearchResponse.Summary.Citation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SearchResponse.Summary.Citation", + ) ) class Citation(proto.Message): @@ -2174,12 +2184,12 @@ class Citation(proto.Message): proto.INT64, number=2, ) - sources: MutableSequence[ - "SearchResponse.Summary.CitationSource" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.CitationSource", + sources: MutableSequence["SearchResponse.Summary.CitationSource"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.CitationSource", + ) ) class CitationSource(proto.Message): @@ -2277,12 +2287,12 @@ class SummaryWithMetadata(proto.Message): number=2, message="SearchResponse.Summary.CitationMetadata", ) - references: MutableSequence[ - "SearchResponse.Summary.Reference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.Reference", + references: MutableSequence["SearchResponse.Summary.Reference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.Reference", + ) ) summary_text: str = proto.Field( @@ -2451,6 +2461,7 @@ class Comparison(proto.Enum): GREATER_THAN (5): Denotes greater than ``>`` operator. """ + COMPARISON_UNSPECIFIED = 0 EQUALS = 1 LESS_THAN_EQUALS = 2 @@ -2694,6 +2705,7 @@ class OneBoxType(proto.Enum): SLACK (3): One Box result contains slack results. """ + ONE_BOX_TYPE_UNSPECIFIED = 0 PEOPLE = 1 ORGANIZATION = 2 @@ -2704,12 +2716,12 @@ class OneBoxType(proto.Enum): number=1, enum="SearchResponse.OneBoxResult.OneBoxType", ) - search_results: MutableSequence[ - "SearchResponse.SearchResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="SearchResponse.SearchResult", + search_results: MutableSequence["SearchResponse.SearchResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="SearchResponse.SearchResult", + ) ) @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_tuning_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_tuning_service.py index aec8ea4c0e7e..c12391582ca4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_tuning_service.py @@ -68,12 +68,12 @@ class ListCustomModelsResponse(proto.Message): List of custom tuning models. """ - models: MutableSequence[ - custom_tuning_model.CustomTuningModel - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=custom_tuning_model.CustomTuningModel, + models: MutableSequence[custom_tuning_model.CustomTuningModel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=custom_tuning_model.CustomTuningModel, + ) ) diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config_service.py index 385faaa995cd..b19a4aa48391 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config_service.py @@ -126,12 +126,12 @@ class ListServingConfigsResponse(proto.Message): def raw_page(self): return self - serving_configs: MutableSequence[ - gcd_serving_config.ServingConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_serving_config.ServingConfig, + serving_configs: MutableSequence[gcd_serving_config.ServingConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_serving_config.ServingConfig, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session.py index d15a37ed3fff..2e27e51d34b4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session.py @@ -58,6 +58,7 @@ class FileSource(proto.Enum): The file was retrieved from a URL (e.g. public web). """ + FILE_SOURCE_UNSPECIFIED = 0 FILE_SOURCE_INLINE = 1 FILE_SOURCE_LOCAL = 2 @@ -104,6 +105,7 @@ class State(proto.Enum): IN_PROGRESS (1): The session is currently open. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 @@ -253,6 +255,7 @@ class ColorSpace(proto.Enum): OTHER_COLOR_SPACE (5): Other colorspace. """ + COLOR_SPACE_UNSPECIFIED = 0 RGB = 1 CMYK = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine.py index ec498f479137..d4a772f2e989 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine.py @@ -102,6 +102,7 @@ class Type(proto.Enum): EXCLUDE (2): Exclude the target site. """ + TYPE_UNSPECIFIED = 0 INCLUDE = 1 EXCLUDE = 2 @@ -129,6 +130,7 @@ class IndexingStatus(proto.Enum): 2. state reverts to SUCCEEDED if the unindexing fails. """ + INDEXING_STATUS_UNSPECIFIED = 0 PENDING = 1 FAILED = 2 @@ -243,6 +245,7 @@ class SiteVerificationState(proto.Enum): Site exempt from verification, e.g., a public website that opens to all. """ + SITE_VERIFICATION_STATE_UNSPECIFIED = 0 VERIFIED = 1 UNVERIFIED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine_service.py index 620de9950672..e737bcded819 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine_service.py @@ -371,12 +371,12 @@ class ListTargetSitesResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -424,12 +424,12 @@ class BatchCreateTargetSitesResponse(proto.Message): TargetSites created. """ - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) @@ -618,6 +618,7 @@ class CorpusType(proto.Enum): Denotes a crawling attempt for the mobile version of a page. """ + CORPUS_TYPE_UNSPECIFIED = 0 DESKTOP = 1 MOBILE = 2 @@ -837,12 +838,12 @@ class FetchDomainVerificationStatusResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/__init__.py index 499d1b7f56ae..6ccacbfdf560 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.completion_service import ( CompletionServiceAsyncClient, CompletionServiceClient, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/gapic_version.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/gapic_version.py index be6c08cee3cf..e0c1fcd503d9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/gapic_version.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.16.0" # {x-release-please-version} +__version__ = "0.17.0" # {x-release-please-version} diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/async_client.py index a2b8ba7a1fd6..87bd617b6d5b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -129,7 +129,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_info.__func__(CompletionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CompletionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CompletionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +148,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_file.__func__(CompletionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CompletionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CompletionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/client.py index 737729abc802..0e62e82d9ecd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -86,9 +86,7 @@ class CompletionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CompletionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CompletionServiceTransport]] _transport_registry["grpc"] = CompletionServiceGrpcTransport _transport_registry["grpc_asyncio"] = CompletionServiceGrpcAsyncIOTransport _transport_registry["rest"] = CompletionServiceRestTransport @@ -680,11 +678,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CompletionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CompletionServiceClient._read_environment_variables() + ) self._client_cert_source = CompletionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -719,8 +715,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CompletionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/base.py index 83d33eb5f3a6..9690f72838bb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import ( @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc.py index 6ba36c174ca5..ad04b9d2a39b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( completion_service, @@ -428,12 +428,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -461,12 +461,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -493,12 +493,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -525,12 +525,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc_asyncio.py index 026a65da5aa3..589f60c73ee6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( completion_service, @@ -437,12 +437,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -471,12 +471,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -504,12 +504,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -537,12 +537,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest.py index 918d975fd1c3..7ea9dbba3d93 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -818,9 +818,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseAdvancedCompleteQuery._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseAdvancedCompleteQuery._get_http_options() request, metadata = self._interceptor.pre_advanced_complete_query( request, metadata @@ -981,9 +979,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() request, metadata = self._interceptor.pre_complete_query(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_transcoded_request( @@ -1135,9 +1131,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_import_completion_suggestions( request, metadata @@ -1204,11 +1198,10 @@ def __call__( resp = self._interceptor.post_import_completion_suggestions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_completion_suggestions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_completion_suggestions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1297,15 +1290,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_import_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_import_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1369,11 +1359,10 @@ def __call__( resp = self._interceptor.post_import_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1460,9 +1449,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_purge_completion_suggestions( request, metadata @@ -1617,15 +1604,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_purge_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_purge_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1689,11 +1673,10 @@ def __call__( resp = self._interceptor.post_purge_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1748,7 +1731,9 @@ def import_completion_suggestions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._ImportCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_suggestion_deny_list_entries( @@ -1758,7 +1743,9 @@ def import_suggestion_deny_list_entries( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._ImportSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_completion_suggestions( @@ -1768,7 +1755,9 @@ def purge_completion_suggestions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PurgeCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_suggestion_deny_list_entries( @@ -1778,7 +1767,9 @@ def purge_suggestion_deny_list_entries( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PurgeSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -1836,9 +1827,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1958,9 +1947,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2099,9 +2086,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/async_client.py index e53dc5fb4bf0..2f6a16a9563d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,15 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.control_service import pagers -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import common, control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service from .client import ControlServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport @@ -126,7 +124,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_info.__func__(ControlServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ControlServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ControlServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_file.__func__(ControlServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ControlServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ControlServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/client.py index 682adff6c165..8cd1ede63fdc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,15 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.control_service import pagers -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import common, control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport from .transports.grpc import ControlServiceGrpcTransport @@ -85,9 +83,7 @@ class ControlServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ControlServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ControlServiceTransport]] _transport_registry["grpc"] = ControlServiceGrpcTransport _transport_registry["grpc_asyncio"] = ControlServiceGrpcAsyncIOTransport _transport_registry["rest"] = ControlServiceRestTransport @@ -655,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ControlServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ControlServiceClient._read_environment_variables() + ) self._client_cert_source = ControlServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ControlServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/pagers.py index a1486ca1e14b..e174511d3124 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/base.py index 1d67c3bcc3f6..ef2e74ddbe68 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/base.py @@ -17,21 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1beta import gapic_version as package_version -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -264,7 +263,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc.py index 45db19ba5b7e..d626996d62a9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc.py @@ -16,24 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc_asyncio.py index 1a38a0f35eb9..21d160d7470a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,16 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport from .grpc import ControlServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest.py index 95e598f8c795..ebb12c0cdd0b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,14 +28,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseControlServiceRestTransport @@ -1295,9 +1294,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest_base.py index 19345fbe25b4..0f888f1cd44a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest_base.py @@ -17,15 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/async_client.py index d8e3cbbb443d..141a7198f7f6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,22 +44,22 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.conversational_search_service import ( pagers, ) from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, conversational_search_service, search_service, + session, ) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .client import ConversationalSearchServiceClient @@ -164,7 +164,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_info.__func__(ConversationalSearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConversationalSearchServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + ConversationalSearchServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -180,7 +185,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_file.__func__(ConversationalSearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConversationalSearchServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + ConversationalSearchServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -218,7 +228,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationalSearchServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/client.py index 656e80305ac6..3c9668666458 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,22 +61,22 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.conversational_search_service import ( pagers, ) from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, conversational_search_service, search_service, + session, ) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .transports.base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport @@ -93,13 +93,11 @@ class ConversationalSearchServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationalSearchServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = ConversationalSearchServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + ConversationalSearchServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = ConversationalSearchServiceRestTransport def get_transport_class( @@ -797,11 +795,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationalSearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationalSearchServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConversationalSearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -838,8 +834,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationalSearchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/pagers.py index a49e184bfdeb..8254c11211fe 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -233,7 +233,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/__init__.py index 855e35aad0c0..234e039d4add 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationalSearchServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConversationalSearchServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConversationalSearchServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/base.py index e22ca15b14e8..b2adcab11e71 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1beta import gapic_version as package_version +from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -388,7 +390,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc.py index b429f2feb4c9..7ee8e2903b3b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc_asyncio.py index 965f0029d7c0..aa4b5feee6d3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,18 +31,16 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest.py index 462dd2586018..6cb5da9cc7cd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,16 +28,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -977,9 +979,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() request, metadata = self._interceptor.pre_answer_query(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_transcoded_request( @@ -1139,9 +1139,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() request, metadata = self._interceptor.pre_converse_conversation( request, metadata @@ -1299,9 +1297,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1452,9 +1448,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() request, metadata = self._interceptor.pre_create_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_transcoded_request( @@ -1601,9 +1595,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -1710,9 +1702,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() request, metadata = self._interceptor.pre_delete_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_transcoded_request( @@ -1823,9 +1813,7 @@ def __call__( Defines an answer. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() request, metadata = self._interceptor.pre_get_answer(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_transcoded_request( @@ -1972,9 +1960,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -2121,9 +2107,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() request, metadata = self._interceptor.pre_get_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_transcoded_request( @@ -2270,9 +2254,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2421,9 +2403,7 @@ def __call__( Response for ListSessions method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() request, metadata = self._interceptor.pre_list_sessions(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_transcoded_request( @@ -2576,9 +2556,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() request, metadata = self._interceptor.pre_update_conversation( request, metadata @@ -2729,9 +2707,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() request, metadata = self._interceptor.pre_update_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_transcoded_request( @@ -3015,9 +2991,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3140,9 +3114,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3283,9 +3255,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest_base.py index ae5d28652b6f..9cd2be9c192f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/async_client.py index 3810390b7f16..6f09e5bdc3df 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -46,21 +46,21 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.data_store_service import pagers from google.cloud.discoveryengine_v1beta.types import ( + common, + data_store, data_store_service, document_processing_config, schema, ) from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import data_store from .client import DataStoreServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport @@ -141,7 +141,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_info.__func__(DataStoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataStoreServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataStoreServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +160,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_file.__func__(DataStoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataStoreServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataStoreServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/client.py index e368e2741610..8796ede3c9b0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -63,21 +63,21 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.data_store_service import pagers from google.cloud.discoveryengine_v1beta.types import ( + common, + data_store, data_store_service, document_processing_config, schema, ) from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import data_store from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport from .transports.grpc import DataStoreServiceGrpcTransport @@ -93,9 +93,7 @@ class DataStoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataStoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataStoreServiceTransport]] _transport_registry["grpc"] = DataStoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataStoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataStoreServiceRestTransport @@ -710,11 +708,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataStoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataStoreServiceClient._read_environment_variables() + ) self._client_cert_source = DataStoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -749,8 +745,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataStoreServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/pagers.py index d0f8b59dd333..325cef6558b8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/base.py index f88070ea435e..df3a68ea8188 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version +from google.cloud.discoveryengine_v1beta.types import data_store, data_store_service from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import data_store -from google.cloud.discoveryengine_v1beta.types import data_store_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -268,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc.py index 34171a829227..9c05846646b0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import data_store, data_store_service from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import data_store -from google.cloud.discoveryengine_v1beta.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc_asyncio.py index 0230fe0f5c31..d993960945e6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import data_store, data_store_service from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import data_store -from google.cloud.discoveryengine_v1beta.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport from .grpc import DataStoreServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest.py index 4ceb249d7f7e..6f5fb50a4708 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1beta.types import data_store, data_store_service from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import data_store -from google.cloud.discoveryengine_v1beta.types import data_store_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataStoreServiceRestTransport @@ -758,9 +757,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() request, metadata = self._interceptor.pre_create_data_store( request, metadata @@ -913,9 +910,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() request, metadata = self._interceptor.pre_delete_data_store( request, metadata @@ -1210,9 +1205,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() request, metadata = self._interceptor.pre_list_data_stores( request, metadata @@ -1364,9 +1357,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() request, metadata = self._interceptor.pre_update_data_store( request, metadata @@ -1566,9 +1557,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1828,9 +1817,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataStoreServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest_base.py index caabb77ccfcb..0e20d1a84c23 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1beta.types import data_store, data_store_service from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import data_store -from google.cloud.discoveryengine_v1beta.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/async_client.py index 2320c546e064..bdf75ed7dc31 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -46,19 +46,19 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.document_service import pagers from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document from .client import DocumentServiceClient @@ -138,7 +138,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_info.__func__(DocumentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DocumentServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DocumentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +157,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_file.__func__(DocumentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DocumentServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DocumentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/client.py index a2c82008d8bc..ce9251261e92 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -63,19 +63,19 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.document_service import pagers from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -92,9 +92,7 @@ class DocumentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] _transport_registry["grpc"] = DocumentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentServiceRestTransport @@ -719,11 +717,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -758,8 +754,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/pagers.py index 6977cda8ad51..727eeb7100c1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/base.py index 6fbf92a14e23..4110007f482c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/base.py @@ -17,24 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -327,7 +327,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc.py index 93ebc06ba7a0..943d36bda1d1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc.py @@ -16,27 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -586,12 +586,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc_asyncio.py index f68ebfdbc183..5d6d7f48764e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,19 +31,15 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -603,12 +603,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest.py index 4d31a7e055e6..5e75dafb28be 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest.py @@ -16,27 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -890,9 +890,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() request, metadata = self._interceptor.pre_batch_get_documents_metadata( request, metadata @@ -1048,9 +1046,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() request, metadata = self._interceptor.pre_create_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_transcoded_request( @@ -1195,9 +1191,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() request, metadata = self._interceptor.pre_delete_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_transcoded_request( @@ -1458,9 +1452,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() request, metadata = self._interceptor.pre_import_documents( request, metadata @@ -1764,9 +1756,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() request, metadata = self._interceptor.pre_purge_documents(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_transcoded_request( @@ -1917,9 +1907,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() request, metadata = self._interceptor.pre_update_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_transcoded_request( @@ -2021,7 +2009,9 @@ def batch_get_documents_metadata( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchGetDocumentsMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._BatchGetDocumentsMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_document( @@ -2136,9 +2126,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2398,9 +2386,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest_base.py index e75b03cc9588..666f2b02d3d7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest_base.py @@ -17,18 +17,18 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/async_client.py index 72d132225159..ab061c4a243b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -46,17 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.engine_service import pagers -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import common, engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service from .client import EngineServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport @@ -128,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_info.__func__(EngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EngineServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EngineServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_file.__func__(EngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EngineServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EngineServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/client.py index 08cac365fc3c..1b153c4424ac 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -63,17 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.engine_service import pagers -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import common, engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport from .transports.grpc import EngineServiceGrpcTransport @@ -657,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EngineServiceClient._read_environment_variables() + ) self._client_cert_source = EngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -696,8 +692,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/pagers.py index e7a17a16adc3..514c60b74f0a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/base.py index 7bdb2ca65d25..b025a1e084a7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -310,7 +309,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc.py index 5870795ef656..056a3bf26a58 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc_asyncio.py index d9b75c05f3c8..7b6304851f7b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport from .grpc import EngineServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest.py index 518037a039c5..de4f6ba8f389 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEngineServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest_base.py index 707a597badfb..0cb94b8b8b97 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/async_client.py index d7091d38905a..584a6b5ff3ab 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -46,15 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.evaluation_service import pagers +from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service from google.cloud.discoveryengine_v1beta.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1beta.types import evaluation -from google.cloud.discoveryengine_v1beta.types import evaluation_service from .client import EvaluationServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport @@ -144,7 +143,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EvaluationServiceAsyncClient: The constructed client. """ - return EvaluationServiceClient.from_service_account_info.__func__(EvaluationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EvaluationServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EvaluationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -160,7 +162,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EvaluationServiceAsyncClient: The constructed client. """ - return EvaluationServiceClient.from_service_account_file.__func__(EvaluationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EvaluationServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EvaluationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/client.py index 5c5b9ea77ff0..fcb46b6b0025 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -63,15 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.evaluation_service import pagers +from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service from google.cloud.discoveryengine_v1beta.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1beta.types import evaluation -from google.cloud.discoveryengine_v1beta.types import evaluation_service from .transports.base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport from .transports.grpc import EvaluationServiceGrpcTransport @@ -87,9 +86,7 @@ class EvaluationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EvaluationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EvaluationServiceTransport]] _transport_registry["grpc"] = EvaluationServiceGrpcTransport _transport_registry["grpc_asyncio"] = EvaluationServiceGrpcAsyncIOTransport _transport_registry["rest"] = EvaluationServiceRestTransport @@ -794,11 +791,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EvaluationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EvaluationServiceClient._read_environment_variables() + ) self._client_cert_source = EvaluationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -833,8 +828,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EvaluationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/pagers.py index 9a3049cfa341..48491fb17469 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/base.py index fdd1ffc19c35..08b73c0cc991 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service @@ -255,7 +255,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc.py index eab8f572169b..d74df80b4541 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc_asyncio.py index f1d611ceb6af..8b5d8c2b41f6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest.py index 9e9c266242e8..f915ce2dfa94 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -701,9 +701,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseCreateEvaluation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseCreateEvaluation._get_http_options() request, metadata = self._interceptor.pre_create_evaluation( request, metadata @@ -857,9 +855,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_evaluation(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_transcoded_request( @@ -1007,9 +1003,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListEvaluationResults._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListEvaluationResults._get_http_options() request, metadata = self._interceptor.pre_list_evaluation_results( request, metadata @@ -1165,9 +1159,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListEvaluations._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListEvaluations._get_http_options() request, metadata = self._interceptor.pre_list_evaluations( request, metadata @@ -1355,9 +1347,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1477,9 +1467,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1618,9 +1606,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/async_client.py index c65372ddc526..b10dfc898e77 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -143,7 +143,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_info.__func__(GroundedGenerationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GroundedGenerationServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GroundedGenerationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +162,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_file.__func__(GroundedGenerationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GroundedGenerationServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + GroundedGenerationServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -197,7 +205,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GroundedGenerationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/client.py index 81d3454d19a3..cc67cec69f43 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -85,9 +85,7 @@ class GroundedGenerationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GroundedGenerationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport @@ -674,11 +672,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GroundedGenerationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GroundedGenerationServiceClient._read_environment_variables() + ) self._client_cert_source = ( GroundedGenerationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -715,8 +711,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GroundedGenerationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/__init__.py index 0f3052cbd079..ec0eaca83aa8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GroundedGenerationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/base.py index 3208bacde8bf..11847d001a1b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import grounded_generation_service @@ -239,7 +239,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc.py index 97c4b7a47cff..c93b91d5718b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import grounded_generation_service @@ -346,12 +346,12 @@ def stream_generate_grounded_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_generate_grounded_content" not in self._stubs: - self._stubs[ - "stream_generate_grounded_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.discoveryengine.v1beta.GroundedGenerationService/StreamGenerateGroundedContent", - request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, - response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + self._stubs["stream_generate_grounded_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.discoveryengine.v1beta.GroundedGenerationService/StreamGenerateGroundedContent", + request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, + response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + ) ) return self._stubs["stream_generate_grounded_content"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc_asyncio.py index 248264e393c3..66b061dfee8a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import grounded_generation_service @@ -354,12 +354,12 @@ def stream_generate_grounded_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_generate_grounded_content" not in self._stubs: - self._stubs[ - "stream_generate_grounded_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.discoveryengine.v1beta.GroundedGenerationService/StreamGenerateGroundedContent", - request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, - response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + self._stubs["stream_generate_grounded_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.discoveryengine.v1beta.GroundedGenerationService/StreamGenerateGroundedContent", + request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, + response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + ) ) return self._stubs["stream_generate_grounded_content"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest.py index 4f218f7971e9..2bd8baeda92f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -424,9 +424,7 @@ def __call__( """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() request, metadata = self._interceptor.pre_check_grounding(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_transcoded_request( @@ -584,9 +582,7 @@ def __call__( Response for the ``GenerateGroundedContent`` method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseGenerateGroundedContent._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseGenerateGroundedContent._get_http_options() request, metadata = self._interceptor.pre_generate_grounded_content( request, metadata @@ -726,7 +722,9 @@ def generate_grounded_content( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateGroundedContent(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateGroundedContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def stream_generate_grounded_content( @@ -737,7 +735,9 @@ def stream_generate_grounded_content( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._StreamGenerateGroundedContent(self._session, self._host, self._interceptor) # type: ignore + return self._StreamGenerateGroundedContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -795,9 +795,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -920,9 +918,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1063,9 +1059,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/async_client.py index 02380ccf02f9..afbe32a3ba52 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -119,7 +119,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_info.__func__(ProjectServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ProjectServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ProjectServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_file.__func__(ProjectServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ProjectServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ProjectServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/client.py index 5b04757b06ee..eb041cea9147 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -82,9 +82,7 @@ class ProjectServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ProjectServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ProjectServiceTransport]] _transport_registry["grpc"] = ProjectServiceGrpcTransport _transport_registry["grpc_asyncio"] = ProjectServiceGrpcAsyncIOTransport _transport_registry["rest"] = ProjectServiceRestTransport @@ -619,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProjectServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProjectServiceClient._read_environment_variables() + ) self._client_cert_source = ProjectServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -658,8 +654,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProjectServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/base.py index c760a8cdc784..c36acb13fa2a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import project_service @@ -207,7 +207,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc.py index 06508f0203a3..bc6259df509a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import project_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc_asyncio.py index d1bdfde6cdd3..74fa602db21f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import project_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest.py index 4448d1c2fbc3..16a48c4deb4f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -523,9 +523,7 @@ def __call__( """ - http_options = ( - _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() request, metadata = self._interceptor.pre_provision_project( request, metadata @@ -681,9 +679,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/async_client.py index 2c45bd54afed..0a0dd485e718 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -113,7 +113,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_info.__func__(RankServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + RankServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(RankServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +132,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_file.__func__(RankServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + RankServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(RankServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/client.py index eed42b34cda3..11a3aa6113cf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -620,11 +620,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RankServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RankServiceClient._read_environment_variables() + ) self._client_cert_source = RankServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -659,8 +657,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RankServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/base.py index a703e7356aa8..942c5a3b6a82 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import rank_service @@ -202,7 +202,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc.py index 58ff9c29dca8..0179cf6eae42 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import rank_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc_asyncio.py index 8375e6cb7fb3..207c85b4f3a2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import rank_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest.py index 6f230c8ce341..4b2f8d6b7429 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/async_client.py index 62924e4d001c..7fe03cc17d69 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -127,7 +127,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_info.__func__(RecommendationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + RecommendationServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(RecommendationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +146,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_file.__func__(RecommendationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + RecommendationServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(RecommendationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +187,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return RecommendationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return RecommendationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> RecommendationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/client.py index 2bd443c44749..7cff9d53476e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -80,9 +80,7 @@ class RecommendationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RecommendationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport @@ -702,11 +700,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RecommendationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RecommendationServiceClient._read_environment_variables() + ) self._client_cert_source = RecommendationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -741,8 +737,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RecommendationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/__init__.py index f21f53c111bf..a09bbaaf4d43 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RecommendationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/base.py index f8d46f6a2c6a..097be38da00e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import recommendation_service @@ -205,7 +205,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc.py index 7f36002600fd..de3fd7c6a30c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import recommendation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc_asyncio.py index ed2eb3222390..ceafa7dd7250 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import recommendation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest.py index d60d15b2547b..1009031f45fe 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -358,9 +358,7 @@ def __call__( """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() request, metadata = self._interceptor.pre_recommend(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseRecommend._get_transcoded_request( @@ -522,9 +520,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -647,9 +643,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -788,9 +782,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/async_client.py index 34828de2d4de..d166dbc40d05 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -46,16 +46,18 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.sample_query_service import pagers +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service from .client import SampleQueryServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport @@ -131,7 +133,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SampleQueryServiceAsyncClient: The constructed client. """ - return SampleQueryServiceClient.from_service_account_info.__func__(SampleQueryServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SampleQueryServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SampleQueryServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +152,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SampleQueryServiceAsyncClient: The constructed client. """ - return SampleQueryServiceClient.from_service_account_file.__func__(SampleQueryServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SampleQueryServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SampleQueryServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -185,7 +193,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SampleQueryServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SampleQueryServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SampleQueryServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/client.py index 821d35885819..7dbd8f55552c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -63,16 +63,18 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.sample_query_service import pagers +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service from .transports.base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport from .transports.grpc import SampleQueryServiceGrpcTransport @@ -88,9 +90,7 @@ class SampleQueryServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SampleQueryServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SampleQueryServiceTransport]] _transport_registry["grpc"] = SampleQueryServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQueryServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQueryServiceRestTransport @@ -660,11 +660,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SampleQueryServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SampleQueryServiceClient._read_environment_variables() + ) self._client_cert_source = SampleQueryServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -699,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SampleQueryServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/pagers.py index 2d8722fb80d9..34bb346d95d6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/__init__.py index 0f5acb01b776..f8fb6800d64a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SampleQueryServiceRestInterceptor, SampleQueryServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SampleQueryServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SampleQueryServiceTransport]] _transport_registry["grpc"] = SampleQueryServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQueryServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQueryServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/base.py index 9309e6a7e732..f16c3770118f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/base.py @@ -17,22 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1beta import gapic_version as package_version +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -284,7 +286,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc.py index 844792a5364d..c87d5d9213a8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc_asyncio.py index 3e947c69297e..550618ac865d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,17 +31,15 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport from .grpc import SampleQueryServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest.py index f93138dc5eeb..886083847437 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest.py @@ -16,25 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSampleQueryServiceRestTransport @@ -778,9 +780,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseCreateSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseCreateSampleQuery._get_http_options() request, metadata = self._interceptor.pre_create_sample_query( request, metadata @@ -928,9 +928,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseDeleteSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseDeleteSampleQuery._get_http_options() request, metadata = self._interceptor.pre_delete_sample_query( request, metadata @@ -1045,9 +1043,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseGetSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseGetSampleQuery._get_http_options() request, metadata = self._interceptor.pre_get_sample_query( request, metadata @@ -1198,9 +1194,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseImportSampleQueries._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseImportSampleQueries._get_http_options() request, metadata = self._interceptor.pre_import_sample_queries( request, metadata @@ -1355,9 +1349,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseListSampleQueries._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseListSampleQueries._get_http_options() request, metadata = self._interceptor.pre_list_sample_queries( request, metadata @@ -1509,9 +1501,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseUpdateSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseUpdateSampleQuery._get_http_options() request, metadata = self._interceptor.pre_update_sample_query( request, metadata @@ -1719,9 +1709,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1842,9 +1830,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1983,9 +1969,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSampleQueryServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest_base.py index 5732469095bf..884ce9623d6b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest_base.py @@ -17,16 +17,18 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/async_client.py index 1d41a1794313..c95322c21ba5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,17 +44,19 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.sample_query_set_service import pagers +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service from .client import SampleQuerySetServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport @@ -132,7 +134,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SampleQuerySetServiceAsyncClient: The constructed client. """ - return SampleQuerySetServiceClient.from_service_account_info.__func__(SampleQuerySetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SampleQuerySetServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SampleQuerySetServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +153,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SampleQuerySetServiceAsyncClient: The constructed client. """ - return SampleQuerySetServiceClient.from_service_account_file.__func__(SampleQuerySetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SampleQuerySetServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SampleQuerySetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -186,7 +194,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SampleQuerySetServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SampleQuerySetServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SampleQuerySetServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/client.py index 383c20915ce7..7956a60c8961 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,17 +61,19 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.sample_query_set_service import pagers +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service from .transports.base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport from .transports.grpc import SampleQuerySetServiceGrpcTransport @@ -87,9 +89,7 @@ class SampleQuerySetServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SampleQuerySetServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SampleQuerySetServiceTransport]] _transport_registry["grpc"] = SampleQuerySetServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQuerySetServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQuerySetServiceRestTransport @@ -654,11 +654,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SampleQuerySetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SampleQuerySetServiceClient._read_environment_variables() + ) self._client_cert_source = SampleQuerySetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -693,8 +691,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SampleQuerySetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/pagers.py index fd027cc1e28d..ab5114e260e9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/__init__.py index 44ad1aa56225..a953bda6fade 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SampleQuerySetServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SampleQuerySetServiceTransport]] _transport_registry["grpc"] = SampleQuerySetServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQuerySetServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQuerySetServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/base.py index 7b8488f52601..310fd61b10b5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1beta import gapic_version as package_version +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -274,7 +276,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc.py index d82d678b1610..132e5a85bcfb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc_asyncio.py index 4fcca1060c9c..50f07675f41a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,18 +31,16 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport from .grpc import SampleQuerySetServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest.py index d7fc161269c5..de5cbd6dc2a7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,16 +28,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSampleQuerySetServiceRestTransport @@ -565,9 +567,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseCreateSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseCreateSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_create_sample_query_set( request, metadata @@ -719,9 +719,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseDeleteSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseDeleteSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_delete_sample_query_set( request, metadata @@ -840,9 +838,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseGetSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseGetSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_get_sample_query_set( request, metadata @@ -994,9 +990,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseListSampleQuerySets._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseListSampleQuerySets._get_http_options() request, metadata = self._interceptor.pre_list_sample_query_sets( request, metadata @@ -1154,9 +1148,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseUpdateSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseUpdateSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_update_sample_query_set( request, metadata @@ -1365,9 +1357,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1490,9 +1480,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1631,9 +1619,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest_base.py index d37e1a25b1eb..5f8328b46ffb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/async_client.py index 0f5aca0d57e5..1a0b8a2ad803 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -46,15 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.schema_service import pagers -from google.cloud.discoveryengine_v1beta.types import schema +from google.cloud.discoveryengine_v1beta.types import schema, schema_service from google.cloud.discoveryengine_v1beta.types import schema as gcd_schema -from google.cloud.discoveryengine_v1beta.types import schema_service from .client import SchemaServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport @@ -126,7 +125,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): @@ -142,7 +144,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 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/client.py index edaf94b1e0e2..2600bc3e6fb9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -63,15 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.schema_service import pagers -from google.cloud.discoveryengine_v1beta.types import schema +from google.cloud.discoveryengine_v1beta.types import schema, schema_service from google.cloud.discoveryengine_v1beta.types import schema as gcd_schema -from google.cloud.discoveryengine_v1beta.types import schema_service from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport from .transports.grpc import SchemaServiceGrpcTransport @@ -653,11 +652,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SchemaServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SchemaServiceClient._read_environment_variables() + ) self._client_cert_source = SchemaServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -692,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SchemaServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/pagers.py index 3e571974fcfc..15bb85a654be 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/base.py index 39078257ffd7..4d6119220330 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import schema, schema_service @@ -266,7 +266,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc.py index 3bb625e3288e..ca6de7bbd6c7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import schema, schema_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc_asyncio.py index bf4829dc9442..1413949bf8ea 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import schema, schema_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest.py index f8d4a20b15a5..f63d141e647b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/async_client.py index 9152e7214767..9e19d1bc888f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -128,7 +128,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_info.__func__(SearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SearchServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SearchServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +147,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_file.__func__(SearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SearchServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SearchServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/client.py index 730696c17933..44f83220bf03 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -747,11 +747,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchServiceClient._read_environment_variables() + ) self._client_cert_source = SearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -786,8 +784,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/pagers.py index 245dd7f9e21d..eb15d810a10f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/base.py index c0d6ca633586..1897910a44dd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import search_service @@ -216,7 +216,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc.py index f19b576030c2..b499893234a2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import search_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc_asyncio.py index c6e20c6cd93a..2eeff5eaff61 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import search_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest.py index c46e4a992fed..efe6f030866a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/async_client.py index 7bac8b1abb18..1f45d85687b2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -128,7 +128,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_info.__func__(SearchTuningServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SearchTuningServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SearchTuningServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +147,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_file.__func__(SearchTuningServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SearchTuningServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SearchTuningServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -182,7 +188,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SearchTuningServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/client.py index d4d1cf019bfc..5ba5de7e6422 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -85,9 +85,7 @@ class SearchTuningServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SearchTuningServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport @@ -655,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchTuningServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchTuningServiceClient._read_environment_variables() + ) self._client_cert_source = SearchTuningServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchTuningServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/__init__.py index d759f5c3cdcd..170e258db18b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SearchTuningServiceRestInterceptor, SearchTuningServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SearchTuningServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/base.py index 6bf9f9b79c8b..4faea8d179f7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import search_tuning_service @@ -224,7 +224,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc.py index 78eaf2b5a2e1..eaed35c3a518 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import search_tuning_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc_asyncio.py index 07fc4b8e2137..aa6a4e05c764 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import search_tuning_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest.py index d017dffced0a..eaa4b1080641 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -583,9 +583,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() request, metadata = self._interceptor.pre_list_custom_models( request, metadata @@ -738,9 +736,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() request, metadata = self._interceptor.pre_train_custom_model( request, metadata @@ -910,9 +906,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1033,9 +1027,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1174,9 +1166,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/async_client.py index 86cf885c1f8e..41185f83a728 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,18 +44,21 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.serving_config_service import pagers +from google.cloud.discoveryengine_v1beta.types import ( + common, + search_service, + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import common, search_service -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service from .client import ServingConfigServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport @@ -127,7 +130,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_info.__func__(ServingConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ServingConfigServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(ServingConfigServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +149,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_file.__func__(ServingConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ServingConfigServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(ServingConfigServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +190,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ServingConfigServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/client.py index 9f8d11e592a6..7c01a2f3c7cc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,18 +61,21 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.serving_config_service import pagers +from google.cloud.discoveryengine_v1beta.types import ( + common, + search_service, + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import common, search_service -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport from .transports.grpc import ServingConfigServiceGrpcTransport @@ -88,9 +91,7 @@ class ServingConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ServingConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport @@ -638,11 +639,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServingConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServingConfigServiceClient._read_environment_variables() + ) self._client_cert_source = ServingConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +676,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServingConfigServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/pagers.py index d21bb5f36c17..fd0b70c7768e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/__init__.py index 6bdd4697d637..5e6ab0b7e7f9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ServingConfigServiceRestInterceptor, ServingConfigServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ServingConfigServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/base.py index 58fc7641f93d..27d4dd4614fd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/base.py @@ -17,22 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version +from google.cloud.discoveryengine_v1beta.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -240,7 +242,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc.py index 4da66aaf6a85..633426752ffa 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc_asyncio.py index f4a00d16bf7e..0f5d4318c450 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,16 +31,15 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport from .grpc import ServingConfigServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest.py index 8703bf54329f..2d8a911c3dda 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +27,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1beta.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseServingConfigServiceRestTransport @@ -483,9 +485,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseGetServingConfig._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseGetServingConfig._get_http_options() request, metadata = self._interceptor.pre_get_serving_config( request, metadata @@ -635,9 +635,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseListServingConfigs._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseListServingConfigs._get_http_options() request, metadata = self._interceptor.pre_list_serving_configs( request, metadata @@ -796,9 +794,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() request, metadata = self._interceptor.pre_update_serving_config( request, metadata @@ -985,9 +981,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1108,9 +1102,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1249,9 +1241,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest_base.py index 07249d539623..bc386f8199d5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest_base.py @@ -22,11 +22,13 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1beta.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/async_client.py index 008c6f259ab3..723a59e35e39 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,14 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.session_service import pagers -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import session +from google.cloud.discoveryengine_v1beta.types import ( + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .client import SessionServiceClient @@ -128,7 +130,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_info.__func__(SessionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SessionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SessionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +149,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_file.__func__(SessionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SessionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(SessionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/client.py index b361f71c46df..25109ca29c20 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,14 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.session_service import pagers -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import session +from google.cloud.discoveryengine_v1beta.types import ( + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .transports.base import DEFAULT_CLIENT_INFO, SessionServiceTransport @@ -85,9 +87,7 @@ class SessionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionServiceTransport]] _transport_registry["grpc"] = SessionServiceGrpcTransport _transport_registry["grpc_asyncio"] = SessionServiceGrpcAsyncIOTransport _transport_registry["rest"] = SessionServiceRestTransport @@ -731,11 +731,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionServiceClient._read_environment_variables() + ) self._client_cert_source = SessionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -770,8 +768,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/pagers.py index 519fa65bf54d..ada9ad122e6a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/base.py index 8f9f2c3f7753..854b9bb70c80 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/base.py @@ -17,20 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1beta import gapic_version as package_version -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import session +from google.cloud.discoveryengine_v1beta.types import ( + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import session as gcd_session DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -264,7 +266,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc.py index 22441d9b8cc9..a32c6ab7c58f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import session +from google.cloud.discoveryengine_v1beta.types import ( + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc_asyncio.py index 2c5f5d40b13f..774487e309dd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,15 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import session +from google.cloud.discoveryengine_v1beta.types import ( + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest.py index 4bfd23480142..1ff209ab8a9e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,13 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import session +from google.cloud.discoveryengine_v1beta.types import ( + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -1292,9 +1294,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest_base.py index 9d8fbfc7e43c..c0bb3682c816 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest_base.py @@ -17,14 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import session +from google.cloud.discoveryengine_v1beta.types import ( + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/async_client.py index fde2b9d19fec..6f4e8799c019 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -46,10 +46,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.site_search_engine_service import ( pagers, @@ -141,7 +141,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_info.__func__(SiteSearchEngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SiteSearchEngineServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(SiteSearchEngineServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +160,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_file.__func__(SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SiteSearchEngineServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -195,7 +203,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SiteSearchEngineServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/client.py index d1f70e282b61..5c858ce94a69 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -63,10 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.site_search_engine_service import ( pagers, @@ -90,9 +90,7 @@ class SiteSearchEngineServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport @@ -686,11 +684,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SiteSearchEngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SiteSearchEngineServiceClient._read_environment_variables() + ) self._client_cert_source = ( SiteSearchEngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -727,8 +723,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SiteSearchEngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/pagers.py index e9d54b6c0c8f..8c24e83fb859 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -315,7 +315,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/__init__.py index 5443c0c10cf1..0c91743e9878 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/base.py index 8e10cca11b88..66a8ce46393c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import ( @@ -418,7 +418,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc.py index 529aa4ed06cf..aa0802588877 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( site_search_engine, @@ -661,12 +661,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -693,12 +693,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -786,12 +786,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc_asyncio.py index 3416e87016f7..df3556c19384 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( site_search_engine, @@ -675,12 +675,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -707,12 +707,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -801,12 +801,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest.py index 9419bbc0740f..b7d9ae1df97b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1336,9 +1336,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_create_target_sites( request, metadata @@ -1492,9 +1490,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_verify_target_sites( request, metadata @@ -1648,9 +1644,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_http_options() request, metadata = self._interceptor.pre_create_sitemap(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_transcoded_request( @@ -1804,9 +1798,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() request, metadata = self._interceptor.pre_create_target_site( request, metadata @@ -1961,9 +1953,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_http_options() request, metadata = self._interceptor.pre_delete_sitemap(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_transcoded_request( @@ -2111,9 +2101,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() request, metadata = self._interceptor.pre_delete_target_site( request, metadata @@ -2267,9 +2255,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_disable_advanced_site_search( request, metadata @@ -2424,9 +2410,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_enable_advanced_site_search( request, metadata @@ -2582,9 +2566,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() request, metadata = self._interceptor.pre_fetch_domain_verification_status( request, metadata @@ -2652,11 +2634,10 @@ def __call__( resp = self._interceptor.post_fetch_domain_verification_status(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_domain_verification_status_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_domain_verification_status_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2743,9 +2724,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_http_options() request, metadata = self._interceptor.pre_fetch_sitemaps(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_transcoded_request( @@ -2900,9 +2879,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() request, metadata = self._interceptor.pre_get_site_search_engine( request, metadata @@ -3055,9 +3032,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() request, metadata = self._interceptor.pre_get_target_site(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_transcoded_request( @@ -3207,9 +3182,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() request, metadata = self._interceptor.pre_list_target_sites( request, metadata @@ -3366,9 +3339,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() request, metadata = self._interceptor.pre_recrawl_uris(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_transcoded_request( @@ -3520,9 +3491,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() request, metadata = self._interceptor.pre_update_target_site( request, metadata @@ -3626,7 +3595,9 @@ def batch_create_target_sites( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchCreateTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_verify_target_sites( @@ -3637,7 +3608,9 @@ def batch_verify_target_sites( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchVerifyTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchVerifyTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_sitemap( @@ -3688,7 +3661,9 @@ def disable_advanced_site_search( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DisableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._DisableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def enable_advanced_site_search( @@ -3699,7 +3674,9 @@ def enable_advanced_site_search( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._EnableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._EnableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_domain_verification_status( @@ -3710,7 +3687,9 @@ def fetch_domain_verification_status( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchDomainVerificationStatus(self._session, self._host, self._interceptor) # type: ignore + return self._FetchDomainVerificationStatus( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_sitemaps( @@ -3831,9 +3810,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3956,9 +3933,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -4097,9 +4072,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/async_client.py index c61c33141ab7..8c1db15bbc0d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -47,10 +47,10 @@ import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.any_pb2 as any_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.types import ( common, @@ -132,7 +132,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_info.__func__(UserEventServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + UserEventServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(UserEventServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +151,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_file.__func__(UserEventServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + UserEventServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(UserEventServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/client.py index ff492ea5eb6b..e35a12028829 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -64,10 +64,10 @@ import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.any_pb2 as any_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.types import ( common, @@ -91,9 +91,7 @@ class UserEventServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[UserEventServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[UserEventServiceTransport]] _transport_registry["grpc"] = UserEventServiceGrpcTransport _transport_registry["grpc_asyncio"] = UserEventServiceGrpcAsyncIOTransport _transport_registry["rest"] = UserEventServiceRestTransport @@ -687,11 +685,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UserEventServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UserEventServiceClient._read_environment_variables() + ) self._client_cert_source = UserEventServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -726,8 +722,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UserEventServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/base.py index 6747343b2410..b6828c4c9260 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/base.py @@ -18,15 +18,15 @@ import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import ( @@ -264,7 +264,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc.py index 852510d575d8..7ca0bdf0a7cd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( import_config, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc_asyncio.py index d9b9729cb1a6..c4930d26da39 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc_asyncio.py @@ -17,10 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -29,10 +32,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( import_config, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest.py index a71ee601651b..d7e9baa4de64 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -744,9 +744,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() request, metadata = self._interceptor.pre_collect_user_event( request, metadata @@ -896,9 +894,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() request, metadata = self._interceptor.pre_import_user_events( request, metadata @@ -1051,9 +1047,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() request, metadata = self._interceptor.pre_purge_user_events( request, metadata @@ -1206,9 +1200,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() request, metadata = self._interceptor.pre_write_user_event( request, metadata @@ -1391,9 +1383,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1653,9 +1643,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseUserEventServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/__init__.py index c349abe5f20e..8d70c32e357a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/__init__.py @@ -13,8 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .answer import Answer -from .chunk import Chunk +from .answer import ( + Answer, +) +from .chunk import ( + Chunk, +) from .common import ( CustomAttribute, DoubleList, @@ -27,14 +31,20 @@ SolutionType, UserInfo, ) -from .completion import CompletionSuggestion, SuggestionDenyListEntry +from .completion import ( + CompletionSuggestion, + SuggestionDenyListEntry, +) from .completion_service import ( AdvancedCompleteQueryRequest, AdvancedCompleteQueryResponse, CompleteQueryRequest, CompleteQueryResponse, ) -from .control import Condition, Control +from .control import ( + Condition, + Control, +) from .control_service import ( CreateControlRequest, DeleteControlRequest, @@ -69,7 +79,9 @@ UpdateConversationRequest, UpdateSessionRequest, ) -from .custom_tuning_model import CustomTuningModel +from .custom_tuning_model import ( + CustomTuningModel, +) from .data_store import ( DataStore, LanguageInfo, @@ -86,8 +98,12 @@ ListDataStoresResponse, UpdateDataStoreRequest, ) -from .document import Document -from .document_processing_config import DocumentProcessingConfig +from .document import ( + Document, +) +from .document_processing_config import ( + DocumentProcessingConfig, +) from .document_service import ( BatchGetDocumentsMetadataRequest, BatchGetDocumentsMetadataResponse, @@ -98,7 +114,9 @@ ListDocumentsResponse, UpdateDocumentRequest, ) -from .engine import Engine +from .engine import ( + Engine, +) from .engine_service import ( CreateEngineMetadata, CreateEngineRequest, @@ -114,7 +132,10 @@ TuneEngineResponse, UpdateEngineRequest, ) -from .evaluation import Evaluation, QualityMetrics +from .evaluation import ( + Evaluation, + QualityMetrics, +) from .evaluation_service import ( CreateEvaluationMetadata, CreateEvaluationRequest, @@ -132,7 +153,11 @@ GenerateGroundedContentResponse, GroundedGenerationContent, ) -from .grounding import FactChunk, GroundingConfig, GroundingFact +from .grounding import ( + FactChunk, + GroundingConfig, + GroundingFact, +) from .import_config import ( AlloyDbSource, BigQuerySource, @@ -160,8 +185,13 @@ ImportUserEventsResponse, SpannerSource, ) -from .project import Project -from .project_service import ProvisionProjectMetadata, ProvisionProjectRequest +from .project import ( + Project, +) +from .project_service import ( + ProvisionProjectMetadata, + ProvisionProjectRequest, +) from .purge_config import ( PurgeCompletionSuggestionsMetadata, PurgeCompletionSuggestionsRequest, @@ -177,9 +207,18 @@ PurgeUserEventsRequest, PurgeUserEventsResponse, ) -from .rank_service import RankingRecord, RankRequest, RankResponse -from .recommendation_service import RecommendRequest, RecommendResponse -from .sample_query import SampleQuery +from .rank_service import ( + RankingRecord, + RankRequest, + RankResponse, +) +from .recommendation_service import ( + RecommendRequest, + RecommendResponse, +) +from .sample_query import ( + SampleQuery, +) from .sample_query_service import ( CreateSampleQueryRequest, DeleteSampleQueryRequest, @@ -188,7 +227,9 @@ ListSampleQueriesResponse, UpdateSampleQueryRequest, ) -from .sample_query_set import SampleQuerySet +from .sample_query_set import ( + SampleQuerySet, +) from .sample_query_set_service import ( CreateSampleQuerySetRequest, DeleteSampleQuerySetRequest, @@ -197,7 +238,9 @@ ListSampleQuerySetsResponse, UpdateSampleQuerySetRequest, ) -from .schema import Schema +from .schema import ( + Schema, +) from .schema_service import ( CreateSchemaMetadata, CreateSchemaRequest, @@ -209,7 +252,10 @@ UpdateSchemaMetadata, UpdateSchemaRequest, ) -from .search_service import SearchRequest, SearchResponse +from .search_service import ( + SearchRequest, + SearchResponse, +) from .search_tuning_service import ( ListCustomModelsRequest, ListCustomModelsResponse, @@ -217,14 +263,19 @@ TrainCustomModelRequest, TrainCustomModelResponse, ) -from .serving_config import ServingConfig +from .serving_config import ( + ServingConfig, +) from .serving_config_service import ( GetServingConfigRequest, ListServingConfigsRequest, ListServingConfigsResponse, UpdateServingConfigRequest, ) -from .session import Query, Session +from .session import ( + Query, + Session, +) from .site_search_engine import ( Sitemap, SiteSearchEngine, @@ -276,7 +327,10 @@ TransactionInfo, UserEvent, ) -from .user_event_service import CollectUserEventRequest, WriteUserEventRequest +from .user_event_service import ( + CollectUserEventRequest, + WriteUserEventRequest, +) __all__ = ( "Answer", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/answer.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/answer.py index b86b10df5ade..afad14118513 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/answer.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/answer.py @@ -73,6 +73,7 @@ class State(proto.Enum): SUCCEEDED (3): Answer generation has succeeded. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -131,6 +132,7 @@ class AnswerSkippedReason(proto.Enum): Google skips the answer if a well grounded answer was unable to be generated. """ + ANSWER_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_ANSWER_SEEKING_QUERY_IGNORED = 2 @@ -440,6 +442,7 @@ class State(proto.Enum): SUCCEEDED (3): Step has succeeded. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -666,6 +669,7 @@ class Type(proto.Enum): Non-answer-seeking query classification type, for no clear intent. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/common.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/common.py index 77a3ec8f1d3f..be77227c8d3d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/common.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/common.py @@ -51,6 +51,7 @@ class IndustryVertical(proto.Enum): HEALTHCARE_FHIR (7): The healthcare FHIR vertical. """ + INDUSTRY_VERTICAL_UNSPECIFIED = 0 GENERIC = 1 MEDIA = 2 @@ -76,6 +77,7 @@ class SolutionType(proto.Enum): data stores must enrolled with ``SOLUTION_TYPE_CHAT`` solution. """ + SOLUTION_TYPE_UNSPECIFIED = 0 SOLUTION_TYPE_RECOMMENDATION = 1 SOLUTION_TYPE_SEARCH = 2 @@ -98,6 +100,7 @@ class SearchUseCase(proto.Enum): Browse use case. Expects the traffic has an empty [query][google.cloud.discoveryengine.v1beta.SearchRequest.query]. """ + SEARCH_USE_CASE_UNSPECIFIED = 0 SEARCH_USE_CASE_SEARCH = 1 SEARCH_USE_CASE_BROWSE = 2 @@ -117,6 +120,7 @@ class SearchTier(proto.Enum): SEARCH_TIER_ENTERPRISE (2): Enterprise tier. """ + SEARCH_TIER_UNSPECIFIED = 0 SEARCH_TIER_STANDARD = 1 SEARCH_TIER_ENTERPRISE = 2 @@ -132,6 +136,7 @@ class SearchAddOn(proto.Enum): SEARCH_ADD_ON_LLM (1): Large language model add-on. """ + SEARCH_ADD_ON_UNSPECIFIED = 0 SEARCH_ADD_ON_LLM = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion.py index 0a8b684bf6a3..691385fd26a4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion.py @@ -54,6 +54,7 @@ class MatchOperator(proto.Enum): CONTAINS (2): If the suggestion contains the block_phrase, then block it. """ + MATCH_OPERATOR_UNSPECIFIED = 0 EXACT_MATCH = 1 CONTAINS = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion_service.py index aea84159c6a0..bd6b0c56862a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion_service.py @@ -275,6 +275,7 @@ class SuggestionType(proto.Enum): GOOGLE_WORKSPACE (5): Returns Google Workspace suggestions. """ + SUGGESTION_TYPE_UNSPECIFIED = 0 QUERY = 1 PEOPLE = 2 @@ -472,6 +473,7 @@ class PersonType(proto.Enum): THIRD_PARTY_IDENTITY (2): The suggestion is from a THIRD_PARTY_IDENTITY source. """ + PERSON_TYPE_UNSPECIFIED = 0 CLOUD_IDENTITY = 1 THIRD_PARTY_IDENTITY = 2 @@ -525,6 +527,7 @@ class ContentType(proto.Enum): THIRD_PARTY (2): The suggestion is from a third party source. """ + CONTENT_TYPE_UNSPECIFIED = 0 GOOGLE_WORKSPACE = 1 THIRD_PARTY = 2 @@ -589,12 +592,12 @@ class RecentSearchSuggestion(proto.Message): number=4, message=ContentSuggestion, ) - recent_search_suggestions: MutableSequence[ - RecentSearchSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=RecentSearchSuggestion, + recent_search_suggestions: MutableSequence[RecentSearchSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=RecentSearchSuggestion, + ) ) diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversation.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversation.py index 3296398a89f8..e12f813adbc9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversation.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversation.py @@ -68,6 +68,7 @@ class State(proto.Enum): COMPLETED (2): Conversation has been completed. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 COMPLETED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversational_search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversational_search_service.py index c373d4daf5ca..857b63cc0bed 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversational_search_service.py @@ -20,8 +20,8 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1beta.types import answer as gcd_answer +from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1beta.types import search_service from google.cloud.discoveryengine_v1beta.types import session as gcd_session @@ -203,12 +203,12 @@ class ConverseConversationResponse(proto.Message): proto.STRING, number=6, ) - search_results: MutableSequence[ - search_service.SearchResponse.SearchResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=search_service.SearchResponse.SearchResult, + search_results: MutableSequence[search_service.SearchResponse.SearchResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=search_service.SearchResponse.SearchResult, + ) ) @@ -516,6 +516,7 @@ class FilteringLevel(proto.Enum): FILTERING_LEVEL_HIGH (2): Filter answers based on a high threshold. """ + FILTERING_LEVEL_UNSPECIFIED = 0 FILTERING_LEVEL_LOW = 1 FILTERING_LEVEL_HIGH = 2 @@ -1042,6 +1043,7 @@ class Type(proto.Enum): Non-answer-seeking query classification type, for no clear intent. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/custom_tuning_model.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/custom_tuning_model.py index 27b73db394f7..9f35075df271 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/custom_tuning_model.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/custom_tuning_model.py @@ -83,6 +83,7 @@ class ModelState(proto.Enum): Input data validation failed. Model training didn't start. """ + MODEL_STATE_UNSPECIFIED = 0 TRAINING_PAUSED = 1 TRAINING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store.py index 58f652c23b3e..fe4ec0ceff50 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store.py @@ -20,11 +20,10 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import common, schema from google.cloud.discoveryengine_v1beta.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import schema __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -138,6 +137,7 @@ class ContentConfig(proto.Enum): workspace data store are specified in the [WorkspaceConfig][google.cloud.discoveryengine.v1beta.WorkspaceConfig]. """ + CONTENT_CONFIG_UNSPECIFIED = 0 NO_CONTENT = 1 CONTENT_REQUIRED = 2 @@ -342,6 +342,7 @@ class Mode(proto.Enum): Natural Language Query Understanding is enabled. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -396,6 +397,7 @@ class Type(proto.Enum): GOOGLE_KEEP (7): Workspace Data Store contains Keep data """ + TYPE_UNSPECIFIED = 0 GOOGLE_DRIVE = 1 GOOGLE_MAIL = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_service.py index e04faf70ab04..45ced7872622 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_service.py @@ -395,6 +395,7 @@ class State(proto.Enum): The [Document][google.cloud.discoveryengine.v1beta.Document] is not indexed. """ + STATE_UNSPECIFIED = 0 INDEXED = 1 NOT_IN_TARGET_SITE = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation.py index 7f1e7466c7f3..41c713e4463c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation.py @@ -92,6 +92,7 @@ class State(proto.Enum): FAILED (4): The evaluation failed. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounded_generation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounded_generation_service.py index e17521198310..a1dd4455a586 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounded_generation_service.py @@ -248,6 +248,7 @@ class Version(proto.Enum): The V1 model which is evaluating each source independently. """ + VERSION_UNSPECIFIED = 0 V1_INDEPENDENT = 1 @@ -310,12 +311,12 @@ class InlineSource(proto.Message): author of the content). """ - grounding_facts: MutableSequence[ - grounding.GroundingFact - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=grounding.GroundingFact, + grounding_facts: MutableSequence[grounding.GroundingFact] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=grounding.GroundingFact, + ) ) attributes: MutableMapping[str, str] = proto.MapField( proto.STRING, @@ -529,6 +530,7 @@ class Source(proto.Enum): GOOGLE_MAPS (4): Google Maps. """ + SOURCE_UNSPECIFIED = 0 VERTEX_AI_SEARCH = 1 GOOGLE_SEARCH = 3 @@ -591,6 +593,7 @@ class Version(proto.Enum): The V1 model which is evaluating each source independently. """ + VERSION_UNSPECIFIED = 0 V1_INDEPENDENT = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/import_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/import_config.py index a8af9aba3f8e..f2dce6557580 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/import_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/import_config.py @@ -286,6 +286,7 @@ class Type(proto.Enum): JSON (7): JSON type. """ + TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -306,6 +307,7 @@ class Encoding(proto.Enum): BINARY (2): Binary encoding. """ + ENCODING_UNSPECIFIED = 0 TEXT = 1 BINARY = 2 @@ -354,12 +356,12 @@ class BigtableColumnFamily(proto.Message): number=3, enum="BigtableOptions.Type", ) - columns: MutableSequence[ - "BigtableOptions.BigtableColumn" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="BigtableOptions.BigtableColumn", + columns: MutableSequence["BigtableOptions.BigtableColumn"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="BigtableOptions.BigtableColumn", + ) ) class BigtableColumn(proto.Message): @@ -1043,6 +1045,7 @@ class ReconciliationMode(proto.Enum): deleted if they are not present in the source location. """ + RECONCILIATION_MODE_UNSPECIFIED = 0 INCREMENTAL = 1 FULL = 2 @@ -1220,12 +1223,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - entries: MutableSequence[ - completion.SuggestionDenyListEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.SuggestionDenyListEntry, + entries: MutableSequence[completion.SuggestionDenyListEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.SuggestionDenyListEntry, + ) ) inline_source: InlineSource = proto.Field( @@ -1348,12 +1351,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - suggestions: MutableSequence[ - completion.CompletionSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.CompletionSuggestion, + suggestions: MutableSequence[completion.CompletionSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.CompletionSuggestion, + ) ) inline_source: InlineSource = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project.py index 2e4fb543645d..443e45bd81d6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project.py @@ -98,6 +98,7 @@ class State(proto.Enum): The project has declined or revoked the agreement to terms of service. """ + STATE_UNSPECIFIED = 0 TERMS_ACCEPTED = 1 TERMS_PENDING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/recommendation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/recommendation_service.py index 51e7664d148b..ade0ee565e06 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/recommendation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/recommendation_service.py @@ -20,8 +20,8 @@ import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import user_event as gcd_user_event from google.cloud.discoveryengine_v1beta.types import document as gcd_document +from google.cloud.discoveryengine_v1beta.types import user_event as gcd_user_event __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set_service.py index 78d517fb6de0..d21166b28e55 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set_service.py @@ -135,12 +135,12 @@ class ListSampleQuerySetsResponse(proto.Message): def raw_page(self): return self - sample_query_sets: MutableSequence[ - gcd_sample_query_set.SampleQuerySet - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_sample_query_set.SampleQuerySet, + sample_query_sets: MutableSequence[gcd_sample_query_set.SampleQuerySet] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_sample_query_set.SampleQuerySet, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_service.py index 3b3a678401be..a608a6bc5449 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_service.py @@ -448,6 +448,7 @@ class RelevanceThreshold(proto.Enum): HIGH (4): High relevance threshold. """ + RELEVANCE_THRESHOLD_UNSPECIFIED = 0 LOWEST = 1 LOW = 2 @@ -467,6 +468,7 @@ class RankingExpressionBackend(proto.Enum): RANK_BY_FORMULA (4): Ranking by custom formula. """ + RANKING_EXPRESSION_BACKEND_UNSPECIFIED = 0 RANK_BY_EMBEDDING = 3 RANK_BY_FORMULA = 4 @@ -812,6 +814,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. For example, ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -828,6 +831,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -937,6 +941,7 @@ class Condition(proto.Enum): Automatic query expansion built by the Search API. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 AUTO = 2 @@ -980,6 +985,7 @@ class Mode(proto.Enum): Search API. Search will be based on the corrected query if found. """ + MODE_UNSPECIFIED = 0 SUGGESTION_ONLY = 1 AUTO = 2 @@ -1029,6 +1035,7 @@ class SearchResultMode(proto.Enum): [DataStore.DocumentProcessingConfig.chunking_config][] is specified. """ + SEARCH_RESULT_MODE_UNSPECIFIED = 0 DOCUMENTS = 1 CHUNKS = 2 @@ -1456,6 +1463,7 @@ class FilterExtractionCondition(proto.Enum): ENABLED (2): Enables NL filter extraction. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1465,11 +1473,11 @@ class FilterExtractionCondition(proto.Enum): number=1, enum="SearchRequest.NaturalLanguageQueryUnderstandingSpec.FilterExtractionCondition", ) - geo_search_query_detection_field_names: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=2, + geo_search_query_detection_field_names: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=2, + ) ) class SearchAsYouTypeSpec(proto.Message): @@ -1495,6 +1503,7 @@ class Condition(proto.Enum): ENABLED (2): Enables Search As You Type. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1586,6 +1595,7 @@ class Mode(proto.Enum): DISABLED (2): Disable personalization. """ + MODE_UNSPECIFIED = 0 AUTO = 1 DISABLED = 2 @@ -2037,12 +2047,12 @@ class FacetValue(proto.Message): proto.STRING, number=1, ) - values: MutableSequence[ - "SearchResponse.Facet.FacetValue" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="SearchResponse.Facet.FacetValue", + values: MutableSequence["SearchResponse.Facet.FacetValue"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="SearchResponse.Facet.FacetValue", + ) ) dynamic_facet: bool = proto.Field( proto.BOOL, @@ -2177,6 +2187,7 @@ class SummarySkippedReason(proto.Enum): [SearchRequest.ContentSearchSpec.SummarySpec.ignore_non_answer_seeking_query] is set to ``true``. """ + SUMMARY_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_SUMMARY_SEEKING_QUERY_IGNORED = 2 @@ -2220,12 +2231,12 @@ class CitationMetadata(proto.Message): Citations for segments. """ - citations: MutableSequence[ - "SearchResponse.Summary.Citation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SearchResponse.Summary.Citation", + citations: MutableSequence["SearchResponse.Summary.Citation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SearchResponse.Summary.Citation", + ) ) class Citation(proto.Message): @@ -2249,12 +2260,12 @@ class Citation(proto.Message): proto.INT64, number=2, ) - sources: MutableSequence[ - "SearchResponse.Summary.CitationSource" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.CitationSource", + sources: MutableSequence["SearchResponse.Summary.CitationSource"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.CitationSource", + ) ) class CitationSource(proto.Message): @@ -2352,12 +2363,12 @@ class SummaryWithMetadata(proto.Message): number=2, message="SearchResponse.Summary.CitationMetadata", ) - references: MutableSequence[ - "SearchResponse.Summary.Reference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.Reference", + references: MutableSequence["SearchResponse.Summary.Reference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.Reference", + ) ) summary_text: str = proto.Field( @@ -2526,6 +2537,7 @@ class Comparison(proto.Enum): GREATER_THAN (5): Denotes greater than ``>`` operator. """ + COMPARISON_UNSPECIFIED = 0 EQUALS = 1 LESS_THAN_EQUALS = 2 @@ -2772,6 +2784,7 @@ class OneBoxType(proto.Enum): One Box result contains Knowledge Graph search responses. """ + ONE_BOX_TYPE_UNSPECIFIED = 0 PEOPLE = 1 ORGANIZATION = 2 @@ -2783,12 +2796,12 @@ class OneBoxType(proto.Enum): number=1, enum="SearchResponse.OneBoxResult.OneBoxType", ) - search_results: MutableSequence[ - "SearchResponse.SearchResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="SearchResponse.SearchResult", + search_results: MutableSequence["SearchResponse.SearchResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="SearchResponse.SearchResult", + ) ) @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_tuning_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_tuning_service.py index 00fdcc8137c2..14f4278a619a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_tuning_service.py @@ -65,12 +65,12 @@ class ListCustomModelsResponse(proto.Message): List of custom tuning models. """ - models: MutableSequence[ - custom_tuning_model.CustomTuningModel - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=custom_tuning_model.CustomTuningModel, + models: MutableSequence[custom_tuning_model.CustomTuningModel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=custom_tuning_model.CustomTuningModel, + ) ) diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config_service.py index ac4bb4df6142..8fc32222639f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config_service.py @@ -126,12 +126,12 @@ class ListServingConfigsResponse(proto.Message): def raw_page(self): return self - serving_configs: MutableSequence[ - gcd_serving_config.ServingConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_serving_config.ServingConfig, + serving_configs: MutableSequence[gcd_serving_config.ServingConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_serving_config.ServingConfig, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session.py index 5a82c46c4468..65fdaa1f7f71 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session.py @@ -69,6 +69,7 @@ class State(proto.Enum): IN_PROGRESS (1): The session is currently open. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine.py index 63afa367db4e..98df317e227b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine.py @@ -103,6 +103,7 @@ class Type(proto.Enum): EXCLUDE (2): Exclude the target site. """ + TYPE_UNSPECIFIED = 0 INCLUDE = 1 EXCLUDE = 2 @@ -130,6 +131,7 @@ class IndexingStatus(proto.Enum): 2. state reverts to SUCCEEDED if the unindexing fails. """ + INDEXING_STATUS_UNSPECIFIED = 0 PENDING = 1 FAILED = 2 @@ -244,6 +246,7 @@ class SiteVerificationState(proto.Enum): Site exempt from verification, e.g., a public website that opens to all. """ + SITE_VERIFICATION_STATE_UNSPECIFIED = 0 VERIFIED = 1 UNVERIFIED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine_service.py index cc37cfe6d96a..f2ad16932311 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine_service.py @@ -371,12 +371,12 @@ class ListTargetSitesResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -424,12 +424,12 @@ class BatchCreateTargetSitesResponse(proto.Message): TargetSites created. """ - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) @@ -838,6 +838,7 @@ class CorpusType(proto.Enum): Denotes a crawling attempt for the mobile version of a page. """ + CORPUS_TYPE_UNSPECIFIED = 0 DESKTOP = 1 MOBILE = 2 @@ -1079,12 +1080,12 @@ class FetchDomainVerificationStatusResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/mypy.ini b/packages/google-cloud-discoveryengine/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-discoveryengine/mypy.ini +++ b/packages/google-cloud-discoveryengine/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-discoveryengine/noxfile.py b/packages/google-cloud-discoveryengine/noxfile.py index b1aa5da98074..bc67b5b45fe1 100644 --- a/packages/google-cloud-discoveryengine/noxfile.py +++ b/packages/google-cloud-discoveryengine/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1.json b/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1.json index e18088dc7e4c..520b09013557 100644 --- a/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1.json +++ b/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-discoveryengine", - "version": "0.16.0" + "version": "0.17.0" }, "snippets": [ { diff --git a/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1alpha.json b/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1alpha.json index 57f9225e8d15..72b63cd065b2 100644 --- a/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1alpha.json +++ b/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1alpha.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-discoveryengine", - "version": "0.16.0" + "version": "0.17.0" }, "snippets": [ { diff --git a/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1beta.json b/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1beta.json index 167301fc5c7c..28792ceda47f 100644 --- a/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1beta.json +++ b/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1beta.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-discoveryengine", - "version": "0.16.0" + "version": "0.17.0" }, "snippets": [ { diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_assistant_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_assistant_service.py index 9c3262edc46b..19b37621c6f7 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_assistant_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_assistant_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -976,10 +981,9 @@ def test_assistant_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1028,9 @@ def test_assistant_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1066,9 @@ def test_assistant_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1318,9 +1320,7 @@ def test_assistant_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_cmek_config_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_cmek_config_service.py index 48567e4bd965..014c4c0b465a 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_cmek_config_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_cmek_config_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.cmek_config_service import ( CmekConfigServiceAsyncClient, @@ -989,10 +989,9 @@ def test_cmek_config_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1036,9 @@ def test_cmek_config_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1076,10 +1074,9 @@ def test_cmek_config_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1331,9 +1328,7 @@ def test_cmek_config_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1439,9 +1434,9 @@ def test_update_cmek_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cmek_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cmek_config] = ( + mock_rpc + ) request = {} client.update_cmek_config(request) @@ -2137,9 +2132,9 @@ def test_list_cmek_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cmek_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cmek_configs] = ( + mock_rpc + ) request = {} client.list_cmek_configs(request) @@ -2473,9 +2468,9 @@ def test_delete_cmek_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cmek_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cmek_config] = ( + mock_rpc + ) request = {} client.delete_cmek_config(request) @@ -2754,9 +2749,9 @@ def test_update_cmek_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cmek_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cmek_config] = ( + mock_rpc + ) request = {} client.update_cmek_config(request) @@ -3110,9 +3105,9 @@ def test_list_cmek_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cmek_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cmek_configs] = ( + mock_rpc + ) request = {} client.list_cmek_configs(request) @@ -3292,9 +3287,9 @@ def test_delete_cmek_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cmek_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cmek_config] = ( + mock_rpc + ) request = {} client.delete_cmek_config(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_completion_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_completion_service.py index 6c022d7e049d..4b65fc9f3f25 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_completion_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_completion_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.completion_service import ( CompletionServiceAsyncClient, @@ -994,10 +994,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1041,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1081,10 +1079,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1336,9 +1333,7 @@ def test_completion_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_control_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_control_service.py index ac4e2eac001a..a9826373b972 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_control_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_control_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.control_service import ( ControlServiceAsyncClient, @@ -62,10 +67,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import common, control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -952,10 +955,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1000,10 +1002,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1040,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1289,9 +1289,7 @@ def test_control_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_conversational_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_conversational_search_service.py index 9891677f625d..3485d56d192f 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_conversational_search_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.discoveryengine_v1.services.conversational_search_service import ( ConversationalSearchServiceAsyncClient, @@ -64,14 +69,15 @@ transports, ) from google.cloud.discoveryengine_v1.types import ( + answer, + assist_answer, + conversation, conversational_search_service, safety, search_service, + session, ) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer, assist_answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session CRED_INFO_JSON = { @@ -1046,10 +1052,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1094,10 +1099,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1133,10 +1137,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1399,9 +1402,7 @@ def test_conversational_search_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1518,9 +1519,9 @@ def test_converse_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -1873,9 +1874,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -2226,9 +2227,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -2559,9 +2560,9 @@ def test_update_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -2913,9 +2914,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -3255,9 +3256,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -4047,9 +4048,9 @@ def test_stream_answer_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stream_answer_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stream_answer_query] = ( + mock_rpc + ) request = {} client.stream_answer_query(request) @@ -6454,9 +6455,9 @@ def test_converse_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -6655,9 +6656,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -6850,9 +6851,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -7029,9 +7030,9 @@ def test_update_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -7213,9 +7214,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -7397,9 +7398,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -7801,9 +7802,9 @@ def test_stream_answer_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stream_answer_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stream_answer_query] = ( + mock_rpc + ) request = {} client.stream_answer_query(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_data_store_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_data_store_service.py index c1b408f6961f..d7e52598608e 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_data_store_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_data_store_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 from google.cloud.discoveryengine_v1.services.data_store_service import ( DataStoreServiceAsyncClient, @@ -74,12 +74,13 @@ transports, ) from google.cloud.discoveryengine_v1.types import ( + cmek_config_service, + common, + data_store, data_store_service, document_processing_config, schema, ) -from google.cloud.discoveryengine_v1.types import cmek_config_service, common -from google.cloud.discoveryengine_v1.types import data_store from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store CRED_INFO_JSON = { @@ -992,10 +993,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1040,10 +1040,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1079,10 +1078,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1334,9 +1332,7 @@ def test_data_store_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1448,9 +1444,9 @@ def test_create_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -2170,9 +2166,9 @@ def test_list_data_stores_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -2691,9 +2687,9 @@ def test_delete_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -3050,9 +3046,9 @@ def test_update_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) @@ -3348,9 +3344,9 @@ def test_create_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -3750,9 +3746,9 @@ def test_list_data_stores_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -4009,9 +4005,9 @@ def test_delete_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -4189,9 +4185,9 @@ def test_update_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_document_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_document_service.py index edda8d0513f8..eed121a0b4a0 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_document_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_document_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +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 +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 -import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.document_service import ( DocumentServiceAsyncClient, @@ -76,12 +76,12 @@ transports, ) from google.cloud.discoveryengine_v1.types import ( + common, + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document CRED_INFO_JSON = { @@ -993,10 +993,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1040,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1078,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1330,9 +1327,7 @@ def test_document_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3396,9 +3391,9 @@ def test_import_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -5217,9 +5212,9 @@ def test_import_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_engine_service.py index 5cfc3ef3e389..55c0ef900d4c 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_engine_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.discoveryengine_v1.services.engine_service import ( EngineServiceAsyncClient, @@ -72,10 +72,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import common, engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -958,10 +956,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1003,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1041,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1295,9 +1290,7 @@ def test_engine_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_grounded_generation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_grounded_generation_service.py index c76467cb4a87..407045bbd432 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_grounded_generation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -1009,10 +1014,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1061,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1096,10 +1099,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1362,9 +1364,7 @@ def test_grounded_generation_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_identity_mapping_store_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_identity_mapping_store_service.py index 08cf56d35df8..577c1e5ca9e1 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_identity_mapping_store_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_identity_mapping_store_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.identity_mapping_store_service import ( IdentityMappingStoreServiceAsyncClient, @@ -70,12 +70,14 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1.types import ( + cmek_config_service, + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import cmek_config_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1049,10 +1051,9 @@ def test_identity_mapping_store_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1097,10 +1098,9 @@ def test_identity_mapping_store_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1136,10 +1136,9 @@ def test_identity_mapping_store_service_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1402,9 +1401,7 @@ def test_identity_mapping_store_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3121,9 +3118,9 @@ def test_list_identity_mappings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_identity_mappings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_identity_mappings] = ( + mock_rpc + ) request = {} client.list_identity_mappings(request) @@ -4945,9 +4942,9 @@ def test_list_identity_mappings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_identity_mappings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_identity_mappings] = ( + mock_rpc + ) request = {} client.list_identity_mappings(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_project_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_project_service.py index 4435ff1427c3..9aed562539f9 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_project_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_project_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -955,10 +955,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1002,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1040,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1292,9 +1289,7 @@ def test_project_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1404,9 +1399,9 @@ def test_provision_project_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -1683,9 +1678,9 @@ def test_provision_project_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_rank_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_rank_service.py index e8e8fd0f98d2..ae034a32436e 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_rank_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_rank_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -923,10 +928,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +975,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1013,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1246,9 +1248,7 @@ def test_rank_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1392,9 +1392,9 @@ async def test_rank_async_use_cached_wrapped_rpc(transport: str = "grpc_asyncio" # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.rank - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.rank] = ( + mock_rpc + ) request = {} await client.rank(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_recommendation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_recommendation_service.py index 08ad5b3eb3e0..6c0b966887d3 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_recommendation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_recommendation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.recommendation_service import ( RecommendationServiceAsyncClient, @@ -1002,10 +1007,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1050,10 +1054,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1089,10 +1092,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1352,9 +1354,7 @@ def test_recommendation_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_schema_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_schema_service.py index 256a5a918e8a..681a82b14387 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_schema_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_schema_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.schema_service import ( SchemaServiceAsyncClient, @@ -71,9 +71,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1.types import schema +from google.cloud.discoveryengine_v1.types import schema, schema_service from google.cloud.discoveryengine_v1.types import schema as gcd_schema -from google.cloud.discoveryengine_v1.types import schema_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -956,10 +955,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1040,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1293,9 +1289,7 @@ def test_schema_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_service.py index becf4486ae4c..9bb868c0d565 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.search_service import ( SearchServiceAsyncClient, @@ -944,10 +949,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -992,10 +996,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1034,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1281,9 +1283,7 @@ def test_search_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1459,9 +1459,9 @@ async def test_search_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.search - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.search] = ( + mock_rpc + ) request = {} await client.search(request) @@ -1778,7 +1778,9 @@ async def test_search_async_pages(): pages = [] # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch` # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372 - async for page_ in (await client.search(request={})).pages: # pragma: no branch + async for page_ in ( # pragma: no branch + await client.search(request={}) + ).pages: pages.append(page_) for page_, token in zip(pages, ["abc", "def", "ghi", ""]): assert page_.raw_page.next_page_token == token diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_tuning_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_tuning_service.py index 51d7aaa76c82..4530aa03faea 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_tuning_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -1006,10 +1006,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1054,10 +1053,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1093,10 +1091,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1356,9 +1353,7 @@ def test_search_tuning_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1472,9 +1467,9 @@ def test_train_custom_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -1732,9 +1727,9 @@ def test_list_custom_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) @@ -1917,9 +1912,9 @@ def test_train_custom_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -2043,9 +2038,9 @@ def test_list_custom_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_serving_config_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_serving_config_service.py index ab3badf04c8c..3c29c40b8d4e 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_serving_config_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_serving_config_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,27 +43,35 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.serving_config_service import ( ServingConfigServiceAsyncClient, ServingConfigServiceClient, transports, ) +from google.cloud.discoveryengine_v1.types import ( + common, + search_service, + serving_config_service, +) from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config -from google.cloud.discoveryengine_v1.types import common, search_service -from google.cloud.discoveryengine_v1.types import serving_config_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -997,10 +1005,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1052,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1084,10 +1090,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1347,9 +1352,7 @@ def test_serving_config_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1487,9 +1490,9 @@ def test_update_serving_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -1824,9 +1827,9 @@ def test_update_serving_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_session_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_session_service.py index c261a2b30cf4..7b98e5754d3b 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_session_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_session_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.discoveryengine_v1.services.session_service import ( SessionServiceAsyncClient, @@ -68,8 +73,8 @@ assist_answer, conversational_search_service, safety, + session, ) -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session CRED_INFO_JSON = { @@ -957,10 +962,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1005,10 +1009,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1047,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1294,9 +1296,7 @@ def test_session_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_site_search_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_site_search_engine_service.py index 749caf443d10..524865756e1f 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_site_search_engine_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.site_search_engine_service import ( SiteSearchEngineServiceAsyncClient, @@ -1014,10 +1014,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1061,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1101,10 +1099,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1364,9 +1361,7 @@ def test_site_search_engine_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1480,9 +1475,9 @@ def test_get_site_search_engine_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -1819,9 +1814,9 @@ def test_create_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -2784,9 +2779,9 @@ def test_update_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -3130,9 +3125,9 @@ def test_delete_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -3481,9 +3476,9 @@ def test_list_target_sites_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) @@ -6448,9 +6443,9 @@ def test_get_site_search_engine_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -6632,9 +6627,9 @@ def test_create_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -7141,9 +7136,9 @@ def test_update_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -7322,9 +7317,9 @@ def test_delete_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -7503,9 +7498,9 @@ def test_list_target_sites_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_event_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_event_service.py index 615c6273281f..cd34e85adbba 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_event_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_event_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,14 @@ HAS_GOOGLE_AUTH_AIO = False import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,20 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.user_event_service import ( UserEventServiceAsyncClient, @@ -991,10 +991,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1038,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1078,10 +1076,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1333,9 +1330,7 @@ def test_user_event_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1462,9 +1457,9 @@ def test_write_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -1738,9 +1733,9 @@ def test_collect_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -1993,9 +1988,9 @@ def test_purge_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2252,9 +2247,9 @@ def test_import_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) @@ -2444,9 +2439,9 @@ def test_write_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -2579,9 +2574,9 @@ def test_collect_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -2734,9 +2729,9 @@ def test_purge_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2872,9 +2867,9 @@ def test_import_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_license_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_license_service.py index e04291c1f10a..23b32c283dc1 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_license_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_license_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.user_license_service import ( UserLicenseServiceAsyncClient, @@ -995,10 +995,9 @@ def test_user_license_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1042,9 @@ def test_user_license_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1080,9 @@ def test_user_license_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1337,9 +1334,7 @@ def test_user_license_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1456,9 +1451,9 @@ def test_list_user_licenses_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_user_licenses - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_user_licenses] = ( + mock_rpc + ) request = {} client.list_user_licenses(request) @@ -2193,9 +2188,9 @@ def test_list_user_licenses_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_user_licenses - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_user_licenses] = ( + mock_rpc + ) request = {} client.list_user_licenses(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_acl_config_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_acl_config_service.py index 296c5360caeb..fb02248e0550 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_acl_config_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_acl_config_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -975,10 +980,9 @@ def test_acl_config_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1027,9 @@ def test_acl_config_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1065,9 @@ def test_acl_config_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1317,9 +1319,7 @@ def test_acl_config_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1426,9 +1426,9 @@ def test_update_acl_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_acl_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_acl_config] = ( + mock_rpc + ) request = {} client.update_acl_config(request) @@ -1935,9 +1935,9 @@ def test_update_acl_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_acl_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_acl_config] = ( + mock_rpc + ) request = {} client.update_acl_config(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_chunk_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_chunk_service.py index f467bd3421bf..479b7c654124 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_chunk_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_chunk_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.chunk_service import ( ChunkServiceAsyncClient, @@ -929,10 +934,9 @@ def test_chunk_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +981,9 @@ def test_chunk_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1019,9 @@ def test_chunk_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1262,9 +1264,7 @@ def test_chunk_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_completion_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_completion_service.py index 97b049eaf54e..422039307864 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_completion_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_completion_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.completion_service import ( CompletionServiceAsyncClient, @@ -994,10 +994,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1041,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1081,10 +1079,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1336,9 +1333,7 @@ def test_completion_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_control_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_control_service.py index 7044cc9f75d4..ff401cea34eb 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_control_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_control_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.control_service import ( ControlServiceAsyncClient, @@ -62,10 +67,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import common, control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -952,10 +955,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1000,10 +1002,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1040,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1289,9 +1289,7 @@ def test_control_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_conversational_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_conversational_search_service.py index abab08a2e334..26c7998a3b3a 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_conversational_search_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.discoveryengine_v1alpha.services.conversational_search_service import ( ConversationalSearchServiceAsyncClient, @@ -64,13 +69,14 @@ transports, ) from google.cloud.discoveryengine_v1alpha.types import ( + answer, + common, + conversation, conversational_search_service, search_service, + session, ) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import answer, common -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session CRED_INFO_JSON = { @@ -1045,10 +1051,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1093,10 +1098,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1132,10 +1136,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1398,9 +1401,7 @@ def test_conversational_search_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1520,9 +1521,9 @@ def test_converse_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -1878,9 +1879,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -2231,9 +2232,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -2564,9 +2565,9 @@ def test_update_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -2918,9 +2919,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -3260,9 +3261,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -6185,9 +6186,9 @@ def test_converse_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -6386,9 +6387,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -6581,9 +6582,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -6760,9 +6761,9 @@ def test_update_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -6944,9 +6945,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -7128,9 +7129,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_data_store_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_data_store_service.py index ac1b3bbe4304..c569a8305d2b 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_data_store_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_data_store_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 from google.cloud.discoveryengine_v1alpha.services.data_store_service import ( DataStoreServiceAsyncClient, @@ -73,15 +73,17 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1alpha.types import ( + common, + data_store, + data_store_service, + document_processing_config, + schema, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service -from google.cloud.discoveryengine_v1alpha.types import schema CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -993,10 +995,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1042,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1080,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1335,9 +1334,7 @@ def test_data_store_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1447,9 +1444,9 @@ def test_create_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -2161,9 +2158,9 @@ def test_list_data_stores_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -2682,9 +2679,9 @@ def test_delete_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -3037,9 +3034,9 @@ def test_update_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) @@ -4035,9 +4032,9 @@ def test_create_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -4435,9 +4432,9 @@ def test_list_data_stores_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -4695,9 +4692,9 @@ def test_delete_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -4876,9 +4873,9 @@ def test_update_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_document_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_document_service.py index f850af3b8b51..2a5419353dd0 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_document_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_document_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +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 +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 -import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.document_service import ( DocumentServiceAsyncClient, @@ -76,12 +76,12 @@ transports, ) from google.cloud.discoveryengine_v1alpha.types import ( + common, + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document CRED_INFO_JSON = { @@ -993,10 +993,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1040,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1078,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1330,9 +1327,7 @@ def test_document_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3396,9 +3391,9 @@ def test_import_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -3901,9 +3896,9 @@ def test_get_processed_document_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processed_document - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processed_document] = ( + mock_rpc + ) request = {} client.get_processed_document(request) @@ -5561,9 +5556,9 @@ def test_import_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -5822,9 +5817,9 @@ def test_get_processed_document_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processed_document - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processed_document] = ( + mock_rpc + ) request = {} client.get_processed_document(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_engine_service.py index ed36c055ff54..d2acabe4e614 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_engine_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.discoveryengine_v1alpha.services.engine_service import ( EngineServiceAsyncClient, @@ -72,10 +72,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import common, engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -958,10 +956,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1003,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1041,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1295,9 +1290,7 @@ def test_engine_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_estimate_billing_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_estimate_billing_service.py index 19bbc9b82bfe..9890197da7fe 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_estimate_billing_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_estimate_billing_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.estimate_billing_service import ( EstimateBillingServiceAsyncClient, @@ -1012,10 +1012,9 @@ def test_estimate_billing_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1060,10 +1059,9 @@ def test_estimate_billing_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1099,10 +1097,9 @@ def test_estimate_billing_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1362,9 +1359,7 @@ def test_estimate_billing_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1474,9 +1469,9 @@ def test_estimate_data_size_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.estimate_data_size - ] = mock_rpc + client._transport._wrapped_methods[client._transport.estimate_data_size] = ( + mock_rpc + ) request = {} client.estimate_data_size(request) @@ -1669,9 +1664,9 @@ def test_estimate_data_size_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.estimate_data_size - ] = mock_rpc + client._transport._wrapped_methods[client._transport.estimate_data_size] = ( + mock_rpc + ) request = {} client.estimate_data_size(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_evaluation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_evaluation_service.py index b4f6b6790db7..0a8ade1ef74e 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_evaluation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_evaluation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_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 google.cloud.discoveryengine_v1alpha.services.evaluation_service import ( EvaluationServiceAsyncClient, @@ -74,12 +74,12 @@ transports, ) from google.cloud.discoveryengine_v1alpha.types import ( + common, + evaluation, evaluation_service, search_service, ) from google.cloud.discoveryengine_v1alpha.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import evaluation CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -999,10 +999,9 @@ def test_evaluation_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1047,10 +1046,9 @@ def test_evaluation_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1086,10 +1084,9 @@ def test_evaluation_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1341,9 +1338,7 @@ def test_evaluation_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1780,9 +1775,9 @@ def test_list_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -2301,9 +2296,9 @@ def test_create_evaluation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_evaluation] = ( + mock_rpc + ) request = {} client.create_evaluation(request) @@ -3327,9 +3322,9 @@ def test_list_evaluations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -3585,9 +3580,9 @@ def test_create_evaluation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_evaluation] = ( + mock_rpc + ) request = {} client.create_evaluation(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_grounded_generation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_grounded_generation_service.py index df2ca2192428..2345293af56e 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_grounded_generation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -1012,10 +1017,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1060,10 +1064,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1099,10 +1102,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1365,9 +1367,7 @@ def test_grounded_generation_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_project_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_project_service.py index 36543a83f9c4..31d80cbaf9c1 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_project_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_project_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,26 +56,21 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.project_service import ( ProjectServiceAsyncClient, ProjectServiceClient, transports, ) -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -958,10 +957,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1004,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1042,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1295,9 +1291,7 @@ def test_project_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1726,9 +1720,9 @@ def test_provision_project_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -2080,9 +2074,9 @@ def test_report_consent_change_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_consent_change - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_consent_change] = ( + mock_rpc + ) request = {} client.report_consent_change(request) @@ -2554,9 +2548,9 @@ def test_provision_project_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -2752,9 +2746,9 @@ def test_report_consent_change_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_consent_change - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_consent_change] = ( + mock_rpc + ) request = {} client.report_consent_change(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_rank_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_rank_service.py index 477b7362d809..865361adadcf 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_rank_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_rank_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -923,10 +928,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +975,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1013,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1246,9 +1248,7 @@ def test_rank_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1392,9 +1392,9 @@ async def test_rank_async_use_cached_wrapped_rpc(transport: str = "grpc_asyncio" # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.rank - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.rank] = ( + mock_rpc + ) request = {} await client.rank(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_recommendation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_recommendation_service.py index 43a00ec867e9..3b683d4a36c4 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_recommendation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_recommendation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.recommendation_service import ( RecommendationServiceAsyncClient, @@ -1002,10 +1007,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1050,10 +1054,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1089,10 +1092,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1352,9 +1354,7 @@ def test_recommendation_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_service.py index 40bf798d95f2..a0746e1ed4d5 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.sample_query_service import ( SampleQueryServiceAsyncClient, @@ -72,10 +72,12 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -999,10 +1001,9 @@ def test_sample_query_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1047,10 +1048,9 @@ def test_sample_query_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1086,10 +1086,9 @@ def test_sample_query_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1341,9 +1340,7 @@ def test_sample_query_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1450,9 +1447,9 @@ def test_get_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query] = ( + mock_rpc + ) request = {} client.get_sample_query(request) @@ -1784,9 +1781,9 @@ def test_list_sample_queries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_queries] = ( + mock_rpc + ) request = {} client.list_sample_queries(request) @@ -2330,9 +2327,9 @@ def test_create_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sample_query] = ( + mock_rpc + ) request = {} client.create_sample_query(request) @@ -2700,9 +2697,9 @@ def test_update_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sample_query] = ( + mock_rpc + ) request = {} client.update_sample_query(request) @@ -3061,9 +3058,9 @@ def test_delete_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sample_query] = ( + mock_rpc + ) request = {} client.delete_sample_query(request) @@ -3392,9 +3389,9 @@ def test_import_sample_queries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_sample_queries] = ( + mock_rpc + ) request = {} client.import_sample_queries(request) @@ -3585,9 +3582,9 @@ def test_get_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query] = ( + mock_rpc + ) request = {} client.get_sample_query(request) @@ -3769,9 +3766,9 @@ def test_list_sample_queries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_queries] = ( + mock_rpc + ) request = {} client.list_sample_queries(request) @@ -4035,9 +4032,9 @@ def test_create_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sample_query] = ( + mock_rpc + ) request = {} client.create_sample_query(request) @@ -4252,9 +4249,9 @@ def test_update_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sample_query] = ( + mock_rpc + ) request = {} client.update_sample_query(request) @@ -4442,9 +4439,9 @@ def test_delete_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sample_query] = ( + mock_rpc + ) request = {} client.delete_sample_query(request) @@ -4622,9 +4619,9 @@ def test_import_sample_queries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_sample_queries] = ( + mock_rpc + ) request = {} client.import_sample_queries(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_set_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_set_service.py index e61b90f30d19..2351a9a83b5d 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_set_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_set_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.sample_query_set_service import ( SampleQuerySetServiceAsyncClient, @@ -62,11 +67,13 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1004,10 +1011,9 @@ def test_sample_query_set_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1052,10 +1058,9 @@ def test_sample_query_set_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1091,10 +1096,9 @@ def test_sample_query_set_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1354,9 +1358,7 @@ def test_sample_query_set_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1473,9 +1475,9 @@ def test_get_sample_query_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query_set] = ( + mock_rpc + ) request = {} client.get_sample_query_set(request) @@ -1822,9 +1824,9 @@ def test_list_sample_query_sets_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_query_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_query_sets] = ( + mock_rpc + ) request = {} client.list_sample_query_sets(request) @@ -3359,9 +3361,9 @@ def test_get_sample_query_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query_set] = ( + mock_rpc + ) request = {} client.get_sample_query_set(request) @@ -3544,9 +3546,9 @@ def test_list_sample_query_sets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_query_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_query_sets] = ( + mock_rpc + ) request = {} client.list_sample_query_sets(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_schema_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_schema_service.py index 433b1663adfd..6798a86b9510 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_schema_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_schema_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.schema_service import ( SchemaServiceAsyncClient, @@ -71,9 +71,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1alpha.types import schema +from google.cloud.discoveryengine_v1alpha.types import schema, schema_service from google.cloud.discoveryengine_v1alpha.types import schema as gcd_schema -from google.cloud.discoveryengine_v1alpha.types import schema_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -956,10 +955,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1040,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1293,9 +1289,7 @@ def test_schema_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_service.py index a3a0897c39ff..0655bfd466cb 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.search_service import ( SearchServiceAsyncClient, @@ -944,10 +949,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -992,10 +996,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1034,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1281,9 +1283,7 @@ def test_search_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1459,9 +1459,9 @@ async def test_search_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.search - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.search] = ( + mock_rpc + ) request = {} await client.search(request) @@ -1776,7 +1776,9 @@ async def test_search_async_pages(): pages = [] # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch` # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372 - async for page_ in (await client.search(request={})).pages: # pragma: no branch + async for page_ in ( # pragma: no branch + await client.search(request={}) + ).pages: pages.append(page_) for page_, token in zip(pages, ["abc", "def", "ghi", ""]): assert page_.raw_page.next_page_token == token diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_tuning_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_tuning_service.py index 4e95e21cdc23..3f3d42e22bc5 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_tuning_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -1006,10 +1006,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1054,10 +1053,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1093,10 +1091,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1356,9 +1353,7 @@ def test_search_tuning_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1472,9 +1467,9 @@ def test_train_custom_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -1732,9 +1727,9 @@ def test_list_custom_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) @@ -1917,9 +1912,9 @@ def test_train_custom_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -2043,9 +2038,9 @@ def test_list_custom_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_serving_config_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_serving_config_service.py index b2a151308834..c6422d69bc87 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_serving_config_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_serving_config_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.serving_config_service import ( ServingConfigServiceAsyncClient, @@ -62,12 +67,15 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1alpha.types import ( + common, + search_service, + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import common, search_service -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1001,10 +1009,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1049,10 +1056,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1088,10 +1094,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1351,9 +1356,7 @@ def test_serving_config_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1489,9 +1492,9 @@ def test_update_serving_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -1917,9 +1920,9 @@ def test_get_serving_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serving_config] = ( + mock_rpc + ) request = {} client.get_serving_config(request) @@ -2287,9 +2290,9 @@ def test_list_serving_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_serving_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_serving_configs] = ( + mock_rpc + ) request = {} client.list_serving_configs(request) @@ -2764,9 +2767,9 @@ def test_update_serving_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -2958,9 +2961,9 @@ def test_get_serving_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serving_config] = ( + mock_rpc + ) request = {} client.get_serving_config(request) @@ -3142,9 +3145,9 @@ def test_list_serving_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_serving_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_serving_configs] = ( + mock_rpc + ) request = {} client.list_serving_configs(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_session_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_session_service.py index 9d2bc5f75b6d..43d323aa135d 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_session_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_session_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.discoveryengine_v1alpha.services.session_service import ( SessionServiceAsyncClient, @@ -66,10 +71,10 @@ from google.cloud.discoveryengine_v1alpha.types import ( answer, conversational_search_service, + session, + session_service, ) -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -956,10 +961,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1008,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1046,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1293,9 +1295,7 @@ def test_session_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_site_search_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_site_search_engine_service.py index 19b80128c121..a7a7fda0787d 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_site_search_engine_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.site_search_engine_service import ( SiteSearchEngineServiceAsyncClient, @@ -1015,10 +1015,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1062,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1102,10 +1100,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1365,9 +1362,7 @@ def test_site_search_engine_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1481,9 +1476,9 @@ def test_get_site_search_engine_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -1820,9 +1815,9 @@ def test_create_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -2785,9 +2780,9 @@ def test_update_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -3131,9 +3126,9 @@ def test_delete_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -3482,9 +3477,9 @@ def test_list_target_sites_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) @@ -5983,9 +5978,9 @@ def test_get_site_search_engine_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -6167,9 +6162,9 @@ def test_create_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -6676,9 +6671,9 @@ def test_update_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -6857,9 +6852,9 @@ def test_delete_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -7038,9 +7033,9 @@ def test_list_target_sites_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_user_event_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_user_event_service.py index 2d64e3bf335e..c27f5c285c92 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_user_event_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_user_event_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,14 @@ HAS_GOOGLE_AUTH_AIO = False import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,20 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.user_event_service import ( UserEventServiceAsyncClient, @@ -991,10 +991,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1038,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1078,10 +1076,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1333,9 +1330,7 @@ def test_user_event_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1460,9 +1455,9 @@ def test_write_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -1734,9 +1729,9 @@ def test_collect_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -1989,9 +1984,9 @@ def test_purge_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2248,9 +2243,9 @@ def test_import_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) @@ -2440,9 +2435,9 @@ def test_write_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -2575,9 +2570,9 @@ def test_collect_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -2730,9 +2725,9 @@ def test_purge_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2868,9 +2863,9 @@ def test_import_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_completion_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_completion_service.py index b36ae67eb314..d96881e370eb 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_completion_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_completion_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.completion_service import ( CompletionServiceAsyncClient, @@ -995,10 +995,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1042,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1080,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1337,9 +1334,7 @@ def test_completion_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_control_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_control_service.py index 4eec5c882fb8..3389fd535774 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_control_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_control_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.control_service import ( ControlServiceAsyncClient, @@ -62,10 +67,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import common, control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -952,10 +955,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1000,10 +1002,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1040,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1289,9 +1289,7 @@ def test_control_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_conversational_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_conversational_search_service.py index a921d3379eb5..ff36f77226e2 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_conversational_search_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.discoveryengine_v1beta.services.conversational_search_service import ( ConversationalSearchServiceAsyncClient, @@ -64,13 +69,13 @@ transports, ) from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, conversational_search_service, search_service, + session, ) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session CRED_INFO_JSON = { @@ -1045,10 +1050,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1093,10 +1097,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1132,10 +1135,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1398,9 +1400,7 @@ def test_conversational_search_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1520,9 +1520,9 @@ def test_converse_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -1878,9 +1878,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -2231,9 +2231,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -2564,9 +2564,9 @@ def test_update_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -2918,9 +2918,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -3260,9 +3260,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -6185,9 +6185,9 @@ def test_converse_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -6386,9 +6386,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -6581,9 +6581,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -6760,9 +6760,9 @@ def test_update_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -6944,9 +6944,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -7128,9 +7128,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_data_store_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_data_store_service.py index 2401244ab077..fe9408613714 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_data_store_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_data_store_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 from google.cloud.discoveryengine_v1beta.services.data_store_service import ( DataStoreServiceAsyncClient, @@ -74,13 +74,13 @@ transports, ) from google.cloud.discoveryengine_v1beta.types import ( + common, + data_store, data_store_service, document_processing_config, schema, ) from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import data_store CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -992,10 +992,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1040,10 +1039,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1079,10 +1077,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1334,9 +1331,7 @@ def test_data_store_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1446,9 +1441,9 @@ def test_create_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -2156,9 +2151,9 @@ def test_list_data_stores_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -2677,9 +2672,9 @@ def test_delete_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -3030,9 +3025,9 @@ def test_update_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) @@ -3322,9 +3317,9 @@ def test_create_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -3722,9 +3717,9 @@ def test_list_data_stores_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -3982,9 +3977,9 @@ def test_delete_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -4163,9 +4158,9 @@ def test_update_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_document_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_document_service.py index a16a96daaafc..e2cc571138a2 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_document_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_document_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +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 +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 -import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.document_service import ( DocumentServiceAsyncClient, @@ -76,11 +76,11 @@ transports, ) from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document CRED_INFO_JSON = { @@ -992,10 +992,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1040,10 +1039,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1079,10 +1077,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1329,9 +1326,7 @@ def test_document_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3395,9 +3390,9 @@ def test_import_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -5216,9 +5211,9 @@ def test_import_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_engine_service.py index aeaa76143bb5..87cfa0c63b32 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_engine_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.discoveryengine_v1beta.services.engine_service import ( EngineServiceAsyncClient, @@ -72,10 +72,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import common, engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -958,10 +956,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1003,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1041,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1295,9 +1290,7 @@ def test_engine_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_evaluation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_evaluation_service.py index 94642ae2f498..b0bcc6ac6ec5 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_evaluation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_evaluation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_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 google.cloud.discoveryengine_v1beta.services.evaluation_service import ( EvaluationServiceAsyncClient, @@ -73,10 +73,13 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1beta.types import evaluation_service, search_service +from google.cloud.discoveryengine_v1beta.types import ( + common, + evaluation, + evaluation_service, + search_service, +) from google.cloud.discoveryengine_v1beta.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import evaluation CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -996,10 +999,9 @@ def test_evaluation_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1046,9 @@ def test_evaluation_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1083,10 +1084,9 @@ def test_evaluation_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1338,9 +1338,7 @@ def test_evaluation_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1777,9 +1775,9 @@ def test_list_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -2298,9 +2296,9 @@ def test_create_evaluation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_evaluation] = ( + mock_rpc + ) request = {} client.create_evaluation(request) @@ -3324,9 +3322,9 @@ def test_list_evaluations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -3582,9 +3580,9 @@ def test_create_evaluation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_evaluation] = ( + mock_rpc + ) request = {} client.create_evaluation(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_grounded_generation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_grounded_generation_service.py index 4851b2d5254b..55c937e813e9 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_grounded_generation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -1012,10 +1017,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1060,10 +1064,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1099,10 +1102,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1365,9 +1367,7 @@ def test_grounded_generation_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_project_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_project_service.py index bef1bceddf41..a7a3b33f16c7 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_project_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_project_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -955,10 +955,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1002,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1040,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1292,9 +1289,7 @@ def test_project_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1404,9 +1399,9 @@ def test_provision_project_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -1683,9 +1678,9 @@ def test_provision_project_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_rank_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_rank_service.py index 135fd656fbc8..8cd24fe30c4e 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_rank_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_rank_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -923,10 +928,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +975,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1013,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1246,9 +1248,7 @@ def test_rank_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1392,9 +1392,9 @@ async def test_rank_async_use_cached_wrapped_rpc(transport: str = "grpc_asyncio" # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.rank - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.rank] = ( + mock_rpc + ) request = {} await client.rank(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_recommendation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_recommendation_service.py index 6f80c3cb70d4..e807ff227f64 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_recommendation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_recommendation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.recommendation_service import ( RecommendationServiceAsyncClient, @@ -1002,10 +1007,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1050,10 +1054,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1089,10 +1092,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1352,9 +1354,7 @@ def test_recommendation_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_service.py index 4436454b6c8f..5e282abb65b7 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.sample_query_service import ( SampleQueryServiceAsyncClient, @@ -72,10 +72,12 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -999,10 +1001,9 @@ def test_sample_query_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1047,10 +1048,9 @@ def test_sample_query_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1086,10 +1086,9 @@ def test_sample_query_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1341,9 +1340,7 @@ def test_sample_query_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1450,9 +1447,9 @@ def test_get_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query] = ( + mock_rpc + ) request = {} client.get_sample_query(request) @@ -1784,9 +1781,9 @@ def test_list_sample_queries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_queries] = ( + mock_rpc + ) request = {} client.list_sample_queries(request) @@ -2330,9 +2327,9 @@ def test_create_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sample_query] = ( + mock_rpc + ) request = {} client.create_sample_query(request) @@ -2700,9 +2697,9 @@ def test_update_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sample_query] = ( + mock_rpc + ) request = {} client.update_sample_query(request) @@ -3061,9 +3058,9 @@ def test_delete_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sample_query] = ( + mock_rpc + ) request = {} client.delete_sample_query(request) @@ -3392,9 +3389,9 @@ def test_import_sample_queries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_sample_queries] = ( + mock_rpc + ) request = {} client.import_sample_queries(request) @@ -3585,9 +3582,9 @@ def test_get_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query] = ( + mock_rpc + ) request = {} client.get_sample_query(request) @@ -3769,9 +3766,9 @@ def test_list_sample_queries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_queries] = ( + mock_rpc + ) request = {} client.list_sample_queries(request) @@ -4035,9 +4032,9 @@ def test_create_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sample_query] = ( + mock_rpc + ) request = {} client.create_sample_query(request) @@ -4252,9 +4249,9 @@ def test_update_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sample_query] = ( + mock_rpc + ) request = {} client.update_sample_query(request) @@ -4442,9 +4439,9 @@ def test_delete_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sample_query] = ( + mock_rpc + ) request = {} client.delete_sample_query(request) @@ -4622,9 +4619,9 @@ def test_import_sample_queries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_sample_queries] = ( + mock_rpc + ) request = {} client.import_sample_queries(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_set_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_set_service.py index c0d426085280..fece9d0669a6 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_set_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_set_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.sample_query_set_service import ( SampleQuerySetServiceAsyncClient, @@ -62,11 +67,13 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1004,10 +1011,9 @@ def test_sample_query_set_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1052,10 +1058,9 @@ def test_sample_query_set_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1091,10 +1096,9 @@ def test_sample_query_set_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1354,9 +1358,7 @@ def test_sample_query_set_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1473,9 +1475,9 @@ def test_get_sample_query_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query_set] = ( + mock_rpc + ) request = {} client.get_sample_query_set(request) @@ -1822,9 +1824,9 @@ def test_list_sample_query_sets_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_query_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_query_sets] = ( + mock_rpc + ) request = {} client.list_sample_query_sets(request) @@ -3359,9 +3361,9 @@ def test_get_sample_query_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query_set] = ( + mock_rpc + ) request = {} client.get_sample_query_set(request) @@ -3544,9 +3546,9 @@ def test_list_sample_query_sets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_query_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_query_sets] = ( + mock_rpc + ) request = {} client.list_sample_query_sets(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_schema_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_schema_service.py index 57118a32915b..e50eaa6044ed 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_schema_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_schema_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.schema_service import ( SchemaServiceAsyncClient, @@ -71,9 +71,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1beta.types import schema +from google.cloud.discoveryengine_v1beta.types import schema, schema_service from google.cloud.discoveryengine_v1beta.types import schema as gcd_schema -from google.cloud.discoveryengine_v1beta.types import schema_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -956,10 +955,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1040,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1293,9 +1289,7 @@ def test_schema_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_service.py index da8217d80744..04387caef58e 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.search_service import ( SearchServiceAsyncClient, @@ -944,10 +949,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -992,10 +996,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1034,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1281,9 +1283,7 @@ def test_search_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1459,9 +1459,9 @@ async def test_search_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.search - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.search] = ( + mock_rpc + ) request = {} await client.search(request) @@ -1776,7 +1776,9 @@ async def test_search_async_pages(): pages = [] # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch` # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372 - async for page_ in (await client.search(request={})).pages: # pragma: no branch + async for page_ in ( # pragma: no branch + await client.search(request={}) + ).pages: pages.append(page_) for page_, token in zip(pages, ["abc", "def", "ghi", ""]): assert page_.raw_page.next_page_token == token diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_tuning_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_tuning_service.py index a9a38388a62e..aca353d29bc5 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_tuning_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -1006,10 +1006,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1054,10 +1053,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1093,10 +1091,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1356,9 +1353,7 @@ def test_search_tuning_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1472,9 +1467,9 @@ def test_train_custom_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -1732,9 +1727,9 @@ def test_list_custom_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) @@ -1917,9 +1912,9 @@ def test_train_custom_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -2043,9 +2038,9 @@ def test_list_custom_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_serving_config_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_serving_config_service.py index bba0a586e1bc..cfdc6a8b3cd9 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_serving_config_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_serving_config_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.serving_config_service import ( ServingConfigServiceAsyncClient, @@ -62,12 +67,15 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1beta.types import ( + common, + search_service, + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import common, search_service -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1001,10 +1009,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1049,10 +1056,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1088,10 +1094,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1351,9 +1356,7 @@ def test_serving_config_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1489,9 +1492,9 @@ def test_update_serving_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -1917,9 +1920,9 @@ def test_get_serving_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serving_config] = ( + mock_rpc + ) request = {} client.get_serving_config(request) @@ -2287,9 +2290,9 @@ def test_list_serving_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_serving_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_serving_configs] = ( + mock_rpc + ) request = {} client.list_serving_configs(request) @@ -2764,9 +2767,9 @@ def test_update_serving_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -2958,9 +2961,9 @@ def test_get_serving_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serving_config] = ( + mock_rpc + ) request = {} client.get_serving_config(request) @@ -3142,9 +3145,9 @@ def test_list_serving_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_serving_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_serving_configs] = ( + mock_rpc + ) request = {} client.list_serving_configs(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_session_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_session_service.py index 42c3a7a4c6ab..8f154c3bd4df 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_session_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_session_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 from google.cloud.discoveryengine_v1beta.services.session_service import ( SessionServiceAsyncClient, @@ -66,8 +71,8 @@ from google.cloud.discoveryengine_v1beta.types import ( answer, conversational_search_service, + session, ) -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session CRED_INFO_JSON = { @@ -955,10 +960,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1007,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1045,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1292,9 +1294,7 @@ def test_session_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_site_search_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_site_search_engine_service.py index fde17d5b253e..424afebcb9f0 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_site_search_engine_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.site_search_engine_service import ( SiteSearchEngineServiceAsyncClient, @@ -1014,10 +1014,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1061,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1101,10 +1099,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1364,9 +1361,7 @@ def test_site_search_engine_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1480,9 +1475,9 @@ def test_get_site_search_engine_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -1819,9 +1814,9 @@ def test_create_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -2784,9 +2779,9 @@ def test_update_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -3130,9 +3125,9 @@ def test_delete_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -3481,9 +3476,9 @@ def test_list_target_sites_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) @@ -6448,9 +6443,9 @@ def test_get_site_search_engine_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -6632,9 +6627,9 @@ def test_create_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -7141,9 +7136,9 @@ def test_update_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -7322,9 +7317,9 @@ def test_delete_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -7503,9 +7498,9 @@ def test_list_target_sites_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_user_event_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_user_event_service.py index 31db216ca80e..b588165f2138 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_user_event_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_user_event_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,14 @@ HAS_GOOGLE_AUTH_AIO = False import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,20 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.user_event_service import ( UserEventServiceAsyncClient, @@ -991,10 +991,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1038,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1078,10 +1076,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1333,9 +1330,7 @@ def test_user_event_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1460,9 +1455,9 @@ def test_write_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -1734,9 +1729,9 @@ def test_collect_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -1989,9 +1984,9 @@ def test_purge_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2248,9 +2243,9 @@ def test_import_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) @@ -2440,9 +2435,9 @@ def test_write_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -2575,9 +2570,9 @@ def test_collect_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -2730,9 +2725,9 @@ def test_purge_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2868,9 +2863,9 @@ def test_import_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/__init__.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/__init__.py index 92b8084459ba..15ad56eaaaff 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/__init__.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dlp_service import DlpServiceAsyncClient, DlpServiceClient from .types.dlp import ( Action, diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/async_client.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/async_client.py index 1d38ef5715e6..1f479e46edeb 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/async_client.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dlp_v2 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_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 google.cloud.location import locations_pb2 # type: ignore from google.cloud.dlp_v2.services.dlp_service import pagers from google.cloud.dlp_v2.types import dlp, storage @@ -159,7 +159,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DlpServiceAsyncClient: The constructed client. """ - return DlpServiceClient.from_service_account_info.__func__(DlpServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DlpServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DlpServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -175,7 +178,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DlpServiceAsyncClient: The constructed client. """ - return DlpServiceClient.from_service_account_file.__func__(DlpServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DlpServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DlpServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/client.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/client.py index 8e7bd415651b..2b2e5fbdbe99 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/client.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dlp_v2 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_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 google.cloud.location import locations_pb2 # type: ignore from google.cloud.dlp_v2.services.dlp_service import pagers from google.cloud.dlp_v2.types import dlp, storage @@ -875,11 +875,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DlpServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DlpServiceClient._read_environment_variables() + ) self._client_cert_source = DlpServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -914,8 +912,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DlpServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/pagers.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/pagers.py index 72bcff57c828..eb1e40f21d86 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/pagers.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1159,7 +1159,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1235,7 +1235,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1315,7 +1315,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1391,7 +1391,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1471,7 +1471,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1547,7 +1547,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1627,7 +1627,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1703,7 +1703,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1783,7 +1783,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1859,7 +1859,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/base.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/base.py index f4a2741d5779..784a5afda500 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/base.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dlp_v2 import gapic_version as package_version from google.cloud.dlp_v2.types import dlp diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc.py index 9257a0bddb42..59233c153bd4 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.cloud.location import locations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dlp_v2.types import dlp @@ -666,12 +666,12 @@ def create_deidentify_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_deidentify_template" not in self._stubs: - self._stubs[ - "create_deidentify_template" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/CreateDeidentifyTemplate", - request_serializer=dlp.CreateDeidentifyTemplateRequest.serialize, - response_deserializer=dlp.DeidentifyTemplate.deserialize, + self._stubs["create_deidentify_template"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/CreateDeidentifyTemplate", + request_serializer=dlp.CreateDeidentifyTemplateRequest.serialize, + response_deserializer=dlp.DeidentifyTemplate.deserialize, + ) ) return self._stubs["create_deidentify_template"] @@ -697,12 +697,12 @@ def update_deidentify_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_deidentify_template" not in self._stubs: - self._stubs[ - "update_deidentify_template" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/UpdateDeidentifyTemplate", - request_serializer=dlp.UpdateDeidentifyTemplateRequest.serialize, - response_deserializer=dlp.DeidentifyTemplate.deserialize, + self._stubs["update_deidentify_template"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/UpdateDeidentifyTemplate", + request_serializer=dlp.UpdateDeidentifyTemplateRequest.serialize, + response_deserializer=dlp.DeidentifyTemplate.deserialize, + ) ) return self._stubs["update_deidentify_template"] @@ -788,12 +788,12 @@ def delete_deidentify_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_deidentify_template" not in self._stubs: - self._stubs[ - "delete_deidentify_template" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/DeleteDeidentifyTemplate", - request_serializer=dlp.DeleteDeidentifyTemplateRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_deidentify_template"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/DeleteDeidentifyTemplate", + request_serializer=dlp.DeleteDeidentifyTemplateRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_deidentify_template"] @@ -878,12 +878,12 @@ def hybrid_inspect_job_trigger( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "hybrid_inspect_job_trigger" not in self._stubs: - self._stubs[ - "hybrid_inspect_job_trigger" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/HybridInspectJobTrigger", - request_serializer=dlp.HybridInspectJobTriggerRequest.serialize, - response_deserializer=dlp.HybridInspectResponse.deserialize, + self._stubs["hybrid_inspect_job_trigger"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/HybridInspectJobTrigger", + request_serializer=dlp.HybridInspectJobTriggerRequest.serialize, + response_deserializer=dlp.HybridInspectResponse.deserialize, + ) ) return self._stubs["hybrid_inspect_job_trigger"] @@ -1454,12 +1454,12 @@ def list_project_data_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_project_data_profiles" not in self._stubs: - self._stubs[ - "list_project_data_profiles" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/ListProjectDataProfiles", - request_serializer=dlp.ListProjectDataProfilesRequest.serialize, - response_deserializer=dlp.ListProjectDataProfilesResponse.deserialize, + self._stubs["list_project_data_profiles"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/ListProjectDataProfiles", + request_serializer=dlp.ListProjectDataProfilesRequest.serialize, + response_deserializer=dlp.ListProjectDataProfilesResponse.deserialize, + ) ) return self._stubs["list_project_data_profiles"] @@ -1566,12 +1566,12 @@ def list_file_store_data_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_file_store_data_profiles" not in self._stubs: - self._stubs[ - "list_file_store_data_profiles" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/ListFileStoreDataProfiles", - request_serializer=dlp.ListFileStoreDataProfilesRequest.serialize, - response_deserializer=dlp.ListFileStoreDataProfilesResponse.deserialize, + self._stubs["list_file_store_data_profiles"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/ListFileStoreDataProfiles", + request_serializer=dlp.ListFileStoreDataProfilesRequest.serialize, + response_deserializer=dlp.ListFileStoreDataProfilesResponse.deserialize, + ) ) return self._stubs["list_file_store_data_profiles"] @@ -1594,12 +1594,12 @@ def get_file_store_data_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_file_store_data_profile" not in self._stubs: - self._stubs[ - "get_file_store_data_profile" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/GetFileStoreDataProfile", - request_serializer=dlp.GetFileStoreDataProfileRequest.serialize, - response_deserializer=dlp.FileStoreDataProfile.deserialize, + self._stubs["get_file_store_data_profile"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/GetFileStoreDataProfile", + request_serializer=dlp.GetFileStoreDataProfileRequest.serialize, + response_deserializer=dlp.FileStoreDataProfile.deserialize, + ) ) return self._stubs["get_file_store_data_profile"] @@ -1624,12 +1624,12 @@ def delete_file_store_data_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_file_store_data_profile" not in self._stubs: - self._stubs[ - "delete_file_store_data_profile" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/DeleteFileStoreDataProfile", - request_serializer=dlp.DeleteFileStoreDataProfileRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_file_store_data_profile"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/DeleteFileStoreDataProfile", + request_serializer=dlp.DeleteFileStoreDataProfileRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_file_store_data_profile"] diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc_asyncio.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc_asyncio.py index 90aa440864fb..845059f8ffdd 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.cloud.location import locations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dlp_v2.types import dlp @@ -682,12 +682,12 @@ def create_deidentify_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_deidentify_template" not in self._stubs: - self._stubs[ - "create_deidentify_template" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/CreateDeidentifyTemplate", - request_serializer=dlp.CreateDeidentifyTemplateRequest.serialize, - response_deserializer=dlp.DeidentifyTemplate.deserialize, + self._stubs["create_deidentify_template"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/CreateDeidentifyTemplate", + request_serializer=dlp.CreateDeidentifyTemplateRequest.serialize, + response_deserializer=dlp.DeidentifyTemplate.deserialize, + ) ) return self._stubs["create_deidentify_template"] @@ -715,12 +715,12 @@ def update_deidentify_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_deidentify_template" not in self._stubs: - self._stubs[ - "update_deidentify_template" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/UpdateDeidentifyTemplate", - request_serializer=dlp.UpdateDeidentifyTemplateRequest.serialize, - response_deserializer=dlp.DeidentifyTemplate.deserialize, + self._stubs["update_deidentify_template"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/UpdateDeidentifyTemplate", + request_serializer=dlp.UpdateDeidentifyTemplateRequest.serialize, + response_deserializer=dlp.DeidentifyTemplate.deserialize, + ) ) return self._stubs["update_deidentify_template"] @@ -809,12 +809,12 @@ def delete_deidentify_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_deidentify_template" not in self._stubs: - self._stubs[ - "delete_deidentify_template" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/DeleteDeidentifyTemplate", - request_serializer=dlp.DeleteDeidentifyTemplateRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_deidentify_template"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/DeleteDeidentifyTemplate", + request_serializer=dlp.DeleteDeidentifyTemplateRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_deidentify_template"] @@ -901,12 +901,12 @@ def hybrid_inspect_job_trigger( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "hybrid_inspect_job_trigger" not in self._stubs: - self._stubs[ - "hybrid_inspect_job_trigger" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/HybridInspectJobTrigger", - request_serializer=dlp.HybridInspectJobTriggerRequest.serialize, - response_deserializer=dlp.HybridInspectResponse.deserialize, + self._stubs["hybrid_inspect_job_trigger"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/HybridInspectJobTrigger", + request_serializer=dlp.HybridInspectJobTriggerRequest.serialize, + response_deserializer=dlp.HybridInspectResponse.deserialize, + ) ) return self._stubs["hybrid_inspect_job_trigger"] @@ -1490,12 +1490,12 @@ def list_project_data_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_project_data_profiles" not in self._stubs: - self._stubs[ - "list_project_data_profiles" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/ListProjectDataProfiles", - request_serializer=dlp.ListProjectDataProfilesRequest.serialize, - response_deserializer=dlp.ListProjectDataProfilesResponse.deserialize, + self._stubs["list_project_data_profiles"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/ListProjectDataProfiles", + request_serializer=dlp.ListProjectDataProfilesRequest.serialize, + response_deserializer=dlp.ListProjectDataProfilesResponse.deserialize, + ) ) return self._stubs["list_project_data_profiles"] @@ -1606,12 +1606,12 @@ def list_file_store_data_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_file_store_data_profiles" not in self._stubs: - self._stubs[ - "list_file_store_data_profiles" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/ListFileStoreDataProfiles", - request_serializer=dlp.ListFileStoreDataProfilesRequest.serialize, - response_deserializer=dlp.ListFileStoreDataProfilesResponse.deserialize, + self._stubs["list_file_store_data_profiles"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/ListFileStoreDataProfiles", + request_serializer=dlp.ListFileStoreDataProfilesRequest.serialize, + response_deserializer=dlp.ListFileStoreDataProfilesResponse.deserialize, + ) ) return self._stubs["list_file_store_data_profiles"] @@ -1636,12 +1636,12 @@ def get_file_store_data_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_file_store_data_profile" not in self._stubs: - self._stubs[ - "get_file_store_data_profile" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/GetFileStoreDataProfile", - request_serializer=dlp.GetFileStoreDataProfileRequest.serialize, - response_deserializer=dlp.FileStoreDataProfile.deserialize, + self._stubs["get_file_store_data_profile"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/GetFileStoreDataProfile", + request_serializer=dlp.GetFileStoreDataProfileRequest.serialize, + response_deserializer=dlp.FileStoreDataProfile.deserialize, + ) ) return self._stubs["get_file_store_data_profile"] @@ -1666,12 +1666,12 @@ def delete_file_store_data_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_file_store_data_profile" not in self._stubs: - self._stubs[ - "delete_file_store_data_profile" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/DeleteFileStoreDataProfile", - request_serializer=dlp.DeleteFileStoreDataProfileRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_file_store_data_profile"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/DeleteFileStoreDataProfile", + request_serializer=dlp.DeleteFileStoreDataProfileRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_file_store_data_profile"] diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest.py index 1857d9252a30..0bc2e64f634f 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.dlp_v2.types import dlp @@ -3260,9 +3260,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseCreateDeidentifyTemplate._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseCreateDeidentifyTemplate._get_http_options() request, metadata = self._interceptor.pre_create_deidentify_template( request, metadata @@ -3420,9 +3418,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseCreateDiscoveryConfig._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseCreateDiscoveryConfig._get_http_options() request, metadata = self._interceptor.pre_create_discovery_config( request, metadata @@ -3742,9 +3738,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseCreateInspectTemplate._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseCreateInspectTemplate._get_http_options() request, metadata = self._interceptor.pre_create_inspect_template( request, metadata @@ -4054,9 +4048,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseCreateStoredInfoType._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseCreateStoredInfoType._get_http_options() request, metadata = self._interceptor.pre_create_stored_info_type( request, metadata @@ -4465,9 +4457,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDlpServiceRestTransport._BaseDeleteDeidentifyTemplate._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseDeleteDeidentifyTemplate._get_http_options() request, metadata = self._interceptor.pre_delete_deidentify_template( request, metadata @@ -4574,9 +4564,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDlpServiceRestTransport._BaseDeleteDiscoveryConfig._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseDeleteDiscoveryConfig._get_http_options() request, metadata = self._interceptor.pre_delete_discovery_config( request, metadata @@ -4795,9 +4783,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDlpServiceRestTransport._BaseDeleteFileStoreDataProfile._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseDeleteFileStoreDataProfile._get_http_options() request, metadata = self._interceptor.pre_delete_file_store_data_profile( request, metadata @@ -4906,9 +4892,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDlpServiceRestTransport._BaseDeleteInspectTemplate._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseDeleteInspectTemplate._get_http_options() request, metadata = self._interceptor.pre_delete_inspect_template( request, metadata @@ -5123,9 +5107,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDlpServiceRestTransport._BaseDeleteStoredInfoType._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseDeleteStoredInfoType._get_http_options() request, metadata = self._interceptor.pre_delete_stored_info_type( request, metadata @@ -5232,9 +5214,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDlpServiceRestTransport._BaseDeleteTableDataProfile._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseDeleteTableDataProfile._get_http_options() request, metadata = self._interceptor.pre_delete_table_data_profile( request, metadata @@ -5465,9 +5445,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseGetColumnDataProfile._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseGetColumnDataProfile._get_http_options() request, metadata = self._interceptor.pre_get_column_data_profile( request, metadata @@ -5768,9 +5746,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseGetDeidentifyTemplate._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseGetDeidentifyTemplate._get_http_options() request, metadata = self._interceptor.pre_get_deidentify_template( request, metadata @@ -6223,9 +6199,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseGetFileStoreDataProfile._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseGetFileStoreDataProfile._get_http_options() request, metadata = self._interceptor.pre_get_file_store_data_profile( request, metadata @@ -6679,9 +6653,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseGetProjectDataProfile._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseGetProjectDataProfile._get_http_options() request, metadata = self._interceptor.pre_get_project_data_profile( request, metadata @@ -6975,9 +6947,7 @@ def __call__( The profile for a scanned table. """ - http_options = ( - _BaseDlpServiceRestTransport._BaseGetTableDataProfile._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseGetTableDataProfile._get_http_options() request, metadata = self._interceptor.pre_get_table_data_profile( request, metadata @@ -7125,9 +7095,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseHybridInspectDlpJob._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseHybridInspectDlpJob._get_http_options() request, metadata = self._interceptor.pre_hybrid_inspect_dlp_job( request, metadata @@ -7281,9 +7249,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseHybridInspectJobTrigger._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseHybridInspectJobTrigger._get_http_options() request, metadata = self._interceptor.pre_hybrid_inspect_job_trigger( request, metadata @@ -7591,9 +7557,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListColumnDataProfiles._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListColumnDataProfiles._get_http_options() request, metadata = self._interceptor.pre_list_column_data_profiles( request, metadata @@ -7888,9 +7852,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListDeidentifyTemplates._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListDeidentifyTemplates._get_http_options() request, metadata = self._interceptor.pre_list_deidentify_templates( request, metadata @@ -8039,9 +8001,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListDiscoveryConfigs._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListDiscoveryConfigs._get_http_options() request, metadata = self._interceptor.pre_list_discovery_configs( request, metadata @@ -8344,9 +8304,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListFileStoreDataProfiles._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListFileStoreDataProfiles._get_http_options() request, metadata = self._interceptor.pre_list_file_store_data_profiles( request, metadata @@ -8410,11 +8368,10 @@ def __call__( resp = self._interceptor.post_list_file_store_data_profiles(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_file_store_data_profiles_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_file_store_data_profiles_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8648,9 +8605,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListInspectTemplates._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListInspectTemplates._get_http_options() request, metadata = self._interceptor.pre_list_inspect_templates( request, metadata @@ -8947,9 +8902,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListProjectDataProfiles._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListProjectDataProfiles._get_http_options() request, metadata = self._interceptor.pre_list_project_data_profiles( request, metadata @@ -9098,9 +9051,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListStoredInfoTypes._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListStoredInfoTypes._get_http_options() request, metadata = self._interceptor.pre_list_stored_info_types( request, metadata @@ -9248,9 +9199,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListTableDataProfiles._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListTableDataProfiles._get_http_options() request, metadata = self._interceptor.pre_list_table_data_profiles( request, metadata @@ -10016,9 +9965,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseUpdateDeidentifyTemplate._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseUpdateDeidentifyTemplate._get_http_options() request, metadata = self._interceptor.pre_update_deidentify_template( request, metadata @@ -10176,9 +10123,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseUpdateDiscoveryConfig._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseUpdateDiscoveryConfig._get_http_options() request, metadata = self._interceptor.pre_update_discovery_config( request, metadata @@ -10336,9 +10281,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseUpdateInspectTemplate._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseUpdateInspectTemplate._get_http_options() request, metadata = self._interceptor.pre_update_inspect_template( request, metadata @@ -10648,9 +10591,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseUpdateStoredInfoType._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseUpdateStoredInfoType._get_http_options() request, metadata = self._interceptor.pre_update_stored_info_type( request, metadata @@ -10773,7 +10714,9 @@ def create_deidentify_template( ) -> Callable[[dlp.CreateDeidentifyTemplateRequest], dlp.DeidentifyTemplate]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateDeidentifyTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._CreateDeidentifyTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_discovery_config( @@ -10835,7 +10778,9 @@ def delete_deidentify_template( ) -> Callable[[dlp.DeleteDeidentifyTemplateRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteDeidentifyTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteDeidentifyTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_discovery_config( @@ -10857,7 +10802,9 @@ def delete_file_store_data_profile( ) -> Callable[[dlp.DeleteFileStoreDataProfileRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteFileStoreDataProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteFileStoreDataProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_inspect_template( @@ -10889,7 +10836,9 @@ def delete_table_data_profile( ) -> Callable[[dlp.DeleteTableDataProfileRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteTableDataProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteTableDataProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def finish_dlp_job(self) -> Callable[[dlp.FinishDlpJobRequest], empty_pb2.Empty]: @@ -10939,7 +10888,9 @@ def get_file_store_data_profile( ) -> Callable[[dlp.GetFileStoreDataProfileRequest], dlp.FileStoreDataProfile]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetFileStoreDataProfile(self._session, self._host, self._interceptor) # type: ignore + return self._GetFileStoreDataProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_inspect_template( @@ -10993,7 +10944,9 @@ def hybrid_inspect_job_trigger( ) -> Callable[[dlp.HybridInspectJobTriggerRequest], dlp.HybridInspectResponse]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._HybridInspectJobTrigger(self._session, self._host, self._interceptor) # type: ignore + return self._HybridInspectJobTrigger( + self._session, self._host, self._interceptor + ) # type: ignore @property def inspect_content( @@ -11011,7 +10964,9 @@ def list_column_data_profiles( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListColumnDataProfiles(self._session, self._host, self._interceptor) # type: ignore + return self._ListColumnDataProfiles( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_connections( @@ -11029,7 +10984,9 @@ def list_deidentify_templates( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListDeidentifyTemplates(self._session, self._host, self._interceptor) # type: ignore + return self._ListDeidentifyTemplates( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_discovery_configs( @@ -11055,7 +11012,9 @@ def list_file_store_data_profiles( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListFileStoreDataProfiles(self._session, self._host, self._interceptor) # type: ignore + return self._ListFileStoreDataProfiles( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_info_types( @@ -11089,7 +11048,9 @@ def list_project_data_profiles( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListProjectDataProfiles(self._session, self._host, self._interceptor) # type: ignore + return self._ListProjectDataProfiles( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_stored_info_types( @@ -11147,7 +11108,9 @@ def update_deidentify_template( ) -> Callable[[dlp.UpdateDeidentifyTemplateRequest], dlp.DeidentifyTemplate]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateDeidentifyTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDeidentifyTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_discovery_config( diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest_base.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest_base.py index 3fa8ea956562..b511deefd364 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest_base.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.dlp_v2.types import dlp diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/types/dlp.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/types/dlp.py index 471ac225b8b2..9b19633f798d 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/types/dlp.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/types/dlp.py @@ -343,6 +343,7 @@ class TransformationResultStatusType(proto.Enum): This will be set when the transformation and storing of it is successful. """ + STATE_TYPE_UNSPECIFIED = 0 INVALID_TRANSFORM = 1 BIGQUERY_MAX_ROW_SIZE_EXCEEDED = 2 @@ -364,6 +365,7 @@ class TransformationContainerType(proto.Enum): TRANSFORM_TABLE (3): A table. """ + TRANSFORM_UNKNOWN_CONTAINER = 0 TRANSFORM_BODY = 1 TRANSFORM_METADATA = 2 @@ -407,6 +409,7 @@ class TransformationType(proto.Enum): REDACT_IMAGE (14): Redact image """ + TRANSFORMATION_TYPE_UNSPECIFIED = 0 RECORD_SUPPRESSION = 1 REPLACE_VALUE = 2 @@ -438,6 +441,7 @@ class ProfileGeneration(proto.Enum): The profile is an update to a previous profile. """ + PROFILE_GENERATION_UNSPECIFIED = 0 PROFILE_GENERATION_NEW = 1 PROFILE_GENERATION_UPDATE = 2 @@ -465,6 +469,7 @@ class BigQueryTableTypeCollection(proto.Enum): table types will not have partial profiles generated. """ + BIG_QUERY_COLLECTION_UNSPECIFIED = 0 BIG_QUERY_COLLECTION_ALL_TYPES = 1 BIG_QUERY_COLLECTION_ONLY_SUPPORTED_TYPES = 2 @@ -485,6 +490,7 @@ class BigQueryTableType(proto.Enum): BIG_QUERY_TABLE_TYPE_SNAPSHOT (3): A snapshot of a BigQuery table. """ + BIG_QUERY_TABLE_TYPE_UNSPECIFIED = 0 BIG_QUERY_TABLE_TYPE_TABLE = 1 BIG_QUERY_TABLE_TYPE_EXTERNAL_BIG_LAKE = 2 @@ -508,6 +514,7 @@ class DataProfileUpdateFrequency(proto.Enum): The data profile can be updated up to once every 30 days. Default. """ + UPDATE_FREQUENCY_UNSPECIFIED = 0 UPDATE_FREQUENCY_NEVER = 1 UPDATE_FREQUENCY_DAILY = 2 @@ -525,6 +532,7 @@ class BigQueryTableModification(proto.Enum): A table will be considered modified when the last_modified_time from BigQuery has been updated. """ + TABLE_MODIFICATION_UNSPECIFIED = 0 TABLE_MODIFIED_TIMESTAMP = 1 @@ -543,6 +551,7 @@ class BigQuerySchemaModification(proto.Enum): Profiles should be regenerated when columns are removed from the table. """ + SCHEMA_MODIFICATION_UNSPECIFIED = 0 SCHEMA_NEW_COLUMNS = 1 SCHEMA_REMOVED_COLUMNS = 2 @@ -571,6 +580,7 @@ class RelationalOperator(proto.Enum): EXISTS (7): Exists """ + RELATIONAL_OPERATOR_UNSPECIFIED = 0 EQUAL_TO = 1 NOT_EQUAL_TO = 2 @@ -615,6 +625,7 @@ class MatchingType(proto.Enum): - Exclude infoType: no intersection with affecting infoTypes findings """ + MATCHING_TYPE_UNSPECIFIED = 0 MATCHING_TYPE_FULL_MATCH = 1 MATCHING_TYPE_PARTIAL_MATCH = 2 @@ -634,6 +645,7 @@ class ContentOption(proto.Enum): CONTENT_IMAGE (2): Images found in the data. """ + CONTENT_UNSPECIFIED = 0 CONTENT_TEXT = 1 CONTENT_IMAGE = 2 @@ -649,6 +661,7 @@ class MetadataType(proto.Enum): General file metadata provided by Cloud Storage. """ + METADATATYPE_UNSPECIFIED = 0 STORAGE_METADATA = 2 @@ -664,6 +677,7 @@ class InfoTypeSupportedBy(proto.Enum): RISK_ANALYSIS (2): Supported by the risk analysis operations. """ + ENUM_TYPE_UNSPECIFIED = 0 INSPECT = 1 RISK_ANALYSIS = 2 @@ -681,6 +695,7 @@ class DlpJobType(proto.Enum): RISK_ANALYSIS_JOB (2): The job executed a Risk Analysis computation. """ + DLP_JOB_TYPE_UNSPECIFIED = 0 INSPECT_JOB = 1 RISK_ANALYSIS_JOB = 2 @@ -705,6 +720,7 @@ class StoredInfoTypeState(proto.Enum): StoredInfoType, use the ``UpdateStoredInfoType`` method to create a new version. """ + STORED_INFO_TYPE_STATE_UNSPECIFIED = 0 PENDING = 1 READY = 2 @@ -731,6 +747,7 @@ class ResourceVisibility(proto.Enum): RESOURCE_VISIBILITY_RESTRICTED (20): Visible only to specific users. """ + RESOURCE_VISIBILITY_UNSPECIFIED = 0 RESOURCE_VISIBILITY_PUBLIC = 10 RESOURCE_VISIBILITY_INCONCLUSIVE = 15 @@ -749,6 +766,7 @@ class EncryptionStatus(proto.Enum): ENCRYPTION_CUSTOMER_MANAGED (2): Customer provides the key. """ + ENCRYPTION_STATUS_UNSPECIFIED = 0 ENCRYPTION_GOOGLE_MANAGED = 1 ENCRYPTION_CUSTOMER_MANAGED = 2 @@ -770,6 +788,7 @@ class NullPercentageLevel(proto.Enum): NULL_PERCENTAGE_HIGH (4): A lot of null entries. """ + NULL_PERCENTAGE_LEVEL_UNSPECIFIED = 0 NULL_PERCENTAGE_VERY_LOW = 1 NULL_PERCENTAGE_LOW = 2 @@ -797,6 +816,7 @@ class UniquenessScoreLevel(proto.Enum): High uniqueness, possibly a column of free text or unique identifiers. """ + UNIQUENESS_SCORE_LEVEL_UNSPECIFIED = 0 UNIQUENESS_SCORE_LOW = 1 UNIQUENESS_SCORE_MEDIUM = 2 @@ -830,6 +850,7 @@ class ConnectionState(proto.Enum): properties will automatically mark it as AVAILABLE. """ + CONNECTION_STATE_UNSPECIFIED = 0 MISSING_CREDENTIALS = 1 AVAILABLE = 2 @@ -1215,12 +1236,12 @@ class InfoTypeLimit(proto.Message): number=2, enum=storage.Likelihood, ) - min_likelihood_per_info_type: MutableSequence[ - InfoTypeLikelihood - ] = proto.RepeatedField( - proto.MESSAGE, - number=11, - message=InfoTypeLikelihood, + min_likelihood_per_info_type: MutableSequence[InfoTypeLikelihood] = ( + proto.RepeatedField( + proto.MESSAGE, + number=11, + message=InfoTypeLikelihood, + ) ) limits: FindingLimits = proto.Field( proto.MESSAGE, @@ -1310,6 +1331,7 @@ class BytesType(proto.Enum): AI_MODEL (18): AI model file types. Only used for profiling. """ + BYTES_TYPE_UNSPECIFIED = 0 IMAGE = 6 IMAGE_JPEG = 1 @@ -2092,12 +2114,12 @@ class ImageRedactionConfig(proto.Message): number=2, message="InspectConfig", ) - image_redaction_configs: MutableSequence[ - ImageRedactionConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=ImageRedactionConfig, + image_redaction_configs: MutableSequence[ImageRedactionConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=ImageRedactionConfig, + ) ) include_findings: bool = proto.Field( proto.BOOL, @@ -2570,6 +2592,7 @@ class OutputSchema(proto.Enum): ALL_COLUMNS (5): Schema containing all columns. """ + OUTPUT_SCHEMA_UNSPECIFIED = 0 BASIC_COLUMNS = 1 GCS_COLUMNS = 2 @@ -2918,6 +2941,7 @@ class RegionalizationScope(proto.Enum): ANY_LOCATION (2): Feature may be used anywhere. Default value. """ + REGIONALIZATION_SCOPE_UNSPECIFIED = 0 REGIONAL = 1 ANY_LOCATION = 2 @@ -3165,6 +3189,7 @@ class LocationCategory(proto.Enum): The infoType is typically used in Google internally. """ + LOCATION_UNSPECIFIED = 0 GLOBAL = 1 ARGENTINA = 2 @@ -3236,6 +3261,7 @@ class IndustryCategory(proto.Enum): The infoType is typically used in the telecommunications industry. """ + INDUSTRY_UNSPECIFIED = 0 FINANCE = 1 HEALTH = 2 @@ -3275,6 +3301,7 @@ class TypeCategory(proto.Enum): CUSTOM (8): Category for ``CustomInfoType`` types. """ + TYPE_UNSPECIFIED = 0 PII = 1 SPII = 2 @@ -3819,12 +3846,12 @@ class QuasiIdField(proto.Message): message=storage.FieldId, ) - quasi_ids: MutableSequence[ - "PrivacyMetric.KMapEstimationConfig.TaggedField" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="PrivacyMetric.KMapEstimationConfig.TaggedField", + quasi_ids: MutableSequence["PrivacyMetric.KMapEstimationConfig.TaggedField"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="PrivacyMetric.KMapEstimationConfig.TaggedField", + ) ) region_code: str = proto.Field( proto.STRING, @@ -4172,12 +4199,12 @@ class LDiversityEquivalenceClass(proto.Message): proto.INT64, number=3, ) - top_sensitive_values: MutableSequence[ - "ValueFrequency" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="ValueFrequency", + top_sensitive_values: MutableSequence["ValueFrequency"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="ValueFrequency", + ) ) class LDiversityHistogramBucket(proto.Message): @@ -5071,6 +5098,7 @@ class TimePart(proto.Enum): HOUR_OF_DAY (6): [0-23] """ + TIME_PART_UNSPECIFIED = 0 YEAR = 1 MONTH = 2 @@ -5292,6 +5320,7 @@ class CommonCharsToIgnore(proto.Enum): WHITESPACE (5): Whitespace character, one of [ \\t\\n\\x0B\\f\\r] """ + COMMON_CHARS_TO_IGNORE_UNSPECIFIED = 0 NUMERIC = 1 ALPHA_UPPER_CASE = 2 @@ -5622,6 +5651,7 @@ class FfxCommonNativeAlphabet(proto.Enum): ALPHA_NUMERIC (4): ``[0-9A-Za-z]`` (radix of 62) """ + FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED = 0 NUMERIC = 1 HEXADECIMAL = 2 @@ -6086,6 +6116,7 @@ class LogicalOperator(proto.Enum): AND (1): Conditional AND """ + LOGICAL_OPERATOR_UNSPECIFIED = 0 AND = 1 @@ -6123,12 +6154,12 @@ class TransformationOverview(proto.Message): proto.INT64, number=2, ) - transformation_summaries: MutableSequence[ - "TransformationSummary" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="TransformationSummary", + transformation_summaries: MutableSequence["TransformationSummary"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="TransformationSummary", + ) ) @@ -6173,6 +6204,7 @@ class TransformationResultCode(proto.Enum): ERROR (2): Transformation had an error. """ + TRANSFORMATION_RESULT_CODE_UNSPECIFIED = 0 SUCCESS = 1 ERROR = 2 @@ -6665,6 +6697,7 @@ class ErrorExtraInfo(proto.Enum): File store cluster is not supported for profile generation. """ + ERROR_INFO_UNSPECIFIED = 0 IMAGE_SCAN_UNAVAILABLE_IN_REGION = 1 FILE_STORE_CLUSTER_UNSUPPORTED = 2 @@ -6752,6 +6785,7 @@ class Status(proto.Enum): CANCELLED (3): Trigger is cancelled and can not be resumed. """ + STATUS_UNSPECIFIED = 0 HEALTHY = 1 PAUSED = 2 @@ -7120,12 +7154,12 @@ class Deidentify(proto.Message): number=9, oneof="output", ) - file_types_to_transform: MutableSequence[ - storage.FileType - ] = proto.RepeatedField( - proto.ENUM, - number=8, - enum=storage.FileType, + file_types_to_transform: MutableSequence[storage.FileType] = ( + proto.RepeatedField( + proto.ENUM, + number=8, + enum=storage.FileType, + ) ) class JobNotificationEmails(proto.Message): @@ -8133,6 +8167,7 @@ class EventType(proto.Enum): ERROR_CHANGED (4): A user (non-internal) error occurred. """ + EVENT_TYPE_UNSPECIFIED = 0 NEW_PROFILE = 1 CHANGED_PROFILE = 2 @@ -8232,6 +8267,7 @@ class DetailLevel(proto.Enum): FILE_STORE_PROFILE (3): The full file store data profile. """ + DETAIL_LEVEL_UNSPECIFIED = 0 TABLE_PROFILE = 1 RESOURCE_NAME = 2 @@ -8387,12 +8423,12 @@ class TagValue(proto.Message): number=1, message="DataProfileAction.TagResources.TagCondition", ) - profile_generations_to_tag: MutableSequence[ - "ProfileGeneration" - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum="ProfileGeneration", + profile_generations_to_tag: MutableSequence["ProfileGeneration"] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum="ProfileGeneration", + ) ) lower_data_risk_to_low: bool = proto.Field( proto.BOOL, @@ -8824,6 +8860,7 @@ class Status(proto.Enum): PAUSED (2): The discovery config is paused temporarily. """ + STATUS_UNSPECIFIED = 0 RUNNING = 1 PAUSED = 2 @@ -9624,6 +9661,7 @@ class DatabaseEngine(proto.Enum): POSTGRES (3): PostgreSQL database. """ + DATABASE_ENGINE_UNSPECIFIED = 0 ALL_SUPPORTED_DATABASE_ENGINES = 1 MYSQL = 2 @@ -9642,6 +9680,7 @@ class DatabaseResourceType(proto.Enum): DATABASE_RESOURCE_TYPE_TABLE (2): Tables. """ + DATABASE_RESOURCE_TYPE_UNSPECIFIED = 0 DATABASE_RESOURCE_TYPE_ALL_SUPPORTED_TYPES = 1 DATABASE_RESOURCE_TYPE_TABLE = 2 @@ -9703,6 +9742,7 @@ class CloudSqlSchemaModification(proto.Enum): REMOVED_COLUMNS (2): Columns have been removed from the table. """ + SQL_SCHEMA_MODIFICATION_UNSPECIFIED = 0 NEW_COLUMNS = 1 REMOVED_COLUMNS = 2 @@ -10080,6 +10120,7 @@ class CloudStorageObjectAttribute(proto.Enum): Scan objects with the dual-regional storage class. This will incur retrieval fees. """ + CLOUD_STORAGE_OBJECT_ATTRIBUTE_UNSPECIFIED = 0 ALL_SUPPORTED_OBJECTS = 1 STANDARD = 2 @@ -10110,24 +10151,25 @@ class CloudStorageBucketAttribute(proto.Enum): should be set. Scanning Autoclass-enabled buckets can affect object storage classes. """ + CLOUD_STORAGE_BUCKET_ATTRIBUTE_UNSPECIFIED = 0 ALL_SUPPORTED_BUCKETS = 1 AUTOCLASS_DISABLED = 2 AUTOCLASS_ENABLED = 3 - included_object_attributes: MutableSequence[ - CloudStorageObjectAttribute - ] = proto.RepeatedField( - proto.ENUM, - number=1, - enum=CloudStorageObjectAttribute, + included_object_attributes: MutableSequence[CloudStorageObjectAttribute] = ( + proto.RepeatedField( + proto.ENUM, + number=1, + enum=CloudStorageObjectAttribute, + ) ) - included_bucket_attributes: MutableSequence[ - CloudStorageBucketAttribute - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum=CloudStorageBucketAttribute, + included_bucket_attributes: MutableSequence[CloudStorageBucketAttribute] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum=CloudStorageBucketAttribute, + ) ) @@ -10505,6 +10547,7 @@ class BucketType(proto.Enum): TYPE_GENERAL_PURPOSE (2): A general purpose Amazon S3 bucket. """ + TYPE_UNSPECIFIED = 0 TYPE_ALL_SUPPORTED = 1 TYPE_GENERAL_PURPOSE = 2 @@ -10528,6 +10571,7 @@ class ObjectStorageClass(proto.Enum): Objects in the S3 Intelligent-Tiering access tiers. """ + UNSPECIFIED = 0 ALL_SUPPORTED_CLASSES = 1 STANDARD = 2 @@ -10987,6 +11031,7 @@ class JobState(proto.Enum): finished no more calls to hybridInspect may be made. ACTIVE jobs can transition to DONE. """ + JOB_STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 @@ -12547,6 +12592,7 @@ class DataRiskLevelScore(proto.Enum): Re-identification of users may be possible. Consider limiting usage and or removing SPII. """ + RISK_SCORE_UNSPECIFIED = 0 RISK_LOW = 10 RISK_UNKNOWN = 12 @@ -12779,6 +12825,7 @@ class State(proto.Enum): profile_status.status.code is 0, the profile succeeded, otherwise, it failed. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 DONE = 2 @@ -13077,6 +13124,7 @@ class State(proto.Enum): profile_status.status.code is 0, the profile succeeded, otherwise, it failed. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 DONE = 2 @@ -13133,6 +13181,7 @@ class ColumnDataType(proto.Enum): TYPE_RANGE_TIMESTAMP (18): ``Range`` type. """ + COLUMN_DATA_TYPE_UNSPECIFIED = 0 TYPE_INT64 = 1 TYPE_BOOL = 2 @@ -13162,6 +13211,7 @@ class ColumnPolicyState(proto.Enum): COLUMN_POLICY_TAGGED (1): Column has policy tag applied. """ + COLUMN_POLICY_STATE_UNSPECIFIED = 0 COLUMN_POLICY_TAGGED = 1 @@ -13375,6 +13425,7 @@ class State(proto.Enum): profile_status.status.code is 0, the profile succeeded, otherwise, it failed. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 DONE = 2 @@ -13477,12 +13528,12 @@ class State(proto.Enum): proto.STRING, number=18, ) - file_store_info_type_summaries: MutableSequence[ - "FileStoreInfoTypeSummary" - ] = proto.RepeatedField( - proto.MESSAGE, - number=21, - message="FileStoreInfoTypeSummary", + file_store_info_type_summaries: MutableSequence["FileStoreInfoTypeSummary"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=21, + message="FileStoreInfoTypeSummary", + ) ) sample_findings_table: storage.BigQueryTable = proto.Field( proto.MESSAGE, @@ -13690,12 +13741,12 @@ class FileClusterSummary(proto.Message): number=1, message="FileClusterType", ) - file_store_info_type_summaries: MutableSequence[ - "FileStoreInfoTypeSummary" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="FileStoreInfoTypeSummary", + file_store_info_type_summaries: MutableSequence["FileStoreInfoTypeSummary"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="FileStoreInfoTypeSummary", + ) ) sensitivity_score: storage.SensitivityScore = proto.Field( proto.MESSAGE, @@ -13889,12 +13940,12 @@ class ListFileStoreDataProfilesResponse(proto.Message): def raw_page(self): return self - file_store_data_profiles: MutableSequence[ - "FileStoreDataProfile" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="FileStoreDataProfile", + file_store_data_profiles: MutableSequence["FileStoreDataProfile"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="FileStoreDataProfile", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -13967,6 +14018,7 @@ class ProfileScoreBucket(proto.Enum): MEDIUM_OR_HIGH (2): Medium or high risk/sensitivity detected. """ + PROFILE_SCORE_BUCKET_UNSPECIFIED = 0 HIGH = 1 MEDIUM_OR_HIGH = 2 @@ -14033,6 +14085,7 @@ class PubSubLogicalOperator(proto.Enum): AND (2): Conditional AND. """ + LOGICAL_OPERATOR_UNSPECIFIED = 0 OR = 1 AND = 2 @@ -14042,12 +14095,12 @@ class PubSubLogicalOperator(proto.Enum): number=1, enum="DataProfilePubSubCondition.PubSubExpressions.PubSubLogicalOperator", ) - conditions: MutableSequence[ - "DataProfilePubSubCondition.PubSubCondition" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="DataProfilePubSubCondition.PubSubCondition", + conditions: MutableSequence["DataProfilePubSubCondition.PubSubCondition"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="DataProfilePubSubCondition.PubSubCondition", + ) ) expressions: PubSubExpressions = proto.Field( @@ -14462,6 +14515,7 @@ class DatabaseEngine(proto.Enum): DATABASE_ENGINE_POSTGRES (2): Cloud SQL for PostgreSQL instance. """ + DATABASE_ENGINE_UNKNOWN = 0 DATABASE_ENGINE_MYSQL = 1 DATABASE_ENGINE_POSTGRES = 2 @@ -14569,6 +14623,7 @@ class Cluster(proto.Enum): CLUSTER_AI_MODEL (10): AI models like .tflite etc. """ + CLUSTER_UNSPECIFIED = 0 CLUSTER_UNKNOWN = 1 CLUSTER_TEXT = 2 @@ -14723,6 +14778,7 @@ class Category(proto.Enum): Indicates that the data profile is related to code. """ + CATEGORY_UNSPECIFIED = 0 AI = 1 CODE = 2 @@ -14753,6 +14809,7 @@ class Signal(proto.Enum): If the service determines the category type. For example, Vertex AI assets would always have a ``Category`` of ``AI``. """ + SIGNAL_UNSPECIFIED = 0 MODEL = 1 TEXT_EMBEDDING = 2 diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/types/storage.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/types/storage.py index f55cc118c233..5b5d972688a9 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/types/storage.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/types/storage.py @@ -85,6 +85,7 @@ class Likelihood(proto.Enum): Confidence level is high. Lowest chance of a false positive. """ + LIKELIHOOD_UNSPECIFIED = 0 VERY_UNLIKELY = 1 UNLIKELY = 2 @@ -163,6 +164,7 @@ class FileType(proto.Enum): ``bytes_limit_per_file_percent`` has no effect on Excel files. """ + FILE_TYPE_UNSPECIFIED = 0 BINARY_FILE = 1 TEXT_FILE = 2 @@ -244,6 +246,7 @@ class SensitivityScoreLevel(proto.Enum): Re-identification of users might be possible. Consider limiting usage and or removing SPII. """ + SENSITIVITY_SCORE_UNSPECIFIED = 0 SENSITIVITY_LOW = 10 SENSITIVITY_UNKNOWN = 12 @@ -360,6 +363,7 @@ class ExclusionType(proto.Enum): excluded from final results, but can still affect rule execution. """ + EXCLUSION_TYPE_UNSPECIFIED = 0 EXCLUSION_TYPE_EXCLUDE = 1 @@ -879,6 +883,7 @@ class SampleMethod(proto.Enum): pick the offset to start scanning. The scanned bytes are contiguous. """ + SAMPLE_METHOD_UNSPECIFIED = 0 TOP = 1 RANDOM_START = 2 @@ -1039,6 +1044,7 @@ class SampleMethod(proto.Enum): RANDOM_START (2): Randomly pick groups of rows to scan. """ + SAMPLE_METHOD_UNSPECIFIED = 0 TOP = 1 RANDOM_START = 2 diff --git a/packages/google-cloud-dlp/mypy.ini b/packages/google-cloud-dlp/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-dlp/mypy.ini +++ b/packages/google-cloud-dlp/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-dlp/noxfile.py b/packages/google-cloud-dlp/noxfile.py index 45c39a6287a8..e5294f5b0691 100644 --- a/packages/google-cloud-dlp/noxfile.py +++ b/packages/google-cloud-dlp/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dlp/tests/unit/gapic/dlp_v2/test_dlp_service.py b/packages/google-cloud-dlp/tests/unit/gapic/dlp_v2/test_dlp_service.py index 41e0c834baf3..5023ac484581 100644 --- a/packages/google-cloud-dlp/tests/unit/gapic/dlp_v2/test_dlp_service.py +++ b/packages/google-cloud-dlp/tests/unit/gapic/dlp_v2/test_dlp_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,15 +43,7 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.oauth2 import service_account import google.protobuf.any_pb2 as any_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore @@ -61,6 +53,19 @@ import google.type.date_pb2 as date_pb2 # type: ignore import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.cloud.location import locations_pb2 +from google.oauth2 import service_account from google.cloud.dlp_v2.services.dlp_service import ( DlpServiceAsyncClient, @@ -928,10 +933,9 @@ def test_dlp_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -976,10 +980,9 @@ def test_dlp_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1018,9 @@ def test_dlp_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1251,9 +1253,7 @@ def test_dlp_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1859,9 +1859,9 @@ def test_deidentify_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.deidentify_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.deidentify_content] = ( + mock_rpc + ) request = {} client.deidentify_content(request) @@ -2114,9 +2114,9 @@ def test_reidentify_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.reidentify_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.reidentify_content] = ( + mock_rpc + ) request = {} client.reidentify_content(request) @@ -3358,9 +3358,9 @@ def test_get_inspect_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_inspect_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_inspect_template] = ( + mock_rpc + ) request = {} client.get_inspect_template(request) @@ -3706,9 +3706,9 @@ def test_list_inspect_templates_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_inspect_templates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_inspect_templates] = ( + mock_rpc + ) request = {} client.list_inspect_templates(request) @@ -6555,9 +6555,9 @@ def test_create_job_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_job_trigger] = ( + mock_rpc + ) request = {} client.create_job_trigger(request) @@ -6914,9 +6914,9 @@ def test_update_job_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_job_trigger] = ( + mock_rpc + ) request = {} client.update_job_trigger(request) @@ -7950,9 +7950,9 @@ def test_list_job_triggers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_job_triggers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_job_triggers] = ( + mock_rpc + ) request = {} client.list_job_triggers(request) @@ -8490,9 +8490,9 @@ def test_delete_job_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_job_trigger] = ( + mock_rpc + ) request = {} client.delete_job_trigger(request) @@ -8828,9 +8828,9 @@ def test_activate_job_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.activate_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.activate_job_trigger] = ( + mock_rpc + ) request = {} client.activate_job_trigger(request) @@ -9825,9 +9825,9 @@ def test_get_discovery_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_discovery_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_discovery_config] = ( + mock_rpc + ) request = {} client.get_discovery_config(request) @@ -10173,9 +10173,9 @@ def test_list_discovery_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_discovery_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_discovery_configs] = ( + mock_rpc + ) request = {} client.list_discovery_configs(request) @@ -13559,9 +13559,9 @@ def test_get_stored_info_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_stored_info_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_stored_info_type] = ( + mock_rpc + ) request = {} client.get_stored_info_type(request) @@ -13903,9 +13903,9 @@ def test_list_stored_info_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_stored_info_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_stored_info_types] = ( + mock_rpc + ) request = {} client.list_stored_info_types(request) @@ -18086,9 +18086,9 @@ def test_get_table_data_profile_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_table_data_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_table_data_profile] = ( + mock_rpc + ) request = {} client.get_table_data_profile(request) @@ -19196,9 +19196,9 @@ def test_hybrid_inspect_dlp_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.hybrid_inspect_dlp_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.hybrid_inspect_dlp_job] = ( + mock_rpc + ) request = {} client.hybrid_inspect_dlp_job(request) @@ -19765,9 +19765,9 @@ def test_create_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -20435,9 +20435,9 @@ def test_list_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -20964,9 +20964,9 @@ def test_search_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_connections] = ( + mock_rpc + ) request = {} client.search_connections(request) @@ -21502,9 +21502,9 @@ def test_delete_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -21834,9 +21834,9 @@ def test_update_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) @@ -22177,9 +22177,9 @@ def test_deidentify_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.deidentify_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.deidentify_content] = ( + mock_rpc + ) request = {} client.deidentify_content(request) @@ -22217,9 +22217,9 @@ def test_reidentify_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.reidentify_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.reidentify_content] = ( + mock_rpc + ) request = {} client.reidentify_content(request) @@ -22818,9 +22818,9 @@ def test_get_inspect_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_inspect_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_inspect_template] = ( + mock_rpc + ) request = {} client.get_inspect_template(request) @@ -23003,9 +23003,9 @@ def test_list_inspect_templates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_inspect_templates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_inspect_templates] = ( + mock_rpc + ) request = {} client.list_inspect_templates(request) @@ -24453,9 +24453,9 @@ def test_create_job_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_job_trigger] = ( + mock_rpc + ) request = {} client.create_job_trigger(request) @@ -24644,9 +24644,9 @@ def test_update_job_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_job_trigger] = ( + mock_rpc + ) request = {} client.update_job_trigger(request) @@ -25187,9 +25187,9 @@ def test_list_job_triggers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_job_triggers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_job_triggers] = ( + mock_rpc + ) request = {} client.list_job_triggers(request) @@ -25451,9 +25451,9 @@ def test_delete_job_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_job_trigger] = ( + mock_rpc + ) request = {} client.delete_job_trigger(request) @@ -25626,9 +25626,9 @@ def test_activate_job_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.activate_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.activate_job_trigger] = ( + mock_rpc + ) request = {} client.activate_job_trigger(request) @@ -26143,9 +26143,9 @@ def test_get_discovery_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_discovery_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_discovery_config] = ( + mock_rpc + ) request = {} client.get_discovery_config(request) @@ -26328,9 +26328,9 @@ def test_list_discovery_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_discovery_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_discovery_configs] = ( + mock_rpc + ) request = {} client.list_discovery_configs(request) @@ -28054,9 +28054,9 @@ def test_get_stored_info_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_stored_info_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_stored_info_type] = ( + mock_rpc + ) request = {} client.get_stored_info_type(request) @@ -28236,9 +28236,9 @@ def test_list_stored_info_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_stored_info_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_stored_info_types] = ( + mock_rpc + ) request = {} client.list_stored_info_types(request) @@ -30287,9 +30287,9 @@ def test_get_table_data_profile_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_table_data_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_table_data_profile] = ( + mock_rpc + ) request = {} client.get_table_data_profile(request) @@ -30837,9 +30837,9 @@ def test_hybrid_inspect_dlp_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.hybrid_inspect_dlp_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.hybrid_inspect_dlp_job] = ( + mock_rpc + ) request = {} client.hybrid_inspect_dlp_job(request) @@ -31134,9 +31134,9 @@ def test_create_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -31503,9 +31503,9 @@ def test_list_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -31761,9 +31761,9 @@ def test_search_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_connections] = ( + mock_rpc + ) request = {} client.search_connections(request) @@ -32019,9 +32019,9 @@ def test_delete_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -32196,9 +32196,9 @@ def test_update_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/__init__.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/__init__.py index b810ff6c46cd..8de511558e74 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/__init__.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_migration_service import ( DataMigrationServiceAsyncClient, DataMigrationServiceClient, diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/async_client.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/async_client.py index 1e9674672aeb..82e0348f0adc 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/async_client.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.clouddms_v1 import gapic_version as package_version @@ -46,15 +46,17 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.rpc.status_pb2 as status_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.clouddms_v1.services.data_migration_service import pagers from google.cloud.clouddms_v1.types import ( @@ -155,7 +157,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataMigrationServiceAsyncClient: The constructed client. """ - return DataMigrationServiceClient.from_service_account_info.__func__(DataMigrationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataMigrationServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataMigrationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -171,7 +176,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataMigrationServiceAsyncClient: The constructed client. """ - return DataMigrationServiceClient.from_service_account_file.__func__(DataMigrationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataMigrationServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataMigrationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -209,7 +217,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataMigrationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataMigrationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataMigrationServiceTransport: diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/client.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/client.py index fd02fb5bbe0c..25c873f7b75d 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/client.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.clouddms_v1 import gapic_version as package_version @@ -63,15 +63,17 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.rpc.status_pb2 as status_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.clouddms_v1.services.data_migration_service import pagers from google.cloud.clouddms_v1.types import ( @@ -93,9 +95,7 @@ class DataMigrationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataMigrationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataMigrationServiceTransport]] _transport_registry["grpc"] = DataMigrationServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataMigrationServiceGrpcAsyncIOTransport @@ -747,11 +747,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataMigrationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataMigrationServiceClient._read_environment_variables() + ) self._client_cert_source = DataMigrationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -786,8 +784,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataMigrationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/pagers.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/pagers.py index dba44881c6f9..b0a7cbf946c6 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/pagers.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -147,7 +147,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -459,7 +459,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -539,7 +539,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -615,7 +615,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -697,7 +697,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -773,7 +773,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -853,7 +853,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -929,7 +929,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1009,7 +1009,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1085,7 +1085,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/__init__.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/__init__.py index 45773a2636fa..4fc974367e11 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/__init__.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import DataMigrationServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataMigrationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataMigrationServiceTransport]] _transport_registry["grpc"] = DataMigrationServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataMigrationServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py index 8e3cc258fba9..69c923e673be 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.clouddms_v1 import gapic_version as package_version from google.cloud.clouddms_v1.types import ( @@ -847,13 +849,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc.py index ee5fc6b5d6b6..1a407f6352ac 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.clouddms_v1.types import ( clouddms, @@ -1002,12 +1004,12 @@ def list_conversion_workspaces( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversion_workspaces" not in self._stubs: - self._stubs[ - "list_conversion_workspaces" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/ListConversionWorkspaces", - request_serializer=clouddms.ListConversionWorkspacesRequest.serialize, - response_deserializer=clouddms.ListConversionWorkspacesResponse.deserialize, + self._stubs["list_conversion_workspaces"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/ListConversionWorkspaces", + request_serializer=clouddms.ListConversionWorkspacesRequest.serialize, + response_deserializer=clouddms.ListConversionWorkspacesResponse.deserialize, + ) ) return self._stubs["list_conversion_workspaces"] @@ -1033,12 +1035,12 @@ def create_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversion_workspace" not in self._stubs: - self._stubs[ - "create_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/CreateConversionWorkspace", - request_serializer=clouddms.CreateConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/CreateConversionWorkspace", + request_serializer=clouddms.CreateConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_conversion_workspace"] @@ -1064,12 +1066,12 @@ def update_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_conversion_workspace" not in self._stubs: - self._stubs[ - "update_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/UpdateConversionWorkspace", - request_serializer=clouddms.UpdateConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/UpdateConversionWorkspace", + request_serializer=clouddms.UpdateConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_conversion_workspace"] @@ -1094,12 +1096,12 @@ def delete_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversion_workspace" not in self._stubs: - self._stubs[ - "delete_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/DeleteConversionWorkspace", - request_serializer=clouddms.DeleteConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/DeleteConversionWorkspace", + request_serializer=clouddms.DeleteConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_conversion_workspace"] @@ -1292,12 +1294,12 @@ def convert_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "convert_conversion_workspace" not in self._stubs: - self._stubs[ - "convert_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/ConvertConversionWorkspace", - request_serializer=clouddms.ConvertConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["convert_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/ConvertConversionWorkspace", + request_serializer=clouddms.ConvertConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["convert_conversion_workspace"] @@ -1323,12 +1325,12 @@ def commit_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "commit_conversion_workspace" not in self._stubs: - self._stubs[ - "commit_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/CommitConversionWorkspace", - request_serializer=clouddms.CommitConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["commit_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/CommitConversionWorkspace", + request_serializer=clouddms.CommitConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["commit_conversion_workspace"] @@ -1354,12 +1356,12 @@ def rollback_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_conversion_workspace" not in self._stubs: - self._stubs[ - "rollback_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/RollbackConversionWorkspace", - request_serializer=clouddms.RollbackConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["rollback_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/RollbackConversionWorkspace", + request_serializer=clouddms.RollbackConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["rollback_conversion_workspace"] @@ -1383,12 +1385,12 @@ def apply_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "apply_conversion_workspace" not in self._stubs: - self._stubs[ - "apply_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/ApplyConversionWorkspace", - request_serializer=clouddms.ApplyConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["apply_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/ApplyConversionWorkspace", + request_serializer=clouddms.ApplyConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["apply_conversion_workspace"] @@ -1420,12 +1422,12 @@ def describe_database_entities( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "describe_database_entities" not in self._stubs: - self._stubs[ - "describe_database_entities" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/DescribeDatabaseEntities", - request_serializer=clouddms.DescribeDatabaseEntitiesRequest.serialize, - response_deserializer=clouddms.DescribeDatabaseEntitiesResponse.deserialize, + self._stubs["describe_database_entities"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/DescribeDatabaseEntities", + request_serializer=clouddms.DescribeDatabaseEntitiesRequest.serialize, + response_deserializer=clouddms.DescribeDatabaseEntitiesResponse.deserialize, + ) ) return self._stubs["describe_database_entities"] @@ -1487,12 +1489,12 @@ def describe_conversion_workspace_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "describe_conversion_workspace_revisions" not in self._stubs: - self._stubs[ - "describe_conversion_workspace_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/DescribeConversionWorkspaceRevisions", - request_serializer=clouddms.DescribeConversionWorkspaceRevisionsRequest.serialize, - response_deserializer=clouddms.DescribeConversionWorkspaceRevisionsResponse.deserialize, + self._stubs["describe_conversion_workspace_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/DescribeConversionWorkspaceRevisions", + request_serializer=clouddms.DescribeConversionWorkspaceRevisionsRequest.serialize, + response_deserializer=clouddms.DescribeConversionWorkspaceRevisionsResponse.deserialize, + ) ) return self._stubs["describe_conversion_workspace_revisions"] diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py index fcc0d0ced116..4e16cd5e2e92 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.clouddms_v1.types import ( clouddms, @@ -1045,12 +1047,12 @@ def list_conversion_workspaces( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversion_workspaces" not in self._stubs: - self._stubs[ - "list_conversion_workspaces" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/ListConversionWorkspaces", - request_serializer=clouddms.ListConversionWorkspacesRequest.serialize, - response_deserializer=clouddms.ListConversionWorkspacesResponse.deserialize, + self._stubs["list_conversion_workspaces"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/ListConversionWorkspaces", + request_serializer=clouddms.ListConversionWorkspacesRequest.serialize, + response_deserializer=clouddms.ListConversionWorkspacesResponse.deserialize, + ) ) return self._stubs["list_conversion_workspaces"] @@ -1076,12 +1078,12 @@ def create_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversion_workspace" not in self._stubs: - self._stubs[ - "create_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/CreateConversionWorkspace", - request_serializer=clouddms.CreateConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/CreateConversionWorkspace", + request_serializer=clouddms.CreateConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_conversion_workspace"] @@ -1107,12 +1109,12 @@ def update_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_conversion_workspace" not in self._stubs: - self._stubs[ - "update_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/UpdateConversionWorkspace", - request_serializer=clouddms.UpdateConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/UpdateConversionWorkspace", + request_serializer=clouddms.UpdateConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_conversion_workspace"] @@ -1137,12 +1139,12 @@ def delete_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversion_workspace" not in self._stubs: - self._stubs[ - "delete_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/DeleteConversionWorkspace", - request_serializer=clouddms.DeleteConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/DeleteConversionWorkspace", + request_serializer=clouddms.DeleteConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_conversion_workspace"] @@ -1342,12 +1344,12 @@ def convert_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "convert_conversion_workspace" not in self._stubs: - self._stubs[ - "convert_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/ConvertConversionWorkspace", - request_serializer=clouddms.ConvertConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["convert_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/ConvertConversionWorkspace", + request_serializer=clouddms.ConvertConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["convert_conversion_workspace"] @@ -1373,12 +1375,12 @@ def commit_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "commit_conversion_workspace" not in self._stubs: - self._stubs[ - "commit_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/CommitConversionWorkspace", - request_serializer=clouddms.CommitConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["commit_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/CommitConversionWorkspace", + request_serializer=clouddms.CommitConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["commit_conversion_workspace"] @@ -1405,12 +1407,12 @@ def rollback_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_conversion_workspace" not in self._stubs: - self._stubs[ - "rollback_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/RollbackConversionWorkspace", - request_serializer=clouddms.RollbackConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["rollback_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/RollbackConversionWorkspace", + request_serializer=clouddms.RollbackConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["rollback_conversion_workspace"] @@ -1436,12 +1438,12 @@ def apply_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "apply_conversion_workspace" not in self._stubs: - self._stubs[ - "apply_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/ApplyConversionWorkspace", - request_serializer=clouddms.ApplyConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["apply_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/ApplyConversionWorkspace", + request_serializer=clouddms.ApplyConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["apply_conversion_workspace"] @@ -1473,12 +1475,12 @@ def describe_database_entities( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "describe_database_entities" not in self._stubs: - self._stubs[ - "describe_database_entities" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/DescribeDatabaseEntities", - request_serializer=clouddms.DescribeDatabaseEntitiesRequest.serialize, - response_deserializer=clouddms.DescribeDatabaseEntitiesResponse.deserialize, + self._stubs["describe_database_entities"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/DescribeDatabaseEntities", + request_serializer=clouddms.DescribeDatabaseEntitiesRequest.serialize, + response_deserializer=clouddms.DescribeDatabaseEntitiesResponse.deserialize, + ) ) return self._stubs["describe_database_entities"] @@ -1541,12 +1543,12 @@ def describe_conversion_workspace_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "describe_conversion_workspace_revisions" not in self._stubs: - self._stubs[ - "describe_conversion_workspace_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/DescribeConversionWorkspaceRevisions", - request_serializer=clouddms.DescribeConversionWorkspaceRevisionsRequest.serialize, - response_deserializer=clouddms.DescribeConversionWorkspaceRevisionsResponse.deserialize, + self._stubs["describe_conversion_workspace_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/DescribeConversionWorkspaceRevisions", + request_serializer=clouddms.DescribeConversionWorkspaceRevisionsRequest.serialize, + response_deserializer=clouddms.DescribeConversionWorkspaceRevisionsResponse.deserialize, + ) ) return self._stubs["describe_conversion_workspace_revisions"] diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms.py index ffc73a5a3336..f08f6b3d82cc 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms.py @@ -108,6 +108,7 @@ class DatabaseEntityView(proto.Enum): the page_size property of the request is ignored. The returned page will only include the top-most node types. """ + DATABASE_ENTITY_VIEW_UNSPECIFIED = 0 DATABASE_ENTITY_VIEW_BASIC = 1 DATABASE_ENTITY_VIEW_FULL = 2 @@ -195,12 +196,12 @@ class ListMigrationJobsResponse(proto.Message): def raw_page(self): return self - migration_jobs: MutableSequence[ - clouddms_resources.MigrationJob - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=clouddms_resources.MigrationJob, + migration_jobs: MutableSequence[clouddms_resources.MigrationJob] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=clouddms_resources.MigrationJob, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -723,12 +724,12 @@ class ListConnectionProfilesResponse(proto.Message): def raw_page(self): return self - connection_profiles: MutableSequence[ - clouddms_resources.ConnectionProfile - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=clouddms_resources.ConnectionProfile, + connection_profiles: MutableSequence[clouddms_resources.ConnectionProfile] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=clouddms_resources.ConnectionProfile, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1033,12 +1034,12 @@ class ListPrivateConnectionsResponse(proto.Message): def raw_page(self): return self - private_connections: MutableSequence[ - clouddms_resources.PrivateConnection - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=clouddms_resources.PrivateConnection, + private_connections: MutableSequence[clouddms_resources.PrivateConnection] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=clouddms_resources.PrivateConnection, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1529,12 +1530,12 @@ class ListMappingRulesResponse(proto.Message): def raw_page(self): return self - mapping_rules: MutableSequence[ - conversionworkspace_resources.MappingRule - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=conversionworkspace_resources.MappingRule, + mapping_rules: MutableSequence[conversionworkspace_resources.MappingRule] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=conversionworkspace_resources.MappingRule, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1773,6 +1774,7 @@ class DBTreeType(proto.Enum): DESTINATION_TREE (3): The destination database tree. """ + DB_TREE_TYPE_UNSPECIFIED = 0 SOURCE_TREE = 1 DRAFT_TREE = 2 @@ -1831,12 +1833,12 @@ class DescribeDatabaseEntitiesResponse(proto.Message): def raw_page(self): return self - database_entities: MutableSequence[ - conversionworkspace_resources.DatabaseEntity - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=conversionworkspace_resources.DatabaseEntity, + database_entities: MutableSequence[conversionworkspace_resources.DatabaseEntity] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=conversionworkspace_resources.DatabaseEntity, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1895,12 +1897,12 @@ class SearchBackgroundJobsResponse(proto.Message): rules. """ - jobs: MutableSequence[ - conversionworkspace_resources.BackgroundJobLogEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=conversionworkspace_resources.BackgroundJobLogEntry, + jobs: MutableSequence[conversionworkspace_resources.BackgroundJobLogEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=conversionworkspace_resources.BackgroundJobLogEntry, + ) ) @@ -1937,12 +1939,12 @@ class DescribeConversionWorkspaceRevisionsResponse(proto.Message): The list of conversion workspace revisions. """ - revisions: MutableSequence[ - conversionworkspace_resources.ConversionWorkspace - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=conversionworkspace_resources.ConversionWorkspace, + revisions: MutableSequence[conversionworkspace_resources.ConversionWorkspace] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=conversionworkspace_resources.ConversionWorkspace, + ) ) diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms_resources.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms_resources.py index 055ba9ce69b9..857b19c52f6c 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms_resources.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms_resources.py @@ -70,6 +70,7 @@ class NetworkArchitecture(proto.Enum): Instance is in Cloud SQL's new producer network architecture. """ + NETWORK_ARCHITECTURE_UNSPECIFIED = 0 NETWORK_ARCHITECTURE_OLD_CSQL_PRODUCER = 1 NETWORK_ARCHITECTURE_NEW_CSQL_PRODUCER = 2 @@ -89,6 +90,7 @@ class DatabaseEngine(proto.Enum): ORACLE (4): The source engine is Oracle. """ + DATABASE_ENGINE_UNSPECIFIED = 0 MYSQL = 1 POSTGRESQL = 2 @@ -110,6 +112,7 @@ class DatabaseProvider(proto.Enum): ALLOYDB (4): AlloyDB. """ + DATABASE_PROVIDER_UNSPECIFIED = 0 CLOUDSQL = 1 RDS = 2 @@ -154,6 +157,7 @@ class SslType(proto.Enum): Both server ('ca_certificate'), and client ('client_key', 'client_certificate') specified. """ + SSL_TYPE_UNSPECIFIED = 0 SERVER_ONLY = 1 SERVER_CLIENT = 2 @@ -741,6 +745,7 @@ class SqlActivationPolicy(proto.Enum): NEVER (2): The instance should never spin up. """ + SQL_ACTIVATION_POLICY_UNSPECIFIED = 0 ALWAYS = 1 NEVER = 2 @@ -756,6 +761,7 @@ class SqlDataDiskType(proto.Enum): PD_HDD (2): HDD disk. """ + SQL_DATA_DISK_TYPE_UNSPECIFIED = 0 PD_SSD = 1 PD_HDD = 2 @@ -787,6 +793,7 @@ class SqlDatabaseVersion(proto.Enum): POSTGRES_15 (18): PostgreSQL 15. """ + SQL_DATABASE_VERSION_UNSPECIFIED = 0 MYSQL_5_6 = 1 MYSQL_5_7 = 2 @@ -810,6 +817,7 @@ class SqlAvailabilityType(proto.Enum): REGIONAL (2): Regional availability instance. """ + SQL_AVAILABILITY_TYPE_UNSPECIFIED = 0 ZONAL = 1 REGIONAL = 2 @@ -826,6 +834,7 @@ class Edition(proto.Enum): ENTERPRISE_PLUS (3): The instance is an enterprise plus edition. """ + EDITION_UNSPECIFIED = 0 ENTERPRISE = 2 ENTERPRISE_PLUS = 3 @@ -1419,6 +1428,7 @@ class State(proto.Enum): RESUMING (15): The migration job is resuming. """ + STATE_UNSPECIFIED = 0 MAINTENANCE = 1 DRAFT = 2 @@ -1456,6 +1466,7 @@ class Phase(proto.Enum): Only RDS flow - the sources writes stopped, waiting for dump to begin """ + PHASE_UNSPECIFIED = 0 FULL_DUMP = 1 CDC = 2 @@ -1474,6 +1485,7 @@ class Type(proto.Enum): CONTINUOUS (2): The migration job is a continuous migration. """ + TYPE_UNSPECIFIED = 0 ONE_TIME = 1 CONTINUOUS = 2 @@ -1533,6 +1545,7 @@ class DumpParallelLevel(proto.Enum): MAX (3): Maximum parallel level. """ + DUMP_PARALLEL_LEVEL_UNSPECIFIED = 0 MIN = 1 OPTIMAL = 2 @@ -1775,6 +1788,7 @@ class State(proto.Enum): The last action on the connection profile failed. """ + STATE_UNSPECIFIED = 0 DRAFT = 1 CREATING = 2 @@ -1951,6 +1965,7 @@ class ErrorCode(proto.Enum): Insufficient privilege to enable the parallelism configuration. """ + ERROR_CODE_UNSPECIFIED = 0 CONNECTION_FAILURE = 1 AUTHENTICATION_FAILURE = 2 @@ -2054,6 +2069,7 @@ class State(proto.Enum): DELETED (6): The private connection has been deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 CREATED = 2 diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/types/conversionworkspace_resources.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/types/conversionworkspace_resources.py index 1766de3aed07..9708731764fa 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/types/conversionworkspace_resources.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/types/conversionworkspace_resources.py @@ -96,6 +96,7 @@ class ValuePresentInList(proto.Enum): If the source value is not in the supplied list at value_list """ + VALUE_PRESENT_IN_LIST_UNSPECIFIED = 0 VALUE_PRESENT_IN_LIST_IF_VALUE_LIST = 1 VALUE_PRESENT_IN_LIST_IF_VALUE_NOT_LIST = 2 @@ -138,6 +139,7 @@ class DatabaseEntityType(proto.Enum): DATABASE_ENTITY_TYPE_DATABASE (15): Database. """ + DATABASE_ENTITY_TYPE_UNSPECIFIED = 0 DATABASE_ENTITY_TYPE_SCHEMA = 1 DATABASE_ENTITY_TYPE_TABLE = 2 @@ -171,6 +173,7 @@ class EntityNameTransformation(proto.Enum): ENTITY_NAME_TRANSFORMATION_CAPITALIZED_CASE (4): Transform to capitalized case. """ + ENTITY_NAME_TRANSFORMATION_UNSPECIFIED = 0 ENTITY_NAME_TRANSFORMATION_NO_TRANSFORMATION = 1 ENTITY_NAME_TRANSFORMATION_LOWER_CASE = 2 @@ -197,6 +200,7 @@ class BackgroundJobType(proto.Enum): an external source such as an ora2pg config file. """ + BACKGROUND_JOB_TYPE_UNSPECIFIED = 0 BACKGROUND_JOB_TYPE_SOURCE_SEED = 1 BACKGROUND_JOB_TYPE_CONVERT = 2 @@ -215,6 +219,7 @@ class ImportRulesFileFormat(proto.Enum): IMPORT_RULES_FILE_FORMAT_ORATOPG_CONFIG_FILE (2): Ora2Pg configuration file. """ + IMPORT_RULES_FILE_FORMAT_UNSPECIFIED = 0 IMPORT_RULES_FILE_FORMAT_HARBOUR_BRIDGE_SESSION_FILE = 1 IMPORT_RULES_FILE_FORMAT_ORATOPG_CONFIG_FILE = 2 @@ -238,6 +243,7 @@ class ValueComparison(proto.Enum): Value is larger or equal than the Compare value. """ + VALUE_COMPARISON_UNSPECIFIED = 0 VALUE_COMPARISON_IF_VALUE_SMALLER_THAN = 1 VALUE_COMPARISON_IF_VALUE_SMALLER_EQUAL_THAN = 2 @@ -265,6 +271,7 @@ class NumericFilterOption(proto.Enum): numeric columns with no precision and scale specified. """ + NUMERIC_FILTER_OPTION_UNSPECIFIED = 0 NUMERIC_FILTER_OPTION_ALL = 1 NUMERIC_FILTER_OPTION_LIMIT = 2 @@ -441,6 +448,7 @@ class JobCompletionState(proto.Enum): FAILED (2): Error. """ + JOB_COMPLETION_STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -743,6 +751,7 @@ class State(proto.Enum): DELETED (3): The rule is logically deleted. """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -1765,6 +1774,7 @@ class TreeType(proto.Enum): Tree of entities observed on the destination database. """ + TREE_TYPE_UNSPECIFIED = 0 SOURCE = 1 DRAFT = 2 @@ -2626,6 +2636,7 @@ class IssueType(proto.Enum): ISSUE_TYPE_CONVERT (3): Issue originated during the convert process """ + ISSUE_TYPE_UNSPECIFIED = 0 ISSUE_TYPE_DDL = 1 ISSUE_TYPE_APPLY = 2 @@ -2644,6 +2655,7 @@ class IssueSeverity(proto.Enum): ISSUE_SEVERITY_ERROR (3): Error """ + ISSUE_SEVERITY_UNSPECIFIED = 0 ISSUE_SEVERITY_INFO = 1 ISSUE_SEVERITY_WARNING = 2 diff --git a/packages/google-cloud-dms/mypy.ini b/packages/google-cloud-dms/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-dms/mypy.ini +++ b/packages/google-cloud-dms/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-dms/noxfile.py b/packages/google-cloud-dms/noxfile.py index b58032abb1f8..9fb69017e28f 100644 --- a/packages/google-cloud-dms/noxfile.py +++ b/packages/google-cloud-dms/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dms/tests/unit/gapic/clouddms_v1/test_data_migration_service.py b/packages/google-cloud-dms/tests/unit/gapic/clouddms_v1/test_data_migration_service.py index 99486ea15ea2..94530a177fbd 100644 --- a/packages/google-cloud-dms/tests/unit/gapic/clouddms_v1/test_data_migration_service.py +++ b/packages/google-cloud-dms/tests/unit/gapic/clouddms_v1/test_data_migration_service.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +40,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,27 +60,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.clouddms_v1.services.data_migration_service import ( DataMigrationServiceAsyncClient, @@ -985,10 +988,9 @@ def test_data_migration_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1035,9 @@ def test_data_migration_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1072,10 +1073,9 @@ def test_data_migration_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1324,9 +1324,7 @@ def test_data_migration_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1447,9 +1445,9 @@ def test_list_migration_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_migration_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_migration_jobs] = ( + mock_rpc + ) request = {} client.list_migration_jobs(request) @@ -2008,9 +2006,9 @@ def test_get_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_migration_job] = ( + mock_rpc + ) request = {} client.get_migration_job(request) @@ -2368,9 +2366,9 @@ def test_create_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_migration_job] = ( + mock_rpc + ) request = {} client.create_migration_job(request) @@ -2733,9 +2731,9 @@ def test_update_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_migration_job] = ( + mock_rpc + ) request = {} client.update_migration_job(request) @@ -3090,9 +3088,9 @@ def test_delete_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_migration_job] = ( + mock_rpc + ) request = {} client.delete_migration_job(request) @@ -3435,9 +3433,9 @@ def test_start_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_migration_job] = ( + mock_rpc + ) request = {} client.start_migration_job(request) @@ -3694,9 +3692,9 @@ def test_stop_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_migration_job] = ( + mock_rpc + ) request = {} client.stop_migration_job(request) @@ -3953,9 +3951,9 @@ def test_resume_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_migration_job] = ( + mock_rpc + ) request = {} client.resume_migration_job(request) @@ -4213,9 +4211,9 @@ def test_promote_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.promote_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.promote_migration_job] = ( + mock_rpc + ) request = {} client.promote_migration_job(request) @@ -4472,9 +4470,9 @@ def test_verify_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.verify_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.verify_migration_job] = ( + mock_rpc + ) request = {} client.verify_migration_job(request) @@ -4732,9 +4730,9 @@ def test_restart_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_migration_job] = ( + mock_rpc + ) request = {} client.restart_migration_job(request) @@ -4996,9 +4994,9 @@ def test_generate_ssh_script_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_ssh_script - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_ssh_script] = ( + mock_rpc + ) request = {} client.generate_ssh_script(request) @@ -6078,9 +6076,9 @@ def test_get_connection_profile_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_profile] = ( + mock_rpc + ) request = {} client.get_connection_profile(request) @@ -7878,9 +7876,9 @@ def test_get_private_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_private_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_private_connection] = ( + mock_rpc + ) request = {} client.get_private_connection(request) @@ -11155,9 +11153,9 @@ def test_create_mapping_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_mapping_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_mapping_rule] = ( + mock_rpc + ) request = {} client.create_mapping_rule(request) @@ -11528,9 +11526,9 @@ def test_delete_mapping_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_mapping_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_mapping_rule] = ( + mock_rpc + ) request = {} client.delete_mapping_rule(request) @@ -11862,9 +11860,9 @@ def test_list_mapping_rules_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_mapping_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_mapping_rules] = ( + mock_rpc + ) request = {} client.list_mapping_rules(request) @@ -12416,9 +12414,9 @@ def test_get_mapping_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_mapping_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_mapping_rule] = ( + mock_rpc + ) request = {} client.get_mapping_rule(request) @@ -13022,9 +13020,9 @@ def test_import_mapping_rules_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_mapping_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_mapping_rules] = ( + mock_rpc + ) request = {} client.import_mapping_rules(request) @@ -14806,9 +14804,9 @@ def test_search_background_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_background_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_background_jobs] = ( + mock_rpc + ) request = {} client.search_background_jobs(request) @@ -15309,9 +15307,9 @@ def test_fetch_static_ips_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_static_ips - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_static_ips] = ( + mock_rpc + ) request = {} client.fetch_static_ips(request) diff --git a/packages/google-cloud-documentai/CHANGELOG.md b/packages/google-cloud-documentai/CHANGELOG.md index c3648dd9eeb7..8359e82b75a2 100644 --- a/packages/google-cloud-documentai/CHANGELOG.md +++ b/packages/google-cloud-documentai/CHANGELOG.md @@ -4,6 +4,29 @@ [1]: https://pypi.org/project/google-cloud-documentai/#history +## [3.10.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-documentai-v3.9.0...google-cloud-documentai-v3.10.0) (2026-02-12) + + +### Documentation + +* Updated comments for various fields and messages ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) + + +### Features + +* The method `ReviewDocument` in `.google.cloud.documentai.v1beta3.DocumentProcessorService` is deprecated ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A new field `enable_table_split` is added to message `.google.cloud.documentai.v1beta3.OcrConfig.LayoutParsingParams` ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* Added new messages `Documents` and `RawDocuments` for inline document input ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* The field `skip_human_review` in messages `.google.cloud.documentai.v1beta3.ProcessRequest` and `.google.cloud.documentai.v1beta3.BatchProcessRequest` is deprecated ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A new field `document_prompt` is added to message `.google.cloud.documentai.v1beta3.DocumentSchema` ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A new field `revisions` is added to message `.google.cloud.documentai.v1beta3.Evaluation` ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) +* A new field `document_type` is added to message `.google.cloud.documentai.v1beta3.ImportDocumentsRequest` ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) + + +### Bug Fixes + +* Removed the `SpannerIndexingConfig` message and the `spanner_indexing_config` field from `.google.cloud.documentai.v1beta3.Dataset` BREAKING CHANGE: The `SpannerIndexingConfig` message and the `spanner_indexing_config` field within the `Dataset` message have been removed. Client code referencing these will need to stop referencing these in case of an error ([5371e8e931dfba1d504ac2ffbd48a7f4abdcc158](https://github.com/googleapis/google-cloud-python/commit/5371e8e931dfba1d504ac2ffbd48a7f4abdcc158)) + ## [3.9.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-documentai-v3.8.0...google-cloud-documentai-v3.9.0) (2026-01-29) diff --git a/packages/google-cloud-documentai/google/cloud/documentai/gapic_version.py b/packages/google-cloud-documentai/google/cloud/documentai/gapic_version.py index 0d5599e8b4e7..af050a89f393 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai/gapic_version.py +++ b/packages/google-cloud-documentai/google/cloud/documentai/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "3.9.0" # {x-release-please-version} +__version__ = "3.10.0" # {x-release-please-version} diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/__init__.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/__init__.py index 19ade4249daa..a3760bdf5739 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/__init__.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.document_processor_service import ( DocumentProcessorServiceAsyncClient, DocumentProcessorServiceClient, diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/gapic_version.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/gapic_version.py index 0d5599e8b4e7..af050a89f393 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/gapic_version.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "3.9.0" # {x-release-please-version} +__version__ = "3.10.0" # {x-release-please-version} diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/async_client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/async_client.py index df52d1ff80a9..8dbc2c825e97 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/async_client.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1 import gapic_version as package_version @@ -47,10 +47,10 @@ import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.documentai_v1.services.document_processor_service import pagers from google.cloud.documentai_v1.types import ( @@ -58,10 +58,10 @@ document_processor_service, document_schema, evaluation, + processor, + processor_type, ) -from google.cloud.documentai_v1.types import processor from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type from .client import DocumentProcessorServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport @@ -164,7 +164,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentProcessorServiceAsyncClient: The constructed client. """ - return DocumentProcessorServiceClient.from_service_account_info.__func__(DocumentProcessorServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DocumentProcessorServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DocumentProcessorServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -180,7 +183,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentProcessorServiceAsyncClient: The constructed client. """ - return DocumentProcessorServiceClient.from_service_account_file.__func__(DocumentProcessorServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DocumentProcessorServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + DocumentProcessorServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -218,7 +226,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DocumentProcessorServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DocumentProcessorServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DocumentProcessorServiceTransport: diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/client.py index dc315936387c..e02297803068 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/client.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1 import gapic_version as package_version @@ -64,10 +64,10 @@ import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.documentai_v1.services.document_processor_service import pagers from google.cloud.documentai_v1.types import ( @@ -75,10 +75,10 @@ document_processor_service, document_schema, evaluation, + processor, + processor_type, ) -from google.cloud.documentai_v1.types import processor from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type from .transports.base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport from .transports.grpc import DocumentProcessorServiceGrpcTransport @@ -94,9 +94,7 @@ class DocumentProcessorServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentProcessorServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentProcessorServiceTransport]] _transport_registry["grpc"] = DocumentProcessorServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentProcessorServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentProcessorServiceRestTransport @@ -741,11 +739,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentProcessorServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentProcessorServiceClient._read_environment_variables() + ) self._client_cert_source = ( DocumentProcessorServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -782,8 +778,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentProcessorServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/pagers.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/pagers.py index f3513e10da6b..315003c3c809 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/pagers.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -150,7 +150,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -310,7 +310,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -392,7 +392,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -472,7 +472,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -554,7 +554,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -632,7 +632,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/__init__.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/__init__.py index 8ac84e5a7497..5db56eee3bb4 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/__init__.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DocumentProcessorServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DocumentProcessorServiceTransport]] _transport_registry["grpc"] = DocumentProcessorServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentProcessorServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentProcessorServiceRestTransport diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/base.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/base.py index 11f20cc9953a..c8333ff2858e 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/base.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/base.py @@ -17,21 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1 import gapic_version as package_version -from google.cloud.documentai_v1.types import document_processor_service, evaluation -from google.cloud.documentai_v1.types import processor +from google.cloud.documentai_v1.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -563,7 +566,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc.py index 97fd6f9aca7d..91d82f296485 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc.py @@ -16,24 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.documentai_v1.types import document_processor_service, evaluation -from google.cloud.documentai_v1.types import processor +from google.cloud.documentai_v1.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type from .base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport @@ -721,12 +724,12 @@ def undeploy_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_processor_version" not in self._stubs: - self._stubs[ - "undeploy_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1.DocumentProcessorService/UndeployProcessorVersion", - request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["undeploy_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1.DocumentProcessorService/UndeployProcessorVersion", + request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["undeploy_processor_version"] @@ -878,12 +881,12 @@ def set_default_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_default_processor_version" not in self._stubs: - self._stubs[ - "set_default_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1.DocumentProcessorService/SetDefaultProcessorVersion", - request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_default_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1.DocumentProcessorService/SetDefaultProcessorVersion", + request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_default_processor_version"] @@ -939,12 +942,12 @@ def evaluate_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "evaluate_processor_version" not in self._stubs: - self._stubs[ - "evaluate_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1.DocumentProcessorService/EvaluateProcessorVersion", - request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["evaluate_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1.DocumentProcessorService/EvaluateProcessorVersion", + request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["evaluate_processor_version"] diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc_asyncio.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc_asyncio.py index 14b72584dbea..abaeefc3d12d 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,15 +31,15 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.documentai_v1.types import document_processor_service, evaluation -from google.cloud.documentai_v1.types import processor +from google.cloud.documentai_v1.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type from .base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport from .grpc import DocumentProcessorServiceGrpcTransport @@ -730,12 +733,12 @@ def undeploy_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_processor_version" not in self._stubs: - self._stubs[ - "undeploy_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1.DocumentProcessorService/UndeployProcessorVersion", - request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["undeploy_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1.DocumentProcessorService/UndeployProcessorVersion", + request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["undeploy_processor_version"] @@ -891,12 +894,12 @@ def set_default_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_default_processor_version" not in self._stubs: - self._stubs[ - "set_default_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1.DocumentProcessorService/SetDefaultProcessorVersion", - request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_default_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1.DocumentProcessorService/SetDefaultProcessorVersion", + request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_default_processor_version"] @@ -953,12 +956,12 @@ def evaluate_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "evaluate_processor_version" not in self._stubs: - self._stubs[ - "evaluate_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1.DocumentProcessorService/EvaluateProcessorVersion", - request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["evaluate_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1.DocumentProcessorService/EvaluateProcessorVersion", + request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["evaluate_processor_version"] diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest.py index fad2aca5d408..bfeee2803f67 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest.py @@ -16,24 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.documentai_v1.types import document_processor_service, evaluation -from google.cloud.documentai_v1.types import processor +from google.cloud.documentai_v1.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDocumentProcessorServiceRestTransport @@ -1691,9 +1694,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseBatchProcessDocuments._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseBatchProcessDocuments._get_http_options() request, metadata = self._interceptor.pre_batch_process_documents( request, metadata @@ -1851,9 +1852,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseCreateProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseCreateProcessor._get_http_options() request, metadata = self._interceptor.pre_create_processor( request, metadata @@ -2010,9 +2009,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessor._get_http_options() request, metadata = self._interceptor.pre_delete_processor( request, metadata @@ -2162,9 +2159,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_delete_processor_version( request, metadata @@ -2313,9 +2308,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDeployProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDeployProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_deploy_processor_version( request, metadata @@ -2469,9 +2462,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDisableProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDisableProcessor._get_http_options() request, metadata = self._interceptor.pre_disable_processor( request, metadata @@ -2627,9 +2618,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseEnableProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseEnableProcessor._get_http_options() request, metadata = self._interceptor.pre_enable_processor( request, metadata @@ -2788,9 +2777,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseEvaluateProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseEvaluateProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_evaluate_processor_version( request, metadata @@ -2944,9 +2931,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseFetchProcessorTypes._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseFetchProcessorTypes._get_http_options() request, metadata = self._interceptor.pre_fetch_processor_types( request, metadata @@ -3097,9 +3082,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetEvaluation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_evaluation(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetEvaluation._get_transcoded_request( @@ -3250,9 +3233,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessor._get_http_options() request, metadata = self._interceptor.pre_get_processor(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessor._get_transcoded_request( @@ -3403,9 +3384,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorType._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorType._get_http_options() request, metadata = self._interceptor.pre_get_processor_type( request, metadata @@ -3562,9 +3541,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_get_processor_version( request, metadata @@ -3710,9 +3687,7 @@ def __call__( The response from ``ListEvaluations``. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListEvaluations._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListEvaluations._get_http_options() request, metadata = self._interceptor.pre_list_evaluations( request, metadata @@ -3867,9 +3842,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListProcessors._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListProcessors._get_http_options() request, metadata = self._interceptor.pre_list_processors(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseListProcessors._get_transcoded_request( @@ -4024,9 +3997,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListProcessorTypes._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListProcessorTypes._get_http_options() request, metadata = self._interceptor.pre_list_processor_types( request, metadata @@ -4182,9 +4153,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListProcessorVersions._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListProcessorVersions._get_http_options() request, metadata = self._interceptor.pre_list_processor_versions( request, metadata @@ -4337,9 +4306,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseProcessDocument._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseProcessDocument._get_http_options() request, metadata = self._interceptor.pre_process_document( request, metadata @@ -4499,9 +4466,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseReviewDocument._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseReviewDocument._get_http_options() request, metadata = self._interceptor.pre_review_document(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseReviewDocument._get_transcoded_request( @@ -4658,9 +4623,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseSetDefaultProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseSetDefaultProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_set_default_processor_version( request, metadata @@ -4727,11 +4690,10 @@ def __call__( resp = self._interceptor.post_set_default_processor_version(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_default_processor_version_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_default_processor_version_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4817,9 +4779,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseTrainProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseTrainProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_train_processor_version( request, metadata @@ -4976,9 +4936,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseUndeployProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseUndeployProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_undeploy_processor_version( request, metadata @@ -5110,7 +5068,9 @@ def delete_processor_version( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def deploy_processor_version( @@ -5121,7 +5081,9 @@ def deploy_processor_version( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeployProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._DeployProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def disable_processor( @@ -5152,7 +5114,9 @@ def evaluate_processor_version( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._EvaluateProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._EvaluateProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_processor_types( @@ -5281,7 +5245,9 @@ def set_default_processor_version( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetDefaultProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._SetDefaultProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def train_processor_version( @@ -5303,7 +5269,9 @@ def undeploy_processor_version( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UndeployProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._UndeployProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -5363,9 +5331,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -5504,9 +5470,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -5644,9 +5608,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -5764,9 +5726,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -5907,9 +5867,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest_base.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest_base.py index 9a23a0f74e6e..8b8b9985aa9c 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest_base.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest_base.py @@ -22,10 +22,13 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.documentai_v1.types import document_processor_service, evaluation -from google.cloud.documentai_v1.types import processor +from google.cloud.documentai_v1.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type from .base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/__init__.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/__init__.py index bcc7448d4719..690771ae6bf0 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/__init__.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/__init__.py @@ -13,8 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .barcode import Barcode -from .document import Document +from .barcode import ( + Barcode, +) +from .document import ( + Document, +) from .document_io import ( BatchDocumentsInputConfig, DocumentOutputConfig, @@ -76,12 +80,29 @@ UndeployProcessorVersionRequest, UndeployProcessorVersionResponse, ) -from .document_schema import DocumentSchema -from .evaluation import Evaluation, EvaluationReference -from .geometry import BoundingPoly, NormalizedVertex, Vertex -from .operation_metadata import CommonOperationMetadata -from .processor import Processor, ProcessorVersion, ProcessorVersionAlias -from .processor_type import ProcessorType +from .document_schema import ( + DocumentSchema, +) +from .evaluation import ( + Evaluation, + EvaluationReference, +) +from .geometry import ( + BoundingPoly, + NormalizedVertex, + Vertex, +) +from .operation_metadata import ( + CommonOperationMetadata, +) +from .processor import ( + Processor, + ProcessorVersion, + ProcessorVersionAlias, +) +from .processor_type import ( + ProcessorType, +) __all__ = ( "Barcode", diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document.py index a7d404bddb71..5a3b31baefde 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document.py @@ -445,6 +445,7 @@ class Orientation(proto.Enum): Turn the head 90 degrees counterclockwise from upright to read. """ + ORIENTATION_UNSPECIFIED = 0 PAGE_UP = 1 PAGE_RIGHT = 2 @@ -491,12 +492,12 @@ class Block(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -525,12 +526,12 @@ class Paragraph(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -559,12 +560,12 @@ class Line(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -614,6 +615,7 @@ class Type(proto.Enum): A hyphen that indicates that a token has been split across lines. """ + TYPE_UNSPECIFIED = 0 SPACE = 1 WIDE_SPACE = 2 @@ -744,12 +746,12 @@ class StyleInfo(proto.Message): number=2, message="Document.Page.Token.DetectedBreak", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -780,12 +782,12 @@ class Symbol(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) class VisualElement(proto.Message): @@ -814,12 +816,12 @@ class VisualElement(proto.Message): proto.STRING, number=2, ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="Document.Page.DetectedLanguage", + ) ) class Table(proto.Message): @@ -848,12 +850,12 @@ class TableRow(proto.Message): Cells that make up this row. """ - cells: MutableSequence[ - "Document.Page.Table.TableCell" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.Page.Table.TableCell", + cells: MutableSequence["Document.Page.Table.TableCell"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.Page.Table.TableCell", + ) ) class TableCell(proto.Message): @@ -899,26 +901,26 @@ class TableCell(proto.Message): number=1, message="Document.Page.Layout", ) - header_rows: MutableSequence[ - "Document.Page.Table.TableRow" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.Table.TableRow", + header_rows: MutableSequence["Document.Page.Table.TableRow"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.Table.TableRow", + ) ) - body_rows: MutableSequence[ - "Document.Page.Table.TableRow" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="Document.Page.Table.TableRow", + body_rows: MutableSequence["Document.Page.Table.TableRow"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="Document.Page.Table.TableRow", + ) ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -1131,12 +1133,12 @@ class DetectedDefect(proto.Message): number=3, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Document.Page.DetectedLanguage", + ) ) blocks: MutableSequence["Document.Page.Block"] = proto.RepeatedField( proto.MESSAGE, @@ -1158,12 +1160,12 @@ class DetectedDefect(proto.Message): number=8, message="Document.Page.Token", ) - visual_elements: MutableSequence[ - "Document.Page.VisualElement" - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message="Document.Page.VisualElement", + visual_elements: MutableSequence["Document.Page.VisualElement"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message="Document.Page.VisualElement", + ) ) tables: MutableSequence["Document.Page.Table"] = proto.RepeatedField( proto.MESSAGE, @@ -1180,12 +1182,12 @@ class DetectedDefect(proto.Message): number=12, message="Document.Page.Symbol", ) - detected_barcodes: MutableSequence[ - "Document.Page.DetectedBarcode" - ] = proto.RepeatedField( - proto.MESSAGE, - number=15, - message="Document.Page.DetectedBarcode", + detected_barcodes: MutableSequence["Document.Page.DetectedBarcode"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=15, + message="Document.Page.DetectedBarcode", + ) ) image_quality_scores: "Document.Page.ImageQualityScores" = proto.Field( proto.MESSAGE, @@ -1260,6 +1262,7 @@ class Method(proto.Enum): inference and is not necessarily an exact text extraction from the document. """ + METHOD_UNSPECIFIED = 0 EXTRACT = 1 DERIVE = 2 @@ -1502,12 +1505,12 @@ class TextSegment(proto.Message): number=2, ) - text_segments: MutableSequence[ - "Document.TextAnchor.TextSegment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.TextAnchor.TextSegment", + text_segments: MutableSequence["Document.TextAnchor.TextSegment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.TextAnchor.TextSegment", + ) ) content: str = proto.Field( proto.STRING, @@ -1591,6 +1594,7 @@ class LayoutType(proto.Enum): [Page.form_fields][google.cloud.documentai.v1.Document.Page.form_fields] element. """ + LAYOUT_TYPE_UNSPECIFIED = 0 BLOCK = 1 PARAGRAPH = 2 @@ -1680,6 +1684,7 @@ class OperationType(proto.Enum): Deprecated. Element is skipped in the validation process. """ + OPERATION_TYPE_UNSPECIFIED = 0 ADD = 1 REMOVE = 2 @@ -2111,12 +2116,12 @@ class LayoutListEntry(proto.Message): message=geometry.BoundingPoly, ) - blocks: MutableSequence[ - "Document.DocumentLayout.DocumentLayoutBlock" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.DocumentLayout.DocumentLayoutBlock", + blocks: MutableSequence["Document.DocumentLayout.DocumentLayoutBlock"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.DocumentLayout.DocumentLayoutBlock", + ) ) class ChunkedDocument(proto.Message): @@ -2285,6 +2290,7 @@ class ValidationResultType(proto.Enum): VALIDATION_RESULT_TYPE_NOT_APPLICABLE (4): The validation is not applicable. """ + VALIDATION_RESULT_TYPE_UNSPECIFIED = 0 VALIDATION_RESULT_TYPE_VALID = 1 VALIDATION_RESULT_TYPE_INVALID = 2 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_processor_service.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_processor_service.py index 346616768c8c..c57eed75ed3d 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_processor_service.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_processor_service.py @@ -22,13 +22,15 @@ import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore -from google.cloud.documentai_v1.types import document_schema as gcd_document_schema from google.cloud.documentai_v1.types import document as gcd_document -from google.cloud.documentai_v1.types import document_io +from google.cloud.documentai_v1.types import ( + document_io, + operation_metadata, + processor_type, +) +from google.cloud.documentai_v1.types import document_schema as gcd_document_schema from google.cloud.documentai_v1.types import evaluation as gcd_evaluation -from google.cloud.documentai_v1.types import operation_metadata from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type __protobuf__ = proto.module( package="google.cloud.documentai.v1", @@ -376,6 +378,7 @@ class State(proto.Enum): [state_message][google.cloud.documentai.v1.HumanReviewStatus.state_message] for details. """ + STATE_UNSPECIFIED = 0 SKIPPED = 1 VALIDATION_PASSED = 2 @@ -537,6 +540,7 @@ class State(proto.Enum): FAILED (6): The batch processing has failed. """ + STATE_UNSPECIFIED = 0 WAITING = 1 RUNNING = 2 @@ -604,12 +608,12 @@ class IndividualProcessStatus(proto.Message): number=4, message=timestamp_pb2.Timestamp, ) - individual_process_statuses: MutableSequence[ - IndividualProcessStatus - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=IndividualProcessStatus, + individual_process_statuses: MutableSequence[IndividualProcessStatus] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=IndividualProcessStatus, + ) ) @@ -641,12 +645,12 @@ class FetchProcessorTypesResponse(proto.Message): The list of processor types. """ - processor_types: MutableSequence[ - processor_type.ProcessorType - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=processor_type.ProcessorType, + processor_types: MutableSequence[processor_type.ProcessorType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=processor_type.ProcessorType, + ) ) @@ -700,12 +704,12 @@ class ListProcessorTypesResponse(proto.Message): def raw_page(self): return self - processor_types: MutableSequence[ - processor_type.ProcessorType - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=processor_type.ProcessorType, + processor_types: MutableSequence[processor_type.ProcessorType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=processor_type.ProcessorType, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -873,12 +877,12 @@ class ListProcessorVersionsResponse(proto.Message): def raw_page(self): return self - processor_versions: MutableSequence[ - gcd_processor.ProcessorVersion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_processor.ProcessorVersion, + processor_versions: MutableSequence[gcd_processor.ProcessorVersion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_processor.ProcessorVersion, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1304,6 +1308,7 @@ class TrainingMethod(proto.Enum): TEMPLATE_BASED (2): No description available. """ + TRAINING_METHOD_UNSPECIFIED = 0 MODEL_BASED = 1 TEMPLATE_BASED = 2 @@ -1500,6 +1505,7 @@ class Priority(proto.Enum): urgent task queue to respect this priority level. """ + DEFAULT = 0 URGENT = 1 @@ -1558,6 +1564,7 @@ class State(proto.Enum): SUCCEEDED (2): The review operation is succeeded. """ + STATE_UNSPECIFIED = 0 REJECTED = 1 SUCCEEDED = 2 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_schema.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_schema.py index e4f9612df8f6..b74f420b2a83 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_schema.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_schema.py @@ -150,6 +150,7 @@ class OccurrenceType(proto.Enum): The entity type will appear once or more times. """ + OCCURRENCE_TYPE_UNSPECIFIED = 0 OPTIONAL_ONCE = 1 OPTIONAL_MULTIPLE = 2 @@ -171,6 +172,7 @@ class Method(proto.Enum): inference and is not necessarily an exact text extraction from the document. """ + METHOD_UNSPECIFIED = 0 EXTRACT = 1 DERIVE = 2 @@ -218,12 +220,12 @@ class Method(proto.Enum): proto.STRING, number=2, ) - properties: MutableSequence[ - "DocumentSchema.EntityType.Property" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="DocumentSchema.EntityType.Property", + properties: MutableSequence["DocumentSchema.EntityType.Property"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="DocumentSchema.EntityType.Property", + ) ) class Metadata(proto.Message): diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/evaluation.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/evaluation.py index 90bfe9f50cea..ca1e248776ee 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/evaluation.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/evaluation.py @@ -270,6 +270,7 @@ class MetricsType(proto.Enum): parent (i.e., non-leaf) entity types are an aggregate of metrics for their children. """ + METRICS_TYPE_UNSPECIFIED = 0 AGGREGATE = 1 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/operation_metadata.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/operation_metadata.py index 515b283e4df2..0e43a351b058 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/operation_metadata.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/operation_metadata.py @@ -62,6 +62,7 @@ class State(proto.Enum): CANCELLED (5): Operation is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 CANCELLING = 2 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/processor.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/processor.py index 76d5c00813a2..1afcccbe316b 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/processor.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/processor.py @@ -110,6 +110,7 @@ class State(proto.Enum): IMPORTING (8): The processor version is being imported. """ + STATE_UNSPECIFIED = 0 DEPLOYED = 1 DEPLOYING = 2 @@ -133,6 +134,7 @@ class ModelType(proto.Enum): MODEL_TYPE_CUSTOM (2): The processor version has custom model type. """ + MODEL_TYPE_UNSPECIFIED = 0 MODEL_TYPE_GENERATIVE = 1 MODEL_TYPE_CUSTOM = 2 @@ -229,6 +231,7 @@ class CustomModelType(proto.Enum): FINE_TUNED (2): The model is a finetuned foundation model. """ + CUSTOM_MODEL_TYPE_UNSPECIFIED = 0 VERSIONED_FOUNDATION = 1 FINE_TUNED = 2 @@ -417,6 +420,7 @@ class State(proto.Enum): The processor is being deleted, will be removed if successful. """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -447,12 +451,12 @@ class State(proto.Enum): proto.STRING, number=9, ) - processor_version_aliases: MutableSequence[ - "ProcessorVersionAlias" - ] = proto.RepeatedField( - proto.MESSAGE, - number=10, - message="ProcessorVersionAlias", + processor_version_aliases: MutableSequence["ProcessorVersionAlias"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=10, + message="ProcessorVersionAlias", + ) ) process_endpoint: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/__init__.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/__init__.py index 6eb982b2233e..dd35675ee5ed 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/__init__.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.document_processor_service import ( DocumentProcessorServiceAsyncClient, DocumentProcessorServiceClient, diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/gapic_version.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/gapic_version.py index 0d5599e8b4e7..af050a89f393 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/gapic_version.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "3.9.0" # {x-release-please-version} +__version__ = "3.10.0" # {x-release-please-version} diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/async_client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/async_client.py index 96aa0549d883..d0364e91b20a 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/async_client.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1beta3 import gapic_version as package_version @@ -48,10 +48,10 @@ import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.documentai_v1beta3.services.document_processor_service import pagers from google.cloud.documentai_v1beta3.types import ( @@ -59,10 +59,10 @@ document_processor_service, document_schema, evaluation, + processor, + processor_type, ) -from google.cloud.documentai_v1beta3.types import processor from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type from .client import DocumentProcessorServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport @@ -165,7 +165,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentProcessorServiceAsyncClient: The constructed client. """ - return DocumentProcessorServiceClient.from_service_account_info.__func__(DocumentProcessorServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DocumentProcessorServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DocumentProcessorServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -181,7 +184,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentProcessorServiceAsyncClient: The constructed client. """ - return DocumentProcessorServiceClient.from_service_account_file.__func__(DocumentProcessorServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DocumentProcessorServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + DocumentProcessorServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -219,7 +227,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DocumentProcessorServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DocumentProcessorServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DocumentProcessorServiceTransport: diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/client.py index 7d96fe02ab94..e912ae98dd8d 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/client.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1beta3 import gapic_version as package_version @@ -64,10 +64,10 @@ import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.documentai_v1beta3.services.document_processor_service import pagers from google.cloud.documentai_v1beta3.types import ( @@ -75,10 +75,10 @@ document_processor_service, document_schema, evaluation, + processor, + processor_type, ) -from google.cloud.documentai_v1beta3.types import processor from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type from .transports.base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport from .transports.grpc import DocumentProcessorServiceGrpcTransport @@ -94,9 +94,7 @@ class DocumentProcessorServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentProcessorServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentProcessorServiceTransport]] _transport_registry["grpc"] = DocumentProcessorServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentProcessorServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentProcessorServiceRestTransport @@ -741,11 +739,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentProcessorServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentProcessorServiceClient._read_environment_variables() + ) self._client_cert_source = ( DocumentProcessorServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -782,8 +778,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentProcessorServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/pagers.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/pagers.py index 2830c8439f85..aa1fd3e3b349 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/pagers.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -150,7 +150,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -310,7 +310,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -392,7 +392,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -472,7 +472,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -554,7 +554,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -632,7 +632,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/__init__.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/__init__.py index 8ac84e5a7497..5db56eee3bb4 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/__init__.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DocumentProcessorServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DocumentProcessorServiceTransport]] _transport_registry["grpc"] = DocumentProcessorServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentProcessorServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentProcessorServiceRestTransport diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/base.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/base.py index d95f87060838..08003b58a4f4 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/base.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/base.py @@ -17,21 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1beta3 import gapic_version as package_version -from google.cloud.documentai_v1beta3.types import document_processor_service, evaluation -from google.cloud.documentai_v1beta3.types import processor +from google.cloud.documentai_v1beta3.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -577,7 +580,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc.py index ca6b3abb8e36..b6c949a525f0 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc.py @@ -16,24 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.documentai_v1beta3.types import document_processor_service, evaluation -from google.cloud.documentai_v1beta3.types import processor +from google.cloud.documentai_v1beta3.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type from .base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport @@ -721,12 +724,12 @@ def undeploy_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_processor_version" not in self._stubs: - self._stubs[ - "undeploy_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1beta3.DocumentProcessorService/UndeployProcessorVersion", - request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["undeploy_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1beta3.DocumentProcessorService/UndeployProcessorVersion", + request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["undeploy_processor_version"] @@ -878,12 +881,12 @@ def set_default_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_default_processor_version" not in self._stubs: - self._stubs[ - "set_default_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1beta3.DocumentProcessorService/SetDefaultProcessorVersion", - request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_default_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1beta3.DocumentProcessorService/SetDefaultProcessorVersion", + request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_default_processor_version"] @@ -939,12 +942,12 @@ def evaluate_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "evaluate_processor_version" not in self._stubs: - self._stubs[ - "evaluate_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1beta3.DocumentProcessorService/EvaluateProcessorVersion", - request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["evaluate_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1beta3.DocumentProcessorService/EvaluateProcessorVersion", + request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["evaluate_processor_version"] diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc_asyncio.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc_asyncio.py index a820eddbc0b5..c194639a1c78 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,15 +31,15 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.documentai_v1beta3.types import document_processor_service, evaluation -from google.cloud.documentai_v1beta3.types import processor +from google.cloud.documentai_v1beta3.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type from .base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport from .grpc import DocumentProcessorServiceGrpcTransport @@ -730,12 +733,12 @@ def undeploy_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_processor_version" not in self._stubs: - self._stubs[ - "undeploy_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1beta3.DocumentProcessorService/UndeployProcessorVersion", - request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["undeploy_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1beta3.DocumentProcessorService/UndeployProcessorVersion", + request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["undeploy_processor_version"] @@ -891,12 +894,12 @@ def set_default_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_default_processor_version" not in self._stubs: - self._stubs[ - "set_default_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1beta3.DocumentProcessorService/SetDefaultProcessorVersion", - request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_default_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1beta3.DocumentProcessorService/SetDefaultProcessorVersion", + request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_default_processor_version"] @@ -953,12 +956,12 @@ def evaluate_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "evaluate_processor_version" not in self._stubs: - self._stubs[ - "evaluate_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1beta3.DocumentProcessorService/EvaluateProcessorVersion", - request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["evaluate_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1beta3.DocumentProcessorService/EvaluateProcessorVersion", + request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["evaluate_processor_version"] diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest.py index 0036b4de515f..f9fba6e8fdc8 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest.py @@ -16,24 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.documentai_v1beta3.types import document_processor_service, evaluation -from google.cloud.documentai_v1beta3.types import processor +from google.cloud.documentai_v1beta3.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDocumentProcessorServiceRestTransport @@ -1744,9 +1747,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseBatchProcessDocuments._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseBatchProcessDocuments._get_http_options() request, metadata = self._interceptor.pre_batch_process_documents( request, metadata @@ -1904,9 +1905,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseCreateProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseCreateProcessor._get_http_options() request, metadata = self._interceptor.pre_create_processor( request, metadata @@ -2063,9 +2062,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessor._get_http_options() request, metadata = self._interceptor.pre_delete_processor( request, metadata @@ -2215,9 +2212,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_delete_processor_version( request, metadata @@ -2366,9 +2361,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDeployProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDeployProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_deploy_processor_version( request, metadata @@ -2522,9 +2515,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDisableProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDisableProcessor._get_http_options() request, metadata = self._interceptor.pre_disable_processor( request, metadata @@ -2680,9 +2671,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseEnableProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseEnableProcessor._get_http_options() request, metadata = self._interceptor.pre_enable_processor( request, metadata @@ -2841,9 +2830,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseEvaluateProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseEvaluateProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_evaluate_processor_version( request, metadata @@ -2997,9 +2984,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseFetchProcessorTypes._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseFetchProcessorTypes._get_http_options() request, metadata = self._interceptor.pre_fetch_processor_types( request, metadata @@ -3150,9 +3135,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetEvaluation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_evaluation(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetEvaluation._get_transcoded_request( @@ -3303,9 +3286,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessor._get_http_options() request, metadata = self._interceptor.pre_get_processor(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessor._get_transcoded_request( @@ -3456,9 +3437,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorType._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorType._get_http_options() request, metadata = self._interceptor.pre_get_processor_type( request, metadata @@ -3615,9 +3594,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_get_processor_version( request, metadata @@ -3782,9 +3759,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseImportProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseImportProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_import_processor_version( request, metadata @@ -3933,9 +3908,7 @@ def __call__( The response from ``ListEvaluations``. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListEvaluations._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListEvaluations._get_http_options() request, metadata = self._interceptor.pre_list_evaluations( request, metadata @@ -4090,9 +4063,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListProcessors._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListProcessors._get_http_options() request, metadata = self._interceptor.pre_list_processors(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseListProcessors._get_transcoded_request( @@ -4247,9 +4218,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListProcessorTypes._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListProcessorTypes._get_http_options() request, metadata = self._interceptor.pre_list_processor_types( request, metadata @@ -4405,9 +4374,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListProcessorVersions._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListProcessorVersions._get_http_options() request, metadata = self._interceptor.pre_list_processor_versions( request, metadata @@ -4560,9 +4527,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseProcessDocument._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseProcessDocument._get_http_options() request, metadata = self._interceptor.pre_process_document( request, metadata @@ -4722,9 +4687,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseReviewDocument._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseReviewDocument._get_http_options() request, metadata = self._interceptor.pre_review_document(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseReviewDocument._get_transcoded_request( @@ -4881,9 +4844,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseSetDefaultProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseSetDefaultProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_set_default_processor_version( request, metadata @@ -4950,11 +4911,10 @@ def __call__( resp = self._interceptor.post_set_default_processor_version(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_default_processor_version_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_default_processor_version_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5040,9 +5000,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseTrainProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseTrainProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_train_processor_version( request, metadata @@ -5199,9 +5157,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseUndeployProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseUndeployProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_undeploy_processor_version( request, metadata @@ -5333,7 +5289,9 @@ def delete_processor_version( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def deploy_processor_version( @@ -5344,7 +5302,9 @@ def deploy_processor_version( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeployProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._DeployProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def disable_processor( @@ -5375,7 +5335,9 @@ def evaluate_processor_version( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._EvaluateProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._EvaluateProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_processor_types( @@ -5439,7 +5401,9 @@ def import_processor_version( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._ImportProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_evaluations( @@ -5515,7 +5479,9 @@ def set_default_processor_version( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetDefaultProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._SetDefaultProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def train_processor_version( @@ -5537,7 +5503,9 @@ def undeploy_processor_version( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UndeployProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._UndeployProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -5597,9 +5565,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -5738,9 +5704,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -5878,9 +5842,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -5998,9 +5960,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -6141,9 +6101,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest_base.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest_base.py index 31233c32c0cd..5e1f0ff13c2c 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest_base.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest_base.py @@ -22,10 +22,13 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.documentai_v1beta3.types import document_processor_service, evaluation -from google.cloud.documentai_v1beta3.types import processor +from google.cloud.documentai_v1beta3.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type from .base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/async_client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/async_client.py index a06851b81143..d873bfd29611 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/async_client.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1beta3 import gapic_version as package_version @@ -46,17 +46,17 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.documentai_v1beta3.services.document_service import pagers from google.cloud.documentai_v1beta3.types import ( + dataset, document, document_schema, document_service, ) -from google.cloud.documentai_v1beta3.types import dataset from google.cloud.documentai_v1beta3.types import dataset as gcd_dataset from .client import DocumentServiceClient @@ -133,7 +133,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_info.__func__(DocumentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DocumentServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DocumentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +152,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_file.__func__(DocumentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DocumentServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DocumentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/client.py index de376dadb2ea..dcb9b1e49a5c 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/client.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1beta3 import gapic_version as package_version @@ -63,17 +63,17 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.documentai_v1beta3.services.document_service import pagers from google.cloud.documentai_v1beta3.types import ( + dataset, document, document_schema, document_service, ) -from google.cloud.documentai_v1beta3.types import dataset from google.cloud.documentai_v1beta3.types import dataset as gcd_dataset from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -90,9 +90,7 @@ class DocumentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] _transport_registry["grpc"] = DocumentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentServiceRestTransport @@ -680,11 +678,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -719,8 +715,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/pagers.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/pagers.py index 442c816ee02d..456ccd43d467 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/pagers.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/base.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/base.py index 314a5ae0b99c..9040f417ccf2 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/base.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1beta3 import gapic_version as package_version from google.cloud.documentai_v1beta3.types import dataset, document_service @@ -307,7 +307,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc.py index a49181635aa7..653f2dfc5d1b 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.documentai_v1beta3.types import dataset, document_service diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc_asyncio.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc_asyncio.py index 9b30f0e82f70..a027b2b3bd69 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.documentai_v1beta3.types import dataset, document_service diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/rest.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/rest.py index 521c04e19016..95a45abd6cae 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/rest.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -809,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseBatchDeleteDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseBatchDeleteDocuments._get_http_options() request, metadata = self._interceptor.pre_batch_delete_documents( request, metadata @@ -958,9 +956,7 @@ def __call__( Dataset Schema. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseGetDatasetSchema._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseGetDatasetSchema._get_http_options() request, metadata = self._interceptor.pre_get_dataset_schema( request, metadata @@ -1254,9 +1250,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() request, metadata = self._interceptor.pre_import_documents( request, metadata @@ -1708,9 +1702,7 @@ def __call__( Dataset Schema. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseUpdateDatasetSchema._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseUpdateDatasetSchema._get_http_options() request, metadata = self._interceptor.pre_update_dataset_schema( request, metadata @@ -2201,9 +2193,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2458,9 +2448,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/__init__.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/__init__.py index 5d47a5d3ce65..f70aa4f1e076 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/__init__.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/__init__.py @@ -13,9 +13,19 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .barcode import Barcode -from .dataset import BatchDatasetDocuments, Dataset, DatasetSchema, DocumentId -from .document import Document, RevisionRef +from .barcode import ( + Barcode, +) +from .dataset import ( + BatchDatasetDocuments, + Dataset, + DatasetSchema, + DocumentId, +) +from .document import ( + Document, + RevisionRef, +) from .document_io import ( BatchDocumentsInputConfig, DocumentOutputConfig, @@ -110,11 +120,26 @@ UpdateDatasetRequest, UpdateDatasetSchemaRequest, ) -from .evaluation import Evaluation, EvaluationReference -from .geometry import BoundingPoly, NormalizedVertex, Vertex -from .operation_metadata import CommonOperationMetadata -from .processor import Processor, ProcessorVersion, ProcessorVersionAlias -from .processor_type import ProcessorType +from .evaluation import ( + Evaluation, + EvaluationReference, +) +from .geometry import ( + BoundingPoly, + NormalizedVertex, + Vertex, +) +from .operation_metadata import ( + CommonOperationMetadata, +) +from .processor import ( + Processor, + ProcessorVersion, + ProcessorVersionAlias, +) +from .processor_type import ( + ProcessorType, +) __all__ = ( "Barcode", diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/dataset.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/dataset.py index 700aa3e9e089..41f66b76b56f 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/dataset.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/dataset.py @@ -19,8 +19,8 @@ import proto # type: ignore -from google.cloud.documentai_v1beta3.types import document_schema as gcd_document_schema from google.cloud.documentai_v1beta3.types import document, document_io +from google.cloud.documentai_v1beta3.types import document_schema as gcd_document_schema __protobuf__ = proto.module( package="google.cloud.documentai.v1beta3", @@ -90,6 +90,7 @@ class State(proto.Enum): INITIALIZED (3): Dataset has been initialized. """ + STATE_UNSPECIFIED = 0 UNINITIALIZED = 1 INITIALIZING = 2 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document.py index b1b0926e0763..724a6301501f 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document.py @@ -453,6 +453,7 @@ class Orientation(proto.Enum): Turn the head 90 degrees counterclockwise from upright to read. """ + ORIENTATION_UNSPECIFIED = 0 PAGE_UP = 1 PAGE_RIGHT = 2 @@ -500,12 +501,12 @@ class Block(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -534,12 +535,12 @@ class Paragraph(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -569,12 +570,12 @@ class Line(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -625,6 +626,7 @@ class Type(proto.Enum): A hyphen that indicates that a token has been split across lines. """ + TYPE_UNSPECIFIED = 0 SPACE = 1 WIDE_SPACE = 2 @@ -755,12 +757,12 @@ class StyleInfo(proto.Message): number=2, message="Document.Page.Token.DetectedBreak", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -791,12 +793,12 @@ class Symbol(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) class VisualElement(proto.Message): @@ -825,12 +827,12 @@ class VisualElement(proto.Message): proto.STRING, number=2, ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="Document.Page.DetectedLanguage", + ) ) class Table(proto.Message): @@ -860,12 +862,12 @@ class TableRow(proto.Message): Cells that make up this row. """ - cells: MutableSequence[ - "Document.Page.Table.TableCell" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.Page.Table.TableCell", + cells: MutableSequence["Document.Page.Table.TableCell"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.Page.Table.TableCell", + ) ) class TableCell(proto.Message): @@ -911,26 +913,26 @@ class TableCell(proto.Message): number=1, message="Document.Page.Layout", ) - header_rows: MutableSequence[ - "Document.Page.Table.TableRow" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.Table.TableRow", + header_rows: MutableSequence["Document.Page.Table.TableRow"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.Table.TableRow", + ) ) - body_rows: MutableSequence[ - "Document.Page.Table.TableRow" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="Document.Page.Table.TableRow", + body_rows: MutableSequence["Document.Page.Table.TableRow"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="Document.Page.Table.TableRow", + ) ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -1143,12 +1145,12 @@ class DetectedDefect(proto.Message): number=3, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Document.Page.DetectedLanguage", + ) ) blocks: MutableSequence["Document.Page.Block"] = proto.RepeatedField( proto.MESSAGE, @@ -1170,12 +1172,12 @@ class DetectedDefect(proto.Message): number=8, message="Document.Page.Token", ) - visual_elements: MutableSequence[ - "Document.Page.VisualElement" - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message="Document.Page.VisualElement", + visual_elements: MutableSequence["Document.Page.VisualElement"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message="Document.Page.VisualElement", + ) ) tables: MutableSequence["Document.Page.Table"] = proto.RepeatedField( proto.MESSAGE, @@ -1192,12 +1194,12 @@ class DetectedDefect(proto.Message): number=12, message="Document.Page.Symbol", ) - detected_barcodes: MutableSequence[ - "Document.Page.DetectedBarcode" - ] = proto.RepeatedField( - proto.MESSAGE, - number=15, - message="Document.Page.DetectedBarcode", + detected_barcodes: MutableSequence["Document.Page.DetectedBarcode"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=15, + message="Document.Page.DetectedBarcode", + ) ) image_quality_scores: "Document.Page.ImageQualityScores" = proto.Field( proto.MESSAGE, @@ -1273,6 +1275,7 @@ class Method(proto.Enum): inference and is not necessarily an exact text extraction from the document. """ + METHOD_UNSPECIFIED = 0 EXTRACT = 1 DERIVE = 2 @@ -1517,12 +1520,12 @@ class TextSegment(proto.Message): number=2, ) - text_segments: MutableSequence[ - "Document.TextAnchor.TextSegment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.TextAnchor.TextSegment", + text_segments: MutableSequence["Document.TextAnchor.TextSegment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.TextAnchor.TextSegment", + ) ) content: str = proto.Field( proto.STRING, @@ -1606,6 +1609,7 @@ class LayoutType(proto.Enum): [Page.form_fields][google.cloud.documentai.v1beta3.Document.Page.form_fields] element. """ + LAYOUT_TYPE_UNSPECIFIED = 0 BLOCK = 1 PARAGRAPH = 2 @@ -1695,6 +1699,7 @@ class OperationType(proto.Enum): Deprecated. Element is skipped in the validation process. """ + OPERATION_TYPE_UNSPECIFIED = 0 ADD = 1 REMOVE = 2 @@ -2232,12 +2237,12 @@ class LayoutImageBlock(proto.Message): message=geometry.BoundingPoly, ) - blocks: MutableSequence[ - "Document.DocumentLayout.DocumentLayoutBlock" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.DocumentLayout.DocumentLayoutBlock", + blocks: MutableSequence["Document.DocumentLayout.DocumentLayoutBlock"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.DocumentLayout.DocumentLayoutBlock", + ) ) class ChunkedDocument(proto.Message): @@ -2552,6 +2557,7 @@ class ValidationResultType(proto.Enum): VALIDATION_RESULT_TYPE_NOT_APPLICABLE (4): The validation is not applicable. """ + VALIDATION_RESULT_TYPE_UNSPECIFIED = 0 VALIDATION_RESULT_TYPE_VALID = 1 VALIDATION_RESULT_TYPE_INVALID = 2 @@ -2758,6 +2764,7 @@ class RevisionCase(proto.Enum): BASE_OCR_REVISION (3): The first (OCR) revision. """ + REVISION_CASE_UNSPECIFIED = 0 LATEST_HUMAN_REVIEW = 1 LATEST_TIMESTAMP = 2 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_processor_service.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_processor_service.py index 94e00060db8c..d1a89178a766 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_processor_service.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_processor_service.py @@ -22,13 +22,15 @@ import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore -from google.cloud.documentai_v1beta3.types import document_schema as gcd_document_schema from google.cloud.documentai_v1beta3.types import document as gcd_document -from google.cloud.documentai_v1beta3.types import document_io +from google.cloud.documentai_v1beta3.types import ( + document_io, + operation_metadata, + processor_type, +) +from google.cloud.documentai_v1beta3.types import document_schema as gcd_document_schema from google.cloud.documentai_v1beta3.types import evaluation as gcd_evaluation -from google.cloud.documentai_v1beta3.types import operation_metadata from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type __protobuf__ = proto.module( package="google.cloud.documentai.v1beta3", @@ -442,6 +444,7 @@ class State(proto.Enum): [state_message][google.cloud.documentai.v1beta3.HumanReviewStatus.state_message] for details. """ + STATE_UNSPECIFIED = 0 SKIPPED = 1 VALIDATION_PASSED = 2 @@ -671,6 +674,7 @@ class State(proto.Enum): FAILED (6): The batch processing has failed. """ + STATE_UNSPECIFIED = 0 WAITING = 1 RUNNING = 2 @@ -749,12 +753,12 @@ class IndividualProcessStatus(proto.Message): number=4, message=timestamp_pb2.Timestamp, ) - individual_process_statuses: MutableSequence[ - IndividualProcessStatus - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=IndividualProcessStatus, + individual_process_statuses: MutableSequence[IndividualProcessStatus] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=IndividualProcessStatus, + ) ) @@ -786,12 +790,12 @@ class FetchProcessorTypesResponse(proto.Message): The list of processor types. """ - processor_types: MutableSequence[ - processor_type.ProcessorType - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=processor_type.ProcessorType, + processor_types: MutableSequence[processor_type.ProcessorType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=processor_type.ProcessorType, + ) ) @@ -845,12 +849,12 @@ class ListProcessorTypesResponse(proto.Message): def raw_page(self): return self - processor_types: MutableSequence[ - processor_type.ProcessorType - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=processor_type.ProcessorType, + processor_types: MutableSequence[processor_type.ProcessorType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=processor_type.ProcessorType, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1018,12 +1022,12 @@ class ListProcessorVersionsResponse(proto.Message): def raw_page(self): return self - processor_versions: MutableSequence[ - gcd_processor.ProcessorVersion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_processor.ProcessorVersion, + processor_versions: MutableSequence[gcd_processor.ProcessorVersion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_processor.ProcessorVersion, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1449,6 +1453,7 @@ class TrainingMethod(proto.Enum): TEMPLATE_BASED (2): No description available. """ + TRAINING_METHOD_UNSPECIFIED = 0 MODEL_BASED = 1 TEMPLATE_BASED = 2 @@ -1647,6 +1652,7 @@ class Priority(proto.Enum): urgent task queue to respect this priority level. """ + DEFAULT = 0 URGENT = 1 @@ -1710,6 +1716,7 @@ class State(proto.Enum): SUCCEEDED (2): The review operation is succeeded. """ + STATE_UNSPECIFIED = 0 REJECTED = 1 SUCCEEDED = 2 @@ -1769,6 +1776,7 @@ class State(proto.Enum): CANCELLED (5): Operation is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 CANCELLING = 2 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_schema.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_schema.py index d0d6eb740350..4dac88c4272d 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_schema.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_schema.py @@ -54,6 +54,7 @@ class Length(proto.Enum): COMPREHENSIVE (3): The longest option available. """ + LENGTH_UNSPECIFIED = 0 BRIEF = 1 MODERATE = 2 @@ -70,6 +71,7 @@ class Format(proto.Enum): BULLETS (2): Format the output in bullets. """ + FORMAT_UNSPECIFIED = 0 PARAGRAPH = 1 BULLETS = 2 @@ -279,6 +281,7 @@ class OccurrenceType(proto.Enum): The entity type will appear once or more times. """ + OCCURRENCE_TYPE_UNSPECIFIED = 0 OPTIONAL_ONCE = 1 OPTIONAL_MULTIPLE = 2 @@ -300,6 +303,7 @@ class Method(proto.Enum): inference and is not necessarily an exact text extraction from the document. """ + METHOD_UNSPECIFIED = 0 EXTRACT = 1 DERIVE = 2 @@ -360,12 +364,12 @@ class Method(proto.Enum): proto.STRING, number=2, ) - properties: MutableSequence[ - "DocumentSchema.EntityType.Property" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="DocumentSchema.EntityType.Property", + properties: MutableSequence["DocumentSchema.EntityType.Property"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="DocumentSchema.EntityType.Property", + ) ) entity_type_metadata: "EntityTypeMetadata" = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_service.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_service.py index b5bf3166933b..f9577a4280f3 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_service.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_service.py @@ -21,9 +21,9 @@ import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore -from google.cloud.documentai_v1beta3.types import document_io, operation_metadata from google.cloud.documentai_v1beta3.types import dataset as gcd_dataset from google.cloud.documentai_v1beta3.types import document as gcd_document +from google.cloud.documentai_v1beta3.types import document_io, operation_metadata __protobuf__ = proto.module( package="google.cloud.documentai.v1beta3", @@ -64,6 +64,7 @@ class DatasetSplitType(proto.Enum): DATASET_SPLIT_UNASSIGNED (3): Identifies the unassigned documents. """ + DATASET_SPLIT_TYPE_UNSPECIFIED = 0 DATASET_SPLIT_TRAIN = 1 DATASET_SPLIT_TEST = 2 @@ -83,6 +84,7 @@ class DocumentLabelingState(proto.Enum): DOCUMENT_AUTO_LABELED (3): Document has been auto-labeled. """ + DOCUMENT_LABELING_STATE_UNSPECIFIED = 0 DOCUMENT_LABELED = 1 DOCUMENT_UNLABELED = 2 @@ -216,12 +218,12 @@ class AutoSplitConfig(proto.Message): proto.STRING, number=1, ) - batch_documents_import_configs: MutableSequence[ - BatchDocumentsImportConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=BatchDocumentsImportConfig, + batch_documents_import_configs: MutableSequence[BatchDocumentsImportConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=BatchDocumentsImportConfig, + ) ) @@ -304,19 +306,19 @@ class ImportConfigValidationResult(proto.Message): number=1, message=operation_metadata.CommonOperationMetadata, ) - individual_import_statuses: MutableSequence[ - IndividualImportStatus - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=IndividualImportStatus, + individual_import_statuses: MutableSequence[IndividualImportStatus] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=IndividualImportStatus, + ) ) - import_config_validation_results: MutableSequence[ - ImportConfigValidationResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=ImportConfigValidationResult, + import_config_validation_results: MutableSequence[ImportConfigValidationResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=ImportConfigValidationResult, + ) ) total_document_count: int = proto.Field( proto.INT32, @@ -584,12 +586,12 @@ class IndividualBatchDeleteStatus(proto.Message): number=1, message=operation_metadata.CommonOperationMetadata, ) - individual_batch_delete_statuses: MutableSequence[ - IndividualBatchDeleteStatus - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=IndividualBatchDeleteStatus, + individual_batch_delete_statuses: MutableSequence[IndividualBatchDeleteStatus] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=IndividualBatchDeleteStatus, + ) ) total_document_count: int = proto.Field( proto.INT32, diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/evaluation.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/evaluation.py index f6fefef2df76..051b1bae201e 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/evaluation.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/evaluation.py @@ -273,6 +273,7 @@ class MetricsType(proto.Enum): parent (i.e., non-leaf) entity types are an aggregate of metrics for their children. """ + METRICS_TYPE_UNSPECIFIED = 0 AGGREGATE = 1 @@ -344,13 +345,13 @@ class EvaluationRevision(proto.Message): number=3, message="Evaluation.MultiConfidenceMetrics", ) - entity_metrics: MutableMapping[ - str, "Evaluation.MultiConfidenceMetrics" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=4, - message="Evaluation.MultiConfidenceMetrics", + entity_metrics: MutableMapping[str, "Evaluation.MultiConfidenceMetrics"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=4, + message="Evaluation.MultiConfidenceMetrics", + ) ) name: str = proto.Field( diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/operation_metadata.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/operation_metadata.py index 33832b3aecef..b60aec2fe1a7 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/operation_metadata.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/operation_metadata.py @@ -62,6 +62,7 @@ class State(proto.Enum): CANCELLED (5): Operation is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 CANCELLING = 2 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/processor.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/processor.py index 0a55e5ceb122..dc2563c4ebbb 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/processor.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/processor.py @@ -110,6 +110,7 @@ class State(proto.Enum): IMPORTING (8): The processor version is being imported. """ + STATE_UNSPECIFIED = 0 DEPLOYED = 1 DEPLOYING = 2 @@ -133,6 +134,7 @@ class ModelType(proto.Enum): MODEL_TYPE_CUSTOM (2): The processor version has custom model type. """ + MODEL_TYPE_UNSPECIFIED = 0 MODEL_TYPE_GENERATIVE = 1 MODEL_TYPE_CUSTOM = 2 @@ -229,6 +231,7 @@ class CustomModelType(proto.Enum): FINE_TUNED (2): The model is a finetuned foundation model. """ + CUSTOM_MODEL_TYPE_UNSPECIFIED = 0 VERSIONED_FOUNDATION = 1 FINE_TUNED = 2 @@ -417,6 +420,7 @@ class State(proto.Enum): The processor is being deleted, will be removed if successful. """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -447,12 +451,12 @@ class State(proto.Enum): proto.STRING, number=9, ) - processor_version_aliases: MutableSequence[ - "ProcessorVersionAlias" - ] = proto.RepeatedField( - proto.MESSAGE, - number=10, - message="ProcessorVersionAlias", + processor_version_aliases: MutableSequence["ProcessorVersionAlias"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=10, + message="ProcessorVersionAlias", + ) ) process_endpoint: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-documentai/mypy.ini b/packages/google-cloud-documentai/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-documentai/mypy.ini +++ b/packages/google-cloud-documentai/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-documentai/noxfile.py b/packages/google-cloud-documentai/noxfile.py index 1015764837f2..ea78bad94f61 100644 --- a/packages/google-cloud-documentai/noxfile.py +++ b/packages/google-cloud-documentai/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_async.py b/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_async.py index 68544c55562d..517146d6dfa5 100644 --- a/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_async.py +++ b/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_async.py @@ -40,9 +40,7 @@ async def sample_batch_delete_documents(): # Initialize request argument(s) dataset_documents = documentai_v1beta3.BatchDatasetDocuments() - dataset_documents.individual_document_ids.document_ids.gcs_managed_doc_id.gcs_uri = ( - "gcs_uri_value" - ) + dataset_documents.individual_document_ids.document_ids.gcs_managed_doc_id.gcs_uri = "gcs_uri_value" request = documentai_v1beta3.BatchDeleteDocumentsRequest( dataset="dataset_value", diff --git a/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_sync.py b/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_sync.py index 27ab9b76b523..6185f63d7007 100644 --- a/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_sync.py +++ b/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_sync.py @@ -40,9 +40,7 @@ def sample_batch_delete_documents(): # Initialize request argument(s) dataset_documents = documentai_v1beta3.BatchDatasetDocuments() - dataset_documents.individual_document_ids.document_ids.gcs_managed_doc_id.gcs_uri = ( - "gcs_uri_value" - ) + dataset_documents.individual_document_ids.document_ids.gcs_managed_doc_id.gcs_uri = "gcs_uri_value" request = documentai_v1beta3.BatchDeleteDocumentsRequest( dataset="dataset_value", diff --git a/packages/google-cloud-documentai/samples/generated_samples/snippet_metadata_google.cloud.documentai.v1.json b/packages/google-cloud-documentai/samples/generated_samples/snippet_metadata_google.cloud.documentai.v1.json index 823b3937e58a..95b3ee11af31 100644 --- a/packages/google-cloud-documentai/samples/generated_samples/snippet_metadata_google.cloud.documentai.v1.json +++ b/packages/google-cloud-documentai/samples/generated_samples/snippet_metadata_google.cloud.documentai.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-documentai", - "version": "3.9.0" + "version": "3.10.0" }, "snippets": [ { diff --git a/packages/google-cloud-documentai/samples/generated_samples/snippet_metadata_google.cloud.documentai.v1beta3.json b/packages/google-cloud-documentai/samples/generated_samples/snippet_metadata_google.cloud.documentai.v1beta3.json index c03e4d099ed9..3ca0c8a0493e 100644 --- a/packages/google-cloud-documentai/samples/generated_samples/snippet_metadata_google.cloud.documentai.v1beta3.json +++ b/packages/google-cloud-documentai/samples/generated_samples/snippet_metadata_google.cloud.documentai.v1beta3.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-documentai", - "version": "3.9.0" + "version": "3.10.0" }, "snippets": [ { diff --git a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1/test_document_processor_service.py b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1/test_document_processor_service.py index a053bed5a99a..514462ef734f 100644 --- a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1/test_document_processor_service.py +++ b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1/test_document_processor_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,22 @@ HAS_GOOGLE_AUTH_AIO = False import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.color_pb2 as color_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,28 +68,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore -import google.type.color_pb2 as color_pb2 # type: ignore -import google.type.date_pb2 as date_pb2 # type: ignore -import google.type.datetime_pb2 as datetime_pb2 # type: ignore -import google.type.money_pb2 as money_pb2 # type: ignore -import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.cloud.documentai_v1.services.document_processor_service import ( DocumentProcessorServiceAsyncClient, @@ -90,10 +90,10 @@ document_schema, evaluation, geometry, + processor, + processor_type, ) -from google.cloud.documentai_v1.types import processor from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1038,10 +1038,9 @@ def test_document_processor_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1086,10 +1085,9 @@ def test_document_processor_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1125,10 +1123,9 @@ def test_document_processor_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1389,9 +1386,7 @@ def test_document_processor_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1495,9 +1490,9 @@ def test_process_document_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.process_document - ] = mock_rpc + client._transport._wrapped_methods[client._transport.process_document] = ( + mock_rpc + ) request = {} client.process_document(request) @@ -2169,9 +2164,9 @@ def test_fetch_processor_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_processor_types] = ( + mock_rpc + ) request = {} client.fetch_processor_types(request) @@ -2510,9 +2505,9 @@ def test_list_processor_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_processor_types] = ( + mock_rpc + ) request = {} client.list_processor_types(request) @@ -3064,9 +3059,9 @@ def test_get_processor_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_type] = ( + mock_rpc + ) request = {} client.get_processor_type(request) @@ -4667,9 +4662,9 @@ def test_get_processor_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_version] = ( + mock_rpc + ) request = {} client.get_processor_version(request) @@ -6626,9 +6621,9 @@ def test_create_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_processor] = ( + mock_rpc + ) request = {} client.create_processor(request) @@ -6975,9 +6970,9 @@ def test_delete_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_processor] = ( + mock_rpc + ) request = {} client.delete_processor(request) @@ -7305,9 +7300,9 @@ def test_enable_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_processor] = ( + mock_rpc + ) request = {} client.enable_processor(request) @@ -7557,9 +7552,9 @@ def test_disable_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_processor] = ( + mock_rpc + ) request = {} client.disable_processor(request) @@ -9086,9 +9081,9 @@ def test_list_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -9542,9 +9537,9 @@ def test_process_document_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.process_document - ] = mock_rpc + client._transport._wrapped_methods[client._transport.process_document] = ( + mock_rpc + ) request = {} client.process_document(request) @@ -9913,9 +9908,9 @@ def test_fetch_processor_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_processor_types] = ( + mock_rpc + ) request = {} client.fetch_processor_types(request) @@ -10099,9 +10094,9 @@ def test_list_processor_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_processor_types] = ( + mock_rpc + ) request = {} client.list_processor_types(request) @@ -10364,9 +10359,9 @@ def test_get_processor_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_type] = ( + mock_rpc + ) request = {} client.get_processor_type(request) @@ -11183,9 +11178,9 @@ def test_get_processor_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_version] = ( + mock_rpc + ) request = {} client.get_processor_version(request) @@ -12189,9 +12184,9 @@ def test_create_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_processor] = ( + mock_rpc + ) request = {} client.create_processor(request) @@ -12379,9 +12374,9 @@ def test_delete_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_processor] = ( + mock_rpc + ) request = {} client.delete_processor(request) @@ -12559,9 +12554,9 @@ def test_enable_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_processor] = ( + mock_rpc + ) request = {} client.enable_processor(request) @@ -12683,9 +12678,9 @@ def test_disable_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_processor] = ( + mock_rpc + ) request = {} client.disable_processor(request) @@ -13496,9 +13491,9 @@ def test_list_evaluations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) diff --git a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_processor_service.py b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_processor_service.py index bf5e7bcc4687..0bda22217c63 100644 --- a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_processor_service.py +++ b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_processor_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,22 @@ HAS_GOOGLE_AUTH_AIO = False import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.color_pb2 as color_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,28 +68,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore -import google.rpc.status_pb2 as status_pb2 # type: ignore -import google.type.color_pb2 as color_pb2 # type: ignore -import google.type.date_pb2 as date_pb2 # type: ignore -import google.type.datetime_pb2 as datetime_pb2 # type: ignore -import google.type.money_pb2 as money_pb2 # type: ignore -import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.cloud.documentai_v1beta3.services.document_processor_service import ( DocumentProcessorServiceAsyncClient, @@ -90,10 +90,10 @@ document_schema, evaluation, geometry, + processor, + processor_type, ) -from google.cloud.documentai_v1beta3.types import processor from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1038,10 +1038,9 @@ def test_document_processor_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1086,10 +1085,9 @@ def test_document_processor_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1125,10 +1123,9 @@ def test_document_processor_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1389,9 +1386,7 @@ def test_document_processor_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1498,9 +1493,9 @@ def test_process_document_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.process_document - ] = mock_rpc + client._transport._wrapped_methods[client._transport.process_document] = ( + mock_rpc + ) request = {} client.process_document(request) @@ -2175,9 +2170,9 @@ def test_fetch_processor_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_processor_types] = ( + mock_rpc + ) request = {} client.fetch_processor_types(request) @@ -2516,9 +2511,9 @@ def test_list_processor_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_processor_types] = ( + mock_rpc + ) request = {} client.list_processor_types(request) @@ -3070,9 +3065,9 @@ def test_get_processor_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_type] = ( + mock_rpc + ) request = {} client.get_processor_type(request) @@ -4673,9 +4668,9 @@ def test_get_processor_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_version] = ( + mock_rpc + ) request = {} client.get_processor_version(request) @@ -6632,9 +6627,9 @@ def test_create_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_processor] = ( + mock_rpc + ) request = {} client.create_processor(request) @@ -6981,9 +6976,9 @@ def test_delete_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_processor] = ( + mock_rpc + ) request = {} client.delete_processor(request) @@ -7311,9 +7306,9 @@ def test_enable_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_processor] = ( + mock_rpc + ) request = {} client.enable_processor(request) @@ -7563,9 +7558,9 @@ def test_disable_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_processor] = ( + mock_rpc + ) request = {} client.disable_processor(request) @@ -9092,9 +9087,9 @@ def test_list_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -9897,9 +9892,9 @@ def test_process_document_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.process_document - ] = mock_rpc + client._transport._wrapped_methods[client._transport.process_document] = ( + mock_rpc + ) request = {} client.process_document(request) @@ -10268,9 +10263,9 @@ def test_fetch_processor_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_processor_types] = ( + mock_rpc + ) request = {} client.fetch_processor_types(request) @@ -10454,9 +10449,9 @@ def test_list_processor_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_processor_types] = ( + mock_rpc + ) request = {} client.list_processor_types(request) @@ -10719,9 +10714,9 @@ def test_get_processor_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_type] = ( + mock_rpc + ) request = {} client.get_processor_type(request) @@ -11540,9 +11535,9 @@ def test_get_processor_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_version] = ( + mock_rpc + ) request = {} client.get_processor_version(request) @@ -12546,9 +12541,9 @@ def test_create_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_processor] = ( + mock_rpc + ) request = {} client.create_processor(request) @@ -12737,9 +12732,9 @@ def test_delete_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_processor] = ( + mock_rpc + ) request = {} client.delete_processor(request) @@ -12918,9 +12913,9 @@ def test_enable_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_processor] = ( + mock_rpc + ) request = {} client.enable_processor(request) @@ -13042,9 +13037,9 @@ def test_disable_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_processor] = ( + mock_rpc + ) request = {} client.disable_processor(request) @@ -13855,9 +13850,9 @@ def test_list_evaluations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) diff --git a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_service.py b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_service.py index 49e83c448d55..52d4049fb9b8 100644 --- a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_service.py +++ b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.documentai_v1beta3.services.document_service import ( DocumentServiceAsyncClient, @@ -71,12 +71,12 @@ transports, ) from google.cloud.documentai_v1beta3.types import ( + dataset, document, document_io, document_schema, document_service, ) -from google.cloud.documentai_v1beta3.types import dataset from google.cloud.documentai_v1beta3.types import dataset as gcd_dataset CRED_INFO_JSON = { @@ -988,10 +988,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1036,10 +1035,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1075,10 +1073,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1325,9 +1322,7 @@ def test_document_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1796,9 +1791,9 @@ def test_import_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -2975,9 +2970,9 @@ def test_batch_delete_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_documents] = ( + mock_rpc + ) request = {} client.batch_delete_documents(request) @@ -3328,9 +3323,9 @@ def test_get_dataset_schema_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_dataset_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_dataset_schema] = ( + mock_rpc + ) request = {} client.get_dataset_schema(request) @@ -3675,9 +3670,9 @@ def test_update_dataset_schema_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_dataset_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_dataset_schema] = ( + mock_rpc + ) request = {} client.update_dataset_schema(request) @@ -4154,9 +4149,9 @@ def test_import_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -4795,9 +4790,9 @@ def test_batch_delete_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_documents] = ( + mock_rpc + ) request = {} client.batch_delete_documents(request) @@ -4987,9 +4982,9 @@ def test_get_dataset_schema_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_dataset_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_dataset_schema] = ( + mock_rpc + ) request = {} client.get_dataset_schema(request) @@ -5174,9 +5169,9 @@ def test_update_dataset_schema_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_dataset_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_dataset_schema] = ( + mock_rpc + ) request = {} client.update_dataset_schema(request) diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/__init__.py b/packages/google-cloud-domains/google/cloud/domains_v1/__init__.py index e8d02a3de9cb..2803dcba177e 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/__init__.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.domains import DomainsAsyncClient, DomainsClient from .types.domains import ( AuthorizationCode, diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/async_client.py b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/async_client.py index 4acf682deeeb..81e7ac82eb4a 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/async_client.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.domains_v1 import gapic_version as package_version @@ -114,7 +114,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DomainsAsyncClient: The constructed client. """ - return DomainsClient.from_service_account_info.__func__(DomainsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DomainsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DomainsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +133,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DomainsAsyncClient: The constructed client. """ - return DomainsClient.from_service_account_file.__func__(DomainsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DomainsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DomainsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/client.py b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/client.py index 18d1b256c160..762bfa151c1e 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/client.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.domains_v1 import gapic_version as package_version @@ -627,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DomainsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DomainsClient._read_environment_variables() + ) self._client_cert_source = DomainsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -666,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DomainsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/pagers.py b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/pagers.py index 221c5da2861c..e9cb898c2c63 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/pagers.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/base.py b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/base.py index 09a27efac837..1d2fed797189 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/base.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.domains_v1 import gapic_version as package_version from google.cloud.domains_v1.types import domains diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc.py b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc.py index 51f791f94b01..df3de685bcf9 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.domains_v1.types import domains @@ -395,12 +395,12 @@ def retrieve_register_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_register_parameters" not in self._stubs: - self._stubs[ - "retrieve_register_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/RetrieveRegisterParameters", - request_serializer=domains.RetrieveRegisterParametersRequest.serialize, - response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + self._stubs["retrieve_register_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/RetrieveRegisterParameters", + request_serializer=domains.RetrieveRegisterParametersRequest.serialize, + response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + ) ) return self._stubs["retrieve_register_parameters"] @@ -469,12 +469,12 @@ def retrieve_transfer_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_transfer_parameters" not in self._stubs: - self._stubs[ - "retrieve_transfer_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/RetrieveTransferParameters", - request_serializer=domains.RetrieveTransferParametersRequest.serialize, - response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + self._stubs["retrieve_transfer_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/RetrieveTransferParameters", + request_serializer=domains.RetrieveTransferParametersRequest.serialize, + response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + ) ) return self._stubs["retrieve_transfer_parameters"] @@ -636,12 +636,12 @@ def configure_management_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_management_settings" not in self._stubs: - self._stubs[ - "configure_management_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/ConfigureManagementSettings", - request_serializer=domains.ConfigureManagementSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_management_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/ConfigureManagementSettings", + request_serializer=domains.ConfigureManagementSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_management_settings"] @@ -691,12 +691,12 @@ def configure_contact_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_contact_settings" not in self._stubs: - self._stubs[ - "configure_contact_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/ConfigureContactSettings", - request_serializer=domains.ConfigureContactSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_contact_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/ConfigureContactSettings", + request_serializer=domains.ConfigureContactSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_contact_settings"] @@ -807,12 +807,12 @@ def retrieve_authorization_code( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_authorization_code" not in self._stubs: - self._stubs[ - "retrieve_authorization_code" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/RetrieveAuthorizationCode", - request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, - response_deserializer=domains.AuthorizationCode.deserialize, + self._stubs["retrieve_authorization_code"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/RetrieveAuthorizationCode", + request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, + response_deserializer=domains.AuthorizationCode.deserialize, + ) ) return self._stubs["retrieve_authorization_code"] diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc_asyncio.py b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc_asyncio.py index ed91906ab84f..199c8559f337 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc_asyncio.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.domains_v1.types import domains @@ -405,12 +405,12 @@ def retrieve_register_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_register_parameters" not in self._stubs: - self._stubs[ - "retrieve_register_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/RetrieveRegisterParameters", - request_serializer=domains.RetrieveRegisterParametersRequest.serialize, - response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + self._stubs["retrieve_register_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/RetrieveRegisterParameters", + request_serializer=domains.RetrieveRegisterParametersRequest.serialize, + response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + ) ) return self._stubs["retrieve_register_parameters"] @@ -479,12 +479,12 @@ def retrieve_transfer_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_transfer_parameters" not in self._stubs: - self._stubs[ - "retrieve_transfer_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/RetrieveTransferParameters", - request_serializer=domains.RetrieveTransferParametersRequest.serialize, - response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + self._stubs["retrieve_transfer_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/RetrieveTransferParameters", + request_serializer=domains.RetrieveTransferParametersRequest.serialize, + response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + ) ) return self._stubs["retrieve_transfer_parameters"] @@ -649,12 +649,12 @@ def configure_management_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_management_settings" not in self._stubs: - self._stubs[ - "configure_management_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/ConfigureManagementSettings", - request_serializer=domains.ConfigureManagementSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_management_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/ConfigureManagementSettings", + request_serializer=domains.ConfigureManagementSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_management_settings"] @@ -708,12 +708,12 @@ def configure_contact_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_contact_settings" not in self._stubs: - self._stubs[ - "configure_contact_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/ConfigureContactSettings", - request_serializer=domains.ConfigureContactSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_contact_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/ConfigureContactSettings", + request_serializer=domains.ConfigureContactSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_contact_settings"] @@ -828,12 +828,12 @@ def retrieve_authorization_code( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_authorization_code" not in self._stubs: - self._stubs[ - "retrieve_authorization_code" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/RetrieveAuthorizationCode", - request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, - response_deserializer=domains.AuthorizationCode.deserialize, + self._stubs["retrieve_authorization_code"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/RetrieveAuthorizationCode", + request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, + response_deserializer=domains.AuthorizationCode.deserialize, + ) ) return self._stubs["retrieve_authorization_code"] diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/rest.py b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/rest.py index b1130c9c70b4..e57efd7b13da 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/rest.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1112,9 +1112,7 @@ def __call__( """ - http_options = ( - _BaseDomainsRestTransport._BaseConfigureContactSettings._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseConfigureContactSettings._get_http_options() request, metadata = self._interceptor.pre_configure_contact_settings( request, metadata @@ -1419,9 +1417,7 @@ def __call__( """ - http_options = ( - _BaseDomainsRestTransport._BaseConfigureManagementSettings._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseConfigureManagementSettings._get_http_options() request, metadata = self._interceptor.pre_configure_management_settings( request, metadata @@ -1488,11 +1484,10 @@ def __call__( resp = self._interceptor.post_configure_management_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_configure_management_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_configure_management_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2349,9 +2344,7 @@ def __call__( Defines an authorization code. """ - http_options = ( - _BaseDomainsRestTransport._BaseResetAuthorizationCode._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseResetAuthorizationCode._get_http_options() request, metadata = self._interceptor.pre_reset_authorization_code( request, metadata @@ -2501,9 +2494,7 @@ def __call__( Defines an authorization code. """ - http_options = ( - _BaseDomainsRestTransport._BaseRetrieveAuthorizationCode._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseRetrieveAuthorizationCode._get_http_options() request, metadata = self._interceptor.pre_retrieve_authorization_code( request, metadata @@ -2648,9 +2639,7 @@ def __call__( Response for the ``RetrieveRegisterParameters`` method. """ - http_options = ( - _BaseDomainsRestTransport._BaseRetrieveRegisterParameters._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseRetrieveRegisterParameters._get_http_options() request, metadata = self._interceptor.pre_retrieve_register_parameters( request, metadata @@ -2797,9 +2786,7 @@ def __call__( Response for the ``RetrieveTransferParameters`` method. """ - http_options = ( - _BaseDomainsRestTransport._BaseRetrieveTransferParameters._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseRetrieveTransferParameters._get_http_options() request, metadata = self._interceptor.pre_retrieve_transfer_parameters( request, metadata @@ -3351,7 +3338,9 @@ def configure_contact_settings( ) -> Callable[[domains.ConfigureContactSettingsRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ConfigureContactSettings(self._session, self._host, self._interceptor) # type: ignore + return self._ConfigureContactSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def configure_dns_settings( @@ -3369,7 +3358,9 @@ def configure_management_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ConfigureManagementSettings(self._session, self._host, self._interceptor) # type: ignore + return self._ConfigureManagementSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_registration( @@ -3419,7 +3410,9 @@ def reset_authorization_code( ) -> Callable[[domains.ResetAuthorizationCodeRequest], domains.AuthorizationCode]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ResetAuthorizationCode(self._session, self._host, self._interceptor) # type: ignore + return self._ResetAuthorizationCode( + self._session, self._host, self._interceptor + ) # type: ignore @property def retrieve_authorization_code( @@ -3429,7 +3422,9 @@ def retrieve_authorization_code( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RetrieveAuthorizationCode(self._session, self._host, self._interceptor) # type: ignore + return self._RetrieveAuthorizationCode( + self._session, self._host, self._interceptor + ) # type: ignore @property def retrieve_register_parameters( @@ -3440,7 +3435,9 @@ def retrieve_register_parameters( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RetrieveRegisterParameters(self._session, self._host, self._interceptor) # type: ignore + return self._RetrieveRegisterParameters( + self._session, self._host, self._interceptor + ) # type: ignore @property def retrieve_transfer_parameters( @@ -3451,7 +3448,9 @@ def retrieve_transfer_parameters( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RetrieveTransferParameters(self._session, self._host, self._interceptor) # type: ignore + return self._RetrieveTransferParameters( + self._session, self._host, self._interceptor + ) # type: ignore @property def search_domains( diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/types/domains.py b/packages/google-cloud-domains/google/cloud/domains_v1/types/domains.py index b723e9b38636..093c94e18902 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/types/domains.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/types/domains.py @@ -91,6 +91,7 @@ class ContactPrivacy(proto.Enum): details, see `the registration privacy article `__. """ + CONTACT_PRIVACY_UNSPECIFIED = 0 PUBLIC_CONTACT_DATA = 1 PRIVATE_CONTACT_DATA = 2 @@ -110,6 +111,7 @@ class DomainNotice(proto.Enum): `how to get an SSL certificate `__. """ + DOMAIN_NOTICE_UNSPECIFIED = 0 HSTS_PRELOADED = 1 @@ -125,6 +127,7 @@ class ContactNotice(proto.Enum): ``ContactSettings`` to ``PUBLIC_CONTACT_DATA``, which exposes contact data publicly. """ + CONTACT_NOTICE_UNSPECIFIED = 0 PUBLIC_CONTACT_DATA_ACKNOWLEDGEMENT = 1 @@ -142,6 +145,7 @@ class TransferLockState(proto.Enum): The domain is locked and cannot be transferred to another registrar. """ + TRANSFER_LOCK_STATE_UNSPECIFIED = 0 UNLOCKED = 1 LOCKED = 2 @@ -256,6 +260,7 @@ class State(proto.Enum): shown about it may be stale. Domains in this state are not automatically renewed by Cloud Domains. """ + STATE_UNSPECIFIED = 0 REGISTRATION_PENDING = 1 REGISTRATION_FAILED = 2 @@ -285,6 +290,7 @@ class Issue(proto.Enum): verification email, call ConfigureContactSettings and provide the current ``registrant_contact.email``. """ + ISSUE_UNSPECIFIED = 0 CONTACT_SUPPORT = 1 UNVERIFIED_EMAIL = 2 @@ -381,6 +387,7 @@ class RenewalMethod(proto.Enum): To manage the domain's current billing and renewal settings, go to `Google Domains `__. """ + RENEWAL_METHOD_UNSPECIFIED = 0 AUTOMATIC_RENEWAL = 1 MANUAL_RENEWAL = 2 @@ -441,6 +448,7 @@ class DsState(proto.Enum): ``Registration``'s ``dns_provider`` field is already DNSSEC-signed. """ + DS_STATE_UNSPECIFIED = 0 DS_RECORDS_UNPUBLISHED = 1 DS_RECORDS_PUBLISHED = 2 @@ -581,6 +589,7 @@ class Algorithm(proto.Enum): Private algorithm OID. Cannot be used for new deployments. """ + ALGORITHM_UNSPECIFIED = 0 RSAMD5 = 1 DH = 2 @@ -616,6 +625,7 @@ class DigestType(proto.Enum): SHA384 (4): SHA-384. """ + DIGEST_TYPE_UNSPECIFIED = 0 SHA1 = 1 SHA256 = 2 @@ -1370,6 +1380,7 @@ class Availability(proto.Enum): availability, generally due to system maintenance at the domain name registry. """ + AVAILABILITY_UNSPECIFIED = 0 AVAILABLE = 1 UNAVAILABLE = 2 diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/__init__.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/__init__.py index c52dd4f0b48b..2e1262af7848 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/__init__.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.domains import DomainsAsyncClient, DomainsClient from .types.domains import ( AuthorizationCode, diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/async_client.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/async_client.py index fd6591a28db6..8a377ea11c42 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/async_client.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.domains_v1beta1 import gapic_version as package_version @@ -114,7 +114,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DomainsAsyncClient: The constructed client. """ - return DomainsClient.from_service_account_info.__func__(DomainsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DomainsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DomainsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +133,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DomainsAsyncClient: The constructed client. """ - return DomainsClient.from_service_account_file.__func__(DomainsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DomainsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DomainsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/client.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/client.py index 1c8629d3d695..3efadbc66003 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/client.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.domains_v1beta1 import gapic_version as package_version @@ -627,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DomainsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DomainsClient._read_environment_variables() + ) self._client_cert_source = DomainsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -666,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DomainsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/pagers.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/pagers.py index ca729f0ed896..0e54d2627514 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/pagers.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/base.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/base.py index 0f82b625411e..d0c377799ba0 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/base.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.domains_v1beta1 import gapic_version as package_version from google.cloud.domains_v1beta1.types import domains diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc.py index 8df46cc106fb..be66deb6f02e 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.domains_v1beta1.types import domains @@ -395,12 +395,12 @@ def retrieve_register_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_register_parameters" not in self._stubs: - self._stubs[ - "retrieve_register_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/RetrieveRegisterParameters", - request_serializer=domains.RetrieveRegisterParametersRequest.serialize, - response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + self._stubs["retrieve_register_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/RetrieveRegisterParameters", + request_serializer=domains.RetrieveRegisterParametersRequest.serialize, + response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + ) ) return self._stubs["retrieve_register_parameters"] @@ -469,12 +469,12 @@ def retrieve_transfer_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_transfer_parameters" not in self._stubs: - self._stubs[ - "retrieve_transfer_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/RetrieveTransferParameters", - request_serializer=domains.RetrieveTransferParametersRequest.serialize, - response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + self._stubs["retrieve_transfer_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/RetrieveTransferParameters", + request_serializer=domains.RetrieveTransferParametersRequest.serialize, + response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + ) ) return self._stubs["retrieve_transfer_parameters"] @@ -636,12 +636,12 @@ def configure_management_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_management_settings" not in self._stubs: - self._stubs[ - "configure_management_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/ConfigureManagementSettings", - request_serializer=domains.ConfigureManagementSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_management_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/ConfigureManagementSettings", + request_serializer=domains.ConfigureManagementSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_management_settings"] @@ -691,12 +691,12 @@ def configure_contact_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_contact_settings" not in self._stubs: - self._stubs[ - "configure_contact_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/ConfigureContactSettings", - request_serializer=domains.ConfigureContactSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_contact_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/ConfigureContactSettings", + request_serializer=domains.ConfigureContactSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_contact_settings"] @@ -807,12 +807,12 @@ def retrieve_authorization_code( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_authorization_code" not in self._stubs: - self._stubs[ - "retrieve_authorization_code" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/RetrieveAuthorizationCode", - request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, - response_deserializer=domains.AuthorizationCode.deserialize, + self._stubs["retrieve_authorization_code"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/RetrieveAuthorizationCode", + request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, + response_deserializer=domains.AuthorizationCode.deserialize, + ) ) return self._stubs["retrieve_authorization_code"] diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc_asyncio.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc_asyncio.py index 5212c7e21d48..4f9a34e789ab 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc_asyncio.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.domains_v1beta1.types import domains @@ -405,12 +405,12 @@ def retrieve_register_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_register_parameters" not in self._stubs: - self._stubs[ - "retrieve_register_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/RetrieveRegisterParameters", - request_serializer=domains.RetrieveRegisterParametersRequest.serialize, - response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + self._stubs["retrieve_register_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/RetrieveRegisterParameters", + request_serializer=domains.RetrieveRegisterParametersRequest.serialize, + response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + ) ) return self._stubs["retrieve_register_parameters"] @@ -479,12 +479,12 @@ def retrieve_transfer_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_transfer_parameters" not in self._stubs: - self._stubs[ - "retrieve_transfer_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/RetrieveTransferParameters", - request_serializer=domains.RetrieveTransferParametersRequest.serialize, - response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + self._stubs["retrieve_transfer_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/RetrieveTransferParameters", + request_serializer=domains.RetrieveTransferParametersRequest.serialize, + response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + ) ) return self._stubs["retrieve_transfer_parameters"] @@ -649,12 +649,12 @@ def configure_management_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_management_settings" not in self._stubs: - self._stubs[ - "configure_management_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/ConfigureManagementSettings", - request_serializer=domains.ConfigureManagementSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_management_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/ConfigureManagementSettings", + request_serializer=domains.ConfigureManagementSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_management_settings"] @@ -708,12 +708,12 @@ def configure_contact_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_contact_settings" not in self._stubs: - self._stubs[ - "configure_contact_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/ConfigureContactSettings", - request_serializer=domains.ConfigureContactSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_contact_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/ConfigureContactSettings", + request_serializer=domains.ConfigureContactSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_contact_settings"] @@ -828,12 +828,12 @@ def retrieve_authorization_code( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_authorization_code" not in self._stubs: - self._stubs[ - "retrieve_authorization_code" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/RetrieveAuthorizationCode", - request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, - response_deserializer=domains.AuthorizationCode.deserialize, + self._stubs["retrieve_authorization_code"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/RetrieveAuthorizationCode", + request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, + response_deserializer=domains.AuthorizationCode.deserialize, + ) ) return self._stubs["retrieve_authorization_code"] diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/rest.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/rest.py index 8891877fccfd..ecc0fa7b1951 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/rest.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1112,9 +1112,7 @@ def __call__( """ - http_options = ( - _BaseDomainsRestTransport._BaseConfigureContactSettings._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseConfigureContactSettings._get_http_options() request, metadata = self._interceptor.pre_configure_contact_settings( request, metadata @@ -1419,9 +1417,7 @@ def __call__( """ - http_options = ( - _BaseDomainsRestTransport._BaseConfigureManagementSettings._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseConfigureManagementSettings._get_http_options() request, metadata = self._interceptor.pre_configure_management_settings( request, metadata @@ -1488,11 +1484,10 @@ def __call__( resp = self._interceptor.post_configure_management_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_configure_management_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_configure_management_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2349,9 +2344,7 @@ def __call__( Defines an authorization code. """ - http_options = ( - _BaseDomainsRestTransport._BaseResetAuthorizationCode._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseResetAuthorizationCode._get_http_options() request, metadata = self._interceptor.pre_reset_authorization_code( request, metadata @@ -2501,9 +2494,7 @@ def __call__( Defines an authorization code. """ - http_options = ( - _BaseDomainsRestTransport._BaseRetrieveAuthorizationCode._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseRetrieveAuthorizationCode._get_http_options() request, metadata = self._interceptor.pre_retrieve_authorization_code( request, metadata @@ -2648,9 +2639,7 @@ def __call__( Response for the ``RetrieveRegisterParameters`` method. """ - http_options = ( - _BaseDomainsRestTransport._BaseRetrieveRegisterParameters._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseRetrieveRegisterParameters._get_http_options() request, metadata = self._interceptor.pre_retrieve_register_parameters( request, metadata @@ -2797,9 +2786,7 @@ def __call__( Response for the ``RetrieveTransferParameters`` method. """ - http_options = ( - _BaseDomainsRestTransport._BaseRetrieveTransferParameters._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseRetrieveTransferParameters._get_http_options() request, metadata = self._interceptor.pre_retrieve_transfer_parameters( request, metadata @@ -3351,7 +3338,9 @@ def configure_contact_settings( ) -> Callable[[domains.ConfigureContactSettingsRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ConfigureContactSettings(self._session, self._host, self._interceptor) # type: ignore + return self._ConfigureContactSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def configure_dns_settings( @@ -3369,7 +3358,9 @@ def configure_management_settings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ConfigureManagementSettings(self._session, self._host, self._interceptor) # type: ignore + return self._ConfigureManagementSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_registration( @@ -3419,7 +3410,9 @@ def reset_authorization_code( ) -> Callable[[domains.ResetAuthorizationCodeRequest], domains.AuthorizationCode]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ResetAuthorizationCode(self._session, self._host, self._interceptor) # type: ignore + return self._ResetAuthorizationCode( + self._session, self._host, self._interceptor + ) # type: ignore @property def retrieve_authorization_code( @@ -3429,7 +3422,9 @@ def retrieve_authorization_code( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RetrieveAuthorizationCode(self._session, self._host, self._interceptor) # type: ignore + return self._RetrieveAuthorizationCode( + self._session, self._host, self._interceptor + ) # type: ignore @property def retrieve_register_parameters( @@ -3440,7 +3435,9 @@ def retrieve_register_parameters( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RetrieveRegisterParameters(self._session, self._host, self._interceptor) # type: ignore + return self._RetrieveRegisterParameters( + self._session, self._host, self._interceptor + ) # type: ignore @property def retrieve_transfer_parameters( @@ -3451,7 +3448,9 @@ def retrieve_transfer_parameters( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RetrieveTransferParameters(self._session, self._host, self._interceptor) # type: ignore + return self._RetrieveTransferParameters( + self._session, self._host, self._interceptor + ) # type: ignore @property def search_domains( diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/types/domains.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/types/domains.py index a523f0d72845..7bf91fee45f3 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/types/domains.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/types/domains.py @@ -91,6 +91,7 @@ class ContactPrivacy(proto.Enum): details, see `the registration privacy article `__. """ + CONTACT_PRIVACY_UNSPECIFIED = 0 PUBLIC_CONTACT_DATA = 1 PRIVATE_CONTACT_DATA = 2 @@ -110,6 +111,7 @@ class DomainNotice(proto.Enum): `how to get an SSL certificate `__. """ + DOMAIN_NOTICE_UNSPECIFIED = 0 HSTS_PRELOADED = 1 @@ -125,6 +127,7 @@ class ContactNotice(proto.Enum): ``ContactSettings`` to ``PUBLIC_CONTACT_DATA``, which exposes contact data publicly. """ + CONTACT_NOTICE_UNSPECIFIED = 0 PUBLIC_CONTACT_DATA_ACKNOWLEDGEMENT = 1 @@ -142,6 +145,7 @@ class TransferLockState(proto.Enum): The domain is locked and cannot be transferred to another registrar. """ + TRANSFER_LOCK_STATE_UNSPECIFIED = 0 UNLOCKED = 1 LOCKED = 2 @@ -256,6 +260,7 @@ class State(proto.Enum): shown about it may be stale. Domains in this state are not automatically renewed by Cloud Domains. """ + STATE_UNSPECIFIED = 0 REGISTRATION_PENDING = 1 REGISTRATION_FAILED = 2 @@ -285,6 +290,7 @@ class Issue(proto.Enum): verification email, call ConfigureContactSettings and provide the current ``registrant_contact.email``. """ + ISSUE_UNSPECIFIED = 0 CONTACT_SUPPORT = 1 UNVERIFIED_EMAIL = 2 @@ -381,6 +387,7 @@ class RenewalMethod(proto.Enum): To manage the domain's current billing and renewal settings, go to `Google Domains `__. """ + RENEWAL_METHOD_UNSPECIFIED = 0 AUTOMATIC_RENEWAL = 1 MANUAL_RENEWAL = 2 @@ -441,6 +448,7 @@ class DsState(proto.Enum): ``Registration``'s ``dns_provider`` field is already DNSSEC-signed. """ + DS_STATE_UNSPECIFIED = 0 DS_RECORDS_UNPUBLISHED = 1 DS_RECORDS_PUBLISHED = 2 @@ -581,6 +589,7 @@ class Algorithm(proto.Enum): Private algorithm OID. Cannot be used for new deployments. """ + ALGORITHM_UNSPECIFIED = 0 RSAMD5 = 1 DH = 2 @@ -616,6 +625,7 @@ class DigestType(proto.Enum): SHA384 (4): SHA-384. """ + DIGEST_TYPE_UNSPECIFIED = 0 SHA1 = 1 SHA256 = 2 @@ -1370,6 +1380,7 @@ class Availability(proto.Enum): availability, generally due to system maintenance at the domain name registry. """ + AVAILABILITY_UNSPECIFIED = 0 AVAILABLE = 1 UNAVAILABLE = 2 diff --git a/packages/google-cloud-domains/mypy.ini b/packages/google-cloud-domains/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-domains/mypy.ini +++ b/packages/google-cloud-domains/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-domains/noxfile.py b/packages/google-cloud-domains/noxfile.py index 652bca03e96c..8fe1e110808a 100644 --- a/packages/google-cloud-domains/noxfile.py +++ b/packages/google-cloud-domains/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-domains/tests/unit/gapic/domains_v1/test_domains.py b/packages/google-cloud-domains/tests/unit/gapic/domains_v1/test_domains.py index f79f8e822554..7bff3fed5300 100644 --- a/packages/google-cloud-domains/tests/unit/gapic/domains_v1/test_domains.py +++ b/packages/google-cloud-domains/tests/unit/gapic/domains_v1/test_domains.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.type.money_pb2 as money_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +60,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.type.money_pb2 as money_pb2 # type: ignore -import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.cloud.domains_v1.services.domains import ( DomainsAsyncClient, @@ -911,10 +911,9 @@ def test_domains_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +958,9 @@ def test_domains_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +996,9 @@ def test_domains_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1230,9 +1227,7 @@ def test_domains_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3080,9 +3075,9 @@ def test_list_registrations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_registrations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_registrations] = ( + mock_rpc + ) request = {} client.list_registrations(request) @@ -3625,9 +3620,9 @@ def test_get_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_registration] = ( + mock_rpc + ) request = {} client.get_registration(request) @@ -3957,9 +3952,9 @@ def test_update_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_registration] = ( + mock_rpc + ) request = {} client.update_registration(request) @@ -4692,9 +4687,9 @@ def test_configure_dns_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.configure_dns_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.configure_dns_settings] = ( + mock_rpc + ) request = {} client.configure_dns_settings(request) @@ -5460,9 +5455,9 @@ def test_export_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_registration] = ( + mock_rpc + ) request = {} client.export_registration(request) @@ -5805,9 +5800,9 @@ def test_delete_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_registration] = ( + mock_rpc + ) request = {} client.delete_registration(request) @@ -7771,9 +7766,9 @@ def test_list_registrations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_registrations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_registrations] = ( + mock_rpc + ) request = {} client.list_registrations(request) @@ -8029,9 +8024,9 @@ def test_get_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_registration] = ( + mock_rpc + ) request = {} client.get_registration(request) @@ -8213,9 +8208,9 @@ def test_update_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_registration] = ( + mock_rpc + ) request = {} client.update_registration(request) @@ -8602,9 +8597,9 @@ def test_configure_dns_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.configure_dns_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.configure_dns_settings] = ( + mock_rpc + ) request = {} client.configure_dns_settings(request) @@ -9007,9 +9002,9 @@ def test_export_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_registration] = ( + mock_rpc + ) request = {} client.export_registration(request) @@ -9191,9 +9186,9 @@ def test_delete_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_registration] = ( + mock_rpc + ) request = {} client.delete_registration(request) diff --git a/packages/google-cloud-domains/tests/unit/gapic/domains_v1beta1/test_domains.py b/packages/google-cloud-domains/tests/unit/gapic/domains_v1beta1/test_domains.py index f2f1b9fdd471..a6e1443d214f 100644 --- a/packages/google-cloud-domains/tests/unit/gapic/domains_v1beta1/test_domains.py +++ b/packages/google-cloud-domains/tests/unit/gapic/domains_v1beta1/test_domains.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.type.money_pb2 as money_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +60,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.type.money_pb2 as money_pb2 # type: ignore -import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.cloud.domains_v1beta1.services.domains import ( DomainsAsyncClient, @@ -911,10 +911,9 @@ def test_domains_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +958,9 @@ def test_domains_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +996,9 @@ def test_domains_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1230,9 +1227,7 @@ def test_domains_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3080,9 +3075,9 @@ def test_list_registrations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_registrations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_registrations] = ( + mock_rpc + ) request = {} client.list_registrations(request) @@ -3625,9 +3620,9 @@ def test_get_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_registration] = ( + mock_rpc + ) request = {} client.get_registration(request) @@ -3957,9 +3952,9 @@ def test_update_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_registration] = ( + mock_rpc + ) request = {} client.update_registration(request) @@ -4692,9 +4687,9 @@ def test_configure_dns_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.configure_dns_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.configure_dns_settings] = ( + mock_rpc + ) request = {} client.configure_dns_settings(request) @@ -5460,9 +5455,9 @@ def test_export_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_registration] = ( + mock_rpc + ) request = {} client.export_registration(request) @@ -5805,9 +5800,9 @@ def test_delete_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_registration] = ( + mock_rpc + ) request = {} client.delete_registration(request) @@ -7771,9 +7766,9 @@ def test_list_registrations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_registrations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_registrations] = ( + mock_rpc + ) request = {} client.list_registrations(request) @@ -8029,9 +8024,9 @@ def test_get_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_registration] = ( + mock_rpc + ) request = {} client.get_registration(request) @@ -8213,9 +8208,9 @@ def test_update_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_registration] = ( + mock_rpc + ) request = {} client.update_registration(request) @@ -8602,9 +8597,9 @@ def test_configure_dns_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.configure_dns_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.configure_dns_settings] = ( + mock_rpc + ) request = {} client.configure_dns_settings(request) @@ -9007,9 +9002,9 @@ def test_export_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_registration] = ( + mock_rpc + ) request = {} client.export_registration(request) @@ -9191,9 +9186,9 @@ def test_delete_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_registration] = ( + mock_rpc + ) request = {} client.delete_registration(request) diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/__init__.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/__init__.py index 00b43969262a..4dac2936478a 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/__init__.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.edge_container import EdgeContainerAsyncClient, EdgeContainerClient from .types.resources import ( Authorization, diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/async_client.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/async_client.py index 906c979cdf25..61c989af0685 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/async_client.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.edgecontainer_v1 import gapic_version as package_version @@ -47,11 +47,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.edgecontainer_v1.services.edge_container import pagers from google.cloud.edgecontainer_v1.types import resources, service @@ -138,7 +138,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EdgeContainerAsyncClient: The constructed client. """ - return EdgeContainerClient.from_service_account_info.__func__(EdgeContainerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EdgeContainerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EdgeContainerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +157,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EdgeContainerAsyncClient: The constructed client. """ - return EdgeContainerClient.from_service_account_file.__func__(EdgeContainerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EdgeContainerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EdgeContainerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/client.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/client.py index 326f0bfbe2e4..8085bc0f6bb0 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/client.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.edgecontainer_v1 import gapic_version as package_version @@ -64,11 +64,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.edgecontainer_v1.services.edge_container import pagers from google.cloud.edgecontainer_v1.types import resources, service @@ -747,11 +747,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EdgeContainerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EdgeContainerClient._read_environment_variables() + ) self._client_cert_source = EdgeContainerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -786,8 +784,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EdgeContainerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/pagers.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/pagers.py index 9a751fc44762..4999a9087dbe 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/pagers.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/base.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/base.py index 99bcb8b94863..b705181f1a2b 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/base.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.edgecontainer_v1 import gapic_version as package_version from google.cloud.edgecontainer_v1.types import resources, service @@ -596,13 +596,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc.py index a66b6d4b0839..22cc823d70cb 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.edgecontainer_v1.types import resources, service @@ -546,12 +546,12 @@ def generate_offline_credential( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_offline_credential" not in self._stubs: - self._stubs[ - "generate_offline_credential" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgecontainer.v1.EdgeContainer/GenerateOfflineCredential", - request_serializer=service.GenerateOfflineCredentialRequest.serialize, - response_deserializer=service.GenerateOfflineCredentialResponse.deserialize, + self._stubs["generate_offline_credential"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgecontainer.v1.EdgeContainer/GenerateOfflineCredential", + request_serializer=service.GenerateOfflineCredentialRequest.serialize, + response_deserializer=service.GenerateOfflineCredentialResponse.deserialize, + ) ) return self._stubs["generate_offline_credential"] diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc_asyncio.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc_asyncio.py index 16cb6a8ff144..a38434689122 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc_asyncio.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.edgecontainer_v1.types import resources, service @@ -559,12 +559,12 @@ def generate_offline_credential( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_offline_credential" not in self._stubs: - self._stubs[ - "generate_offline_credential" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgecontainer.v1.EdgeContainer/GenerateOfflineCredential", - request_serializer=service.GenerateOfflineCredentialRequest.serialize, - response_deserializer=service.GenerateOfflineCredentialResponse.deserialize, + self._stubs["generate_offline_credential"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgecontainer.v1.EdgeContainer/GenerateOfflineCredential", + request_serializer=service.GenerateOfflineCredentialRequest.serialize, + response_deserializer=service.GenerateOfflineCredentialResponse.deserialize, + ) ) return self._stubs["generate_offline_credential"] diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/rest.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/rest.py index 4cb3ae40513a..81d99c050534 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/rest.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1825,9 +1825,7 @@ def __call__( """ - http_options = ( - _BaseEdgeContainerRestTransport._BaseCreateVpnConnection._get_http_options() - ) + http_options = _BaseEdgeContainerRestTransport._BaseCreateVpnConnection._get_http_options() request, metadata = self._interceptor.pre_create_vpn_connection( request, metadata @@ -2269,9 +2267,7 @@ def __call__( """ - http_options = ( - _BaseEdgeContainerRestTransport._BaseDeleteVpnConnection._get_http_options() - ) + http_options = _BaseEdgeContainerRestTransport._BaseDeleteVpnConnection._get_http_options() request, metadata = self._interceptor.pre_delete_vpn_connection( request, metadata @@ -2414,9 +2410,7 @@ def __call__( An access token for a cluster. """ - http_options = ( - _BaseEdgeContainerRestTransport._BaseGenerateAccessToken._get_http_options() - ) + http_options = _BaseEdgeContainerRestTransport._BaseGenerateAccessToken._get_http_options() request, metadata = self._interceptor.pre_generate_access_token( request, metadata @@ -2565,9 +2559,7 @@ def __call__( An offline credential for a cluster. """ - http_options = ( - _BaseEdgeContainerRestTransport._BaseGenerateOfflineCredential._get_http_options() - ) + http_options = _BaseEdgeContainerRestTransport._BaseGenerateOfflineCredential._get_http_options() request, metadata = self._interceptor.pre_generate_offline_credential( request, metadata @@ -3313,9 +3305,7 @@ def __call__( A VPN connection . """ - http_options = ( - _BaseEdgeContainerRestTransport._BaseGetVpnConnection._get_http_options() - ) + http_options = _BaseEdgeContainerRestTransport._BaseGetVpnConnection._get_http_options() request, metadata = self._interceptor.pre_get_vpn_connection( request, metadata @@ -3893,9 +3883,7 @@ def __call__( """ - http_options = ( - _BaseEdgeContainerRestTransport._BaseListVpnConnections._get_http_options() - ) + http_options = _BaseEdgeContainerRestTransport._BaseListVpnConnections._get_http_options() request, metadata = self._interceptor.pre_list_vpn_connections( request, metadata @@ -4509,7 +4497,9 @@ def generate_offline_credential( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateOfflineCredential(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateOfflineCredential( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_cluster(self) -> Callable[[service.GetClusterRequest], resources.Cluster]: diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/resources.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/resources.py index 863e47ef4e16..ef7da6a122eb 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/resources.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/resources.py @@ -65,6 +65,7 @@ class KmsKeyState(proto.Enum): The key is unavailable for an unspecified reason. Dependent resources may be inaccessible. """ + KMS_KEY_STATE_UNSPECIFIED = 0 KMS_KEY_STATE_KEY_AVAILABLE = 1 KMS_KEY_STATE_KEY_UNAVAILABLE = 2 @@ -81,6 +82,7 @@ class ResourceState(proto.Enum): RESOURCE_STATE_LOCK_DOWN_PENDING (2): The resource is pending lock down. """ + RESOURCE_STATE_UNSPECIFIED = 0 RESOURCE_STATE_LOCK_DOWN = 1 RESOURCE_STATE_LOCK_DOWN_PENDING = 2 @@ -192,6 +194,7 @@ class Status(proto.Enum): The cluster is undergoing some work such as version upgrades, etc. """ + STATUS_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -211,6 +214,7 @@ class ReleaseChannel(proto.Enum): REGULAR (2): Regular release channel. """ + RELEASE_CHANNEL_UNSPECIFIED = 0 NONE = 1 REGULAR = 2 @@ -260,6 +264,7 @@ class SharedDeploymentPolicy(proto.Enum): control plane nodes and can only be deployed on worker nodes. """ + SHARED_DEPLOYMENT_POLICY_UNSPECIFIED = 0 ALLOWED = 1 DISALLOWED = 2 @@ -511,6 +516,7 @@ class Type(proto.Enum): GOOGLE_DRIVEN_UPGRADE (2): Upgrade driven by Google. """ + TYPE_UNSPECIFIED = 0 USER_INITIATED_UPGRADE = 1 GOOGLE_DRIVEN_UPGRADE = 2 @@ -524,6 +530,7 @@ class Schedule(proto.Enum): IMMEDIATELY (1): Immediately after receiving the request. """ + SCHEDULE_UNSPECIFIED = 0 IMMEDIATELY = 1 @@ -541,6 +548,7 @@ class State(proto.Enum): FAILED (3): The maintenance event failed. """ + STATE_UNSPECIFIED = 0 RECONCILING = 1 SUCCEEDED = 2 @@ -642,6 +650,7 @@ class State(proto.Enum): Google, but may have recently reconnected after a disconnection. It is still syncing back. """ + STATE_UNSPECIFIED = 0 DISCONNECTED = 1 CONNECTED = 2 @@ -731,11 +740,11 @@ class State(proto.Enum): number=16, message=SystemAddonsConfig, ) - external_load_balancer_ipv4_address_pools: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=17, + external_load_balancer_ipv4_address_pools: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=17, + ) ) control_plane_encryption: ControlPlaneEncryption = proto.Field( proto.MESSAGE, @@ -766,11 +775,11 @@ class State(proto.Enum): number=24, message=SurvivabilityConfig, ) - external_load_balancer_ipv6_address_pools: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=25, + external_load_balancer_ipv6_address_pools: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=25, + ) ) connection_state: ConnectionState = proto.Field( proto.MESSAGE, @@ -1165,6 +1174,7 @@ class BgpRoutingMode(proto.Enum): GLOBAL (2): Global mode. """ + BGP_ROUTING_MODE_UNSPECIFIED = 0 REGIONAL = 1 GLOBAL = 2 @@ -1219,6 +1229,7 @@ class State(proto.Enum): STATE_ERROR (3): Error occurred. """ + STATE_UNSPECIFIED = 0 STATE_CONNECTED = 1 STATE_CONNECTING = 2 @@ -1264,12 +1275,12 @@ class CloudVpn(proto.Message): number=3, message="VpnConnection.Details.CloudRouter", ) - cloud_vpns: MutableSequence[ - "VpnConnection.Details.CloudVpn" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="VpnConnection.Details.CloudVpn", + cloud_vpns: MutableSequence["VpnConnection.Details.CloudVpn"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="VpnConnection.Details.CloudVpn", + ) ) name: str = proto.Field( @@ -1375,6 +1386,7 @@ class RackType(proto.Enum): Expansion rack type, also known as standalone racks, added by customers on demand. """ + RACK_TYPE_UNSPECIFIED = 0 BASE = 1 EXPANSION = 2 @@ -1466,12 +1478,12 @@ class MaintenancePolicy(proto.Message): number=1, message="MaintenanceWindow", ) - maintenance_exclusions: MutableSequence[ - "MaintenanceExclusionWindow" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="MaintenanceExclusionWindow", + maintenance_exclusions: MutableSequence["MaintenanceExclusionWindow"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="MaintenanceExclusionWindow", + ) ) diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/service.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/service.py index f19271923157..d95dd230118a 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/service.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/service.py @@ -100,6 +100,7 @@ class StatusReason(proto.Enum): UPGRADE_PAUSED (1): The cluster upgrade is currently paused. """ + STATUS_REASON_UNSPECIFIED = 0 UPGRADE_PAUSED = 1 @@ -334,6 +335,7 @@ class Schedule(proto.Enum): The cluster is going to be upgraded immediately after receiving the request. """ + SCHEDULE_UNSPECIFIED = 0 IMMEDIATELY = 1 diff --git a/packages/google-cloud-edgecontainer/mypy.ini b/packages/google-cloud-edgecontainer/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-edgecontainer/mypy.ini +++ b/packages/google-cloud-edgecontainer/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-edgecontainer/noxfile.py b/packages/google-cloud-edgecontainer/noxfile.py index 09ad33986101..4887d02407e3 100644 --- a/packages/google-cloud-edgecontainer/noxfile.py +++ b/packages/google-cloud-edgecontainer/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-edgecontainer/tests/unit/gapic/edgecontainer_v1/test_edge_container.py b/packages/google-cloud-edgecontainer/tests/unit/gapic/edgecontainer_v1/test_edge_container.py index 91f9584ca588..45f28a143158 100644 --- a/packages/google-cloud-edgecontainer/tests/unit/gapic/edgecontainer_v1/test_edge_container.py +++ b/packages/google-cloud-edgecontainer/tests/unit/gapic/edgecontainer_v1/test_edge_container.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,22 +62,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.edgecontainer_v1.services.edge_container import ( EdgeContainerAsyncClient, @@ -959,10 +959,9 @@ def test_edge_container_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1007,10 +1006,9 @@ def test_edge_container_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1044,9 @@ def test_edge_container_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1296,9 +1293,7 @@ def test_edge_container_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3686,9 +3681,9 @@ def test_generate_access_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_access_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_access_token] = ( + mock_rpc + ) request = {} client.generate_access_token(request) @@ -5235,9 +5230,9 @@ def test_create_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_node_pool] = ( + mock_rpc + ) request = {} client.create_node_pool(request) @@ -5584,9 +5579,9 @@ def test_update_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_node_pool] = ( + mock_rpc + ) request = {} client.update_node_pool(request) @@ -5925,9 +5920,9 @@ def test_delete_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_node_pool] = ( + mock_rpc + ) request = {} client.delete_node_pool(request) @@ -7133,9 +7128,9 @@ def test_list_vpn_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_vpn_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_vpn_connections] = ( + mock_rpc + ) request = {} client.list_vpn_connections(request) @@ -7690,9 +7685,9 @@ def test_get_vpn_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_vpn_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_vpn_connection] = ( + mock_rpc + ) request = {} client.get_vpn_connection(request) @@ -8045,9 +8040,9 @@ def test_create_vpn_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_vpn_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_vpn_connection] = ( + mock_rpc + ) request = {} client.create_vpn_connection(request) @@ -8413,9 +8408,9 @@ def test_delete_vpn_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_vpn_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_vpn_connection] = ( + mock_rpc + ) request = {} client.delete_vpn_connection(request) @@ -8759,9 +8754,9 @@ def test_get_server_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_config] = ( + mock_rpc + ) request = {} client.get_server_config(request) @@ -10146,9 +10141,9 @@ def test_generate_access_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_access_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_access_token] = ( + mock_rpc + ) request = {} client.generate_access_token(request) @@ -10953,9 +10948,9 @@ def test_create_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_node_pool] = ( + mock_rpc + ) request = {} client.create_node_pool(request) @@ -11173,9 +11168,9 @@ def test_update_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_node_pool] = ( + mock_rpc + ) request = {} client.update_node_pool(request) @@ -11277,9 +11272,9 @@ def test_delete_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_node_pool] = ( + mock_rpc + ) request = {} client.delete_node_pool(request) @@ -11892,9 +11887,9 @@ def test_list_vpn_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_vpn_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_vpn_connections] = ( + mock_rpc + ) request = {} client.list_vpn_connections(request) @@ -12156,9 +12151,9 @@ def test_get_vpn_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_vpn_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_vpn_connection] = ( + mock_rpc + ) request = {} client.get_vpn_connection(request) @@ -12341,9 +12336,9 @@ def test_create_vpn_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_vpn_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_vpn_connection] = ( + mock_rpc + ) request = {} client.create_vpn_connection(request) @@ -12562,9 +12557,9 @@ def test_delete_vpn_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_vpn_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_vpn_connection] = ( + mock_rpc + ) request = {} client.delete_vpn_connection(request) @@ -12745,9 +12740,9 @@ def test_get_server_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_config] = ( + mock_rpc + ) request = {} client.get_server_config(request) diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/__init__.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/__init__.py index 6b4b5d55cdf3..32b2e3d74114 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/__init__.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.edge_network import EdgeNetworkAsyncClient, EdgeNetworkClient from .types.resources import ( Interconnect, diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/async_client.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/async_client.py index 8c80b3739064..8e461f756b5c 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/async_client.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.edgenetwork_v1 import gapic_version as package_version @@ -47,11 +47,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.edgenetwork_v1.services.edge_network import pagers from google.cloud.edgenetwork_v1.types import resources, service @@ -137,7 +137,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EdgeNetworkAsyncClient: The constructed client. """ - return EdgeNetworkClient.from_service_account_info.__func__(EdgeNetworkAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EdgeNetworkClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EdgeNetworkAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -153,7 +156,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EdgeNetworkAsyncClient: The constructed client. """ - return EdgeNetworkClient.from_service_account_file.__func__(EdgeNetworkAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EdgeNetworkClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EdgeNetworkAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/client.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/client.py index b0eb3929b39c..852d8e1d296a 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/client.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.edgenetwork_v1 import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.edgenetwork_v1.services.edge_network import pagers from google.cloud.edgenetwork_v1.types import resources, service @@ -751,11 +751,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EdgeNetworkClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EdgeNetworkClient._read_environment_variables() + ) self._client_cert_source = EdgeNetworkClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -790,8 +788,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EdgeNetworkTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/pagers.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/pagers.py index 8fa6dd096742..c3d3c6751b15 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/pagers.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/base.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/base.py index 19e3fac4f3ed..fb26eec3267a 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/base.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.edgenetwork_v1 import gapic_version as package_version from google.cloud.edgenetwork_v1.types import resources, service @@ -704,13 +704,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc.py index 913869ee2c53..918f4473649c 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.edgenetwork_v1.types import resources, service @@ -786,12 +786,12 @@ def list_interconnect_attachments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_interconnect_attachments" not in self._stubs: - self._stubs[ - "list_interconnect_attachments" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/ListInterconnectAttachments", - request_serializer=service.ListInterconnectAttachmentsRequest.serialize, - response_deserializer=service.ListInterconnectAttachmentsResponse.deserialize, + self._stubs["list_interconnect_attachments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/ListInterconnectAttachments", + request_serializer=service.ListInterconnectAttachmentsRequest.serialize, + response_deserializer=service.ListInterconnectAttachmentsResponse.deserialize, + ) ) return self._stubs["list_interconnect_attachments"] @@ -816,12 +816,12 @@ def get_interconnect_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_interconnect_attachment" not in self._stubs: - self._stubs[ - "get_interconnect_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/GetInterconnectAttachment", - request_serializer=service.GetInterconnectAttachmentRequest.serialize, - response_deserializer=resources.InterconnectAttachment.deserialize, + self._stubs["get_interconnect_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/GetInterconnectAttachment", + request_serializer=service.GetInterconnectAttachmentRequest.serialize, + response_deserializer=resources.InterconnectAttachment.deserialize, + ) ) return self._stubs["get_interconnect_attachment"] @@ -847,12 +847,12 @@ def create_interconnect_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_interconnect_attachment" not in self._stubs: - self._stubs[ - "create_interconnect_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/CreateInterconnectAttachment", - request_serializer=service.CreateInterconnectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_interconnect_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/CreateInterconnectAttachment", + request_serializer=service.CreateInterconnectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_interconnect_attachment"] @@ -877,12 +877,12 @@ def delete_interconnect_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_interconnect_attachment" not in self._stubs: - self._stubs[ - "delete_interconnect_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/DeleteInterconnectAttachment", - request_serializer=service.DeleteInterconnectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_interconnect_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/DeleteInterconnectAttachment", + request_serializer=service.DeleteInterconnectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_interconnect_attachment"] diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc_asyncio.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc_asyncio.py index f75322be010e..45abb2690189 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc_asyncio.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.edgenetwork_v1.types import resources, service @@ -805,12 +805,12 @@ def list_interconnect_attachments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_interconnect_attachments" not in self._stubs: - self._stubs[ - "list_interconnect_attachments" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/ListInterconnectAttachments", - request_serializer=service.ListInterconnectAttachmentsRequest.serialize, - response_deserializer=service.ListInterconnectAttachmentsResponse.deserialize, + self._stubs["list_interconnect_attachments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/ListInterconnectAttachments", + request_serializer=service.ListInterconnectAttachmentsRequest.serialize, + response_deserializer=service.ListInterconnectAttachmentsResponse.deserialize, + ) ) return self._stubs["list_interconnect_attachments"] @@ -836,12 +836,12 @@ def get_interconnect_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_interconnect_attachment" not in self._stubs: - self._stubs[ - "get_interconnect_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/GetInterconnectAttachment", - request_serializer=service.GetInterconnectAttachmentRequest.serialize, - response_deserializer=resources.InterconnectAttachment.deserialize, + self._stubs["get_interconnect_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/GetInterconnectAttachment", + request_serializer=service.GetInterconnectAttachmentRequest.serialize, + response_deserializer=resources.InterconnectAttachment.deserialize, + ) ) return self._stubs["get_interconnect_attachment"] @@ -868,12 +868,12 @@ def create_interconnect_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_interconnect_attachment" not in self._stubs: - self._stubs[ - "create_interconnect_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/CreateInterconnectAttachment", - request_serializer=service.CreateInterconnectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_interconnect_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/CreateInterconnectAttachment", + request_serializer=service.CreateInterconnectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_interconnect_attachment"] @@ -899,12 +899,12 @@ def delete_interconnect_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_interconnect_attachment" not in self._stubs: - self._stubs[ - "delete_interconnect_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/DeleteInterconnectAttachment", - request_serializer=service.DeleteInterconnectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_interconnect_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/DeleteInterconnectAttachment", + request_serializer=service.DeleteInterconnectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_interconnect_attachment"] diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/rest.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/rest.py index b292f21e2283..907680a725f7 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/rest.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1856,9 +1856,7 @@ def __call__( """ - http_options = ( - _BaseEdgeNetworkRestTransport._BaseCreateInterconnectAttachment._get_http_options() - ) + http_options = _BaseEdgeNetworkRestTransport._BaseCreateInterconnectAttachment._get_http_options() request, metadata = self._interceptor.pre_create_interconnect_attachment( request, metadata @@ -1927,11 +1925,10 @@ def __call__( resp = self._interceptor.post_create_interconnect_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_interconnect_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_interconnect_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2485,9 +2482,7 @@ def __call__( """ - http_options = ( - _BaseEdgeNetworkRestTransport._BaseDeleteInterconnectAttachment._get_http_options() - ) + http_options = _BaseEdgeNetworkRestTransport._BaseDeleteInterconnectAttachment._get_http_options() request, metadata = self._interceptor.pre_delete_interconnect_attachment( request, metadata @@ -2551,11 +2546,10 @@ def __call__( resp = self._interceptor.post_delete_interconnect_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_interconnect_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_interconnect_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3084,9 +3078,7 @@ def __call__( """ - http_options = ( - _BaseEdgeNetworkRestTransport._BaseDiagnoseInterconnect._get_http_options() - ) + http_options = _BaseEdgeNetworkRestTransport._BaseDiagnoseInterconnect._get_http_options() request, metadata = self._interceptor.pre_diagnose_interconnect( request, metadata @@ -3682,9 +3674,7 @@ def __call__( """ - http_options = ( - _BaseEdgeNetworkRestTransport._BaseGetInterconnectAttachment._get_http_options() - ) + http_options = _BaseEdgeNetworkRestTransport._BaseGetInterconnectAttachment._get_http_options() request, metadata = self._interceptor.pre_get_interconnect_attachment( request, metadata @@ -4575,9 +4565,7 @@ def __call__( """ - http_options = ( - _BaseEdgeNetworkRestTransport._BaseListInterconnectAttachments._get_http_options() - ) + http_options = _BaseEdgeNetworkRestTransport._BaseListInterconnectAttachments._get_http_options() request, metadata = self._interceptor.pre_list_interconnect_attachments( request, metadata @@ -4643,11 +4631,10 @@ def __call__( resp = self._interceptor.post_list_interconnect_attachments(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_interconnect_attachments_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_interconnect_attachments_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5749,7 +5736,9 @@ def create_interconnect_attachment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateInterconnectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._CreateInterconnectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_network( @@ -5783,7 +5772,9 @@ def delete_interconnect_attachment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteInterconnectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteInterconnectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_network( @@ -5851,7 +5842,9 @@ def get_interconnect_attachment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetInterconnectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._GetInterconnectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_network(self) -> Callable[[service.GetNetworkRequest], resources.Network]: @@ -5894,7 +5887,9 @@ def list_interconnect_attachments( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListInterconnectAttachments(self._session, self._host, self._interceptor) # type: ignore + return self._ListInterconnectAttachments( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_interconnects( diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/resources.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/resources.py index 6f2eeea935c5..ec273aae1fae 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/resources.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/resources.py @@ -63,6 +63,7 @@ class ResourceState(proto.Enum): STATE_DELETING (5): The resource is under deletion. """ + STATE_UNKNOWN = 0 STATE_PENDING = 1 STATE_PROVISIONING = 2 @@ -84,6 +85,7 @@ class RemotePeeringNetworkType(proto.Enum): Customer's untrust network that has internet access. """ + REMOTE_PEERING_NETWORK_TYPE_UNSPECIFIED = 0 REMOTE_PEERING_NETWORK_TYPE_CUSTOMER_INTERNAL = 1 REMOTE_PEERING_NETWORK_TYPE_CUSTOMER_INTERNET = 2 @@ -247,6 +249,7 @@ class BondingType(proto.Enum): NON_BONDED (2): Single homed. """ + BONDING_TYPE_UNSPECIFIED = 0 BONDED = 1 NON_BONDED = 2 @@ -346,6 +349,7 @@ class InterconnectType(proto.Enum): DEDICATED (1): Dedicated Interconnect. """ + INTERCONNECT_TYPE_UNSPECIFIED = 0 DEDICATED = 1 @@ -809,12 +813,12 @@ class LinkStatus(proto.Message): number=2, message="InterconnectDiagnostics.LinkLACPStatus", ) - lldp_statuses: MutableSequence[ - "InterconnectDiagnostics.LinkLLDPStatus" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="InterconnectDiagnostics.LinkLLDPStatus", + lldp_statuses: MutableSequence["InterconnectDiagnostics.LinkLLDPStatus"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="InterconnectDiagnostics.LinkLLDPStatus", + ) ) packet_counts: "InterconnectDiagnostics.PacketCounts" = proto.Field( proto.MESSAGE, @@ -916,6 +920,7 @@ class State(proto.Enum): this means the rest of the object should be empty. """ + UNKNOWN = 0 ACTIVE = 1 DETACHED = 2 @@ -1067,6 +1072,7 @@ class BgpStatus(proto.Enum): The DOWN state indicating BGP session is not established yet. """ + UNKNOWN = 0 UP = 1 DOWN = 2 diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/service.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/service.py index 2c46f906697a..c04dd1bf64fa 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/service.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/service.py @@ -712,12 +712,12 @@ class ListInterconnectAttachmentsResponse(proto.Message): def raw_page(self): return self - interconnect_attachments: MutableSequence[ - resources.InterconnectAttachment - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.InterconnectAttachment, + interconnect_attachments: MutableSequence[resources.InterconnectAttachment] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.InterconnectAttachment, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1180,6 +1180,7 @@ class MacsecStatus(proto.Enum): At least one relevant link does not have any MACsec sessions up. """ + MACSEC_STATUS_UNSPECIFIED = 0 SECURE = 1 UNSECURE = 2 diff --git a/packages/google-cloud-edgenetwork/mypy.ini b/packages/google-cloud-edgenetwork/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-edgenetwork/mypy.ini +++ b/packages/google-cloud-edgenetwork/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-edgenetwork/noxfile.py b/packages/google-cloud-edgenetwork/noxfile.py index 447457fd10c8..2880624f0e3e 100644 --- a/packages/google-cloud-edgenetwork/noxfile.py +++ b/packages/google-cloud-edgenetwork/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-edgenetwork/tests/unit/gapic/edgenetwork_v1/test_edge_network.py b/packages/google-cloud-edgenetwork/tests/unit/gapic/edgenetwork_v1/test_edge_network.py index f0869e9f5519..a7a15b409fcc 100644 --- a/packages/google-cloud-edgenetwork/tests/unit/gapic/edgenetwork_v1/test_edge_network.py +++ b/packages/google-cloud-edgenetwork/tests/unit/gapic/edgenetwork_v1/test_edge_network.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.edgenetwork_v1.services.edge_network import ( EdgeNetworkAsyncClient, @@ -936,10 +936,9 @@ def test_edge_network_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +983,9 @@ def test_edge_network_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1021,9 @@ def test_edge_network_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1259,9 +1256,7 @@ def test_edge_network_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3382,9 +3377,9 @@ def test_diagnose_network_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_network - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_network] = ( + mock_rpc + ) request = {} client.diagnose_network(request) @@ -6287,9 +6282,9 @@ def test_list_interconnects_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_interconnects - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_interconnects] = ( + mock_rpc + ) request = {} client.list_interconnects(request) @@ -6843,9 +6838,9 @@ def test_get_interconnect_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_interconnect - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_interconnect] = ( + mock_rpc + ) request = {} client.get_interconnect(request) @@ -7189,9 +7184,9 @@ def test_diagnose_interconnect_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_interconnect - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_interconnect] = ( + mock_rpc + ) request = {} client.diagnose_interconnect(request) @@ -12348,9 +12343,9 @@ def test_diagnose_network_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_network - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_network] = ( + mock_rpc + ) request = {} client.diagnose_network(request) @@ -13949,9 +13944,9 @@ def test_list_interconnects_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_interconnects - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_interconnects] = ( + mock_rpc + ) request = {} client.list_interconnects(request) @@ -14209,9 +14204,9 @@ def test_get_interconnect_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_interconnect - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_interconnect] = ( + mock_rpc + ) request = {} client.get_interconnect(request) @@ -14394,9 +14389,9 @@ def test_diagnose_interconnect_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_interconnect - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_interconnect] = ( + mock_rpc + ) request = {} client.diagnose_interconnect(request) diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/__init__.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/__init__.py index 2decda5279f9..3e14962909a3 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/__init__.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.enterprise_knowledge_graph_service import ( EnterpriseKnowledgeGraphServiceAsyncClient, EnterpriseKnowledgeGraphServiceClient, diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/async_client.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/async_client.py index 83cacabc2e8f..2a5c91db0390 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/async_client.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.enterpriseknowledgegraph_v1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.enterpriseknowledgegraph_v1.services.enterprise_knowledge_graph_service import ( pagers, @@ -155,7 +155,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EnterpriseKnowledgeGraphServiceAsyncClient: The constructed client. """ - return EnterpriseKnowledgeGraphServiceClient.from_service_account_info.__func__(EnterpriseKnowledgeGraphServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EnterpriseKnowledgeGraphServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + EnterpriseKnowledgeGraphServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -171,7 +176,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EnterpriseKnowledgeGraphServiceAsyncClient: The constructed client. """ - return EnterpriseKnowledgeGraphServiceClient.from_service_account_file.__func__(EnterpriseKnowledgeGraphServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EnterpriseKnowledgeGraphServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + EnterpriseKnowledgeGraphServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -209,7 +219,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return EnterpriseKnowledgeGraphServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return EnterpriseKnowledgeGraphServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> EnterpriseKnowledgeGraphServiceTransport: diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/client.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/client.py index d8f840ed1147..294603fee687 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/client.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.enterpriseknowledgegraph_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.longrunning import operations_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.enterpriseknowledgegraph_v1.services.enterprise_knowledge_graph_service import ( pagers, @@ -88,13 +88,11 @@ class EnterpriseKnowledgeGraphServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EnterpriseKnowledgeGraphServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EnterpriseKnowledgeGraphServiceTransport]] _transport_registry["grpc"] = EnterpriseKnowledgeGraphServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = EnterpriseKnowledgeGraphServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + EnterpriseKnowledgeGraphServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = EnterpriseKnowledgeGraphServiceRestTransport def get_transport_class( @@ -727,11 +725,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EnterpriseKnowledgeGraphServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EnterpriseKnowledgeGraphServiceClient._read_environment_variables() + ) self._client_cert_source = ( EnterpriseKnowledgeGraphServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -772,8 +768,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EnterpriseKnowledgeGraphServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/pagers.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/pagers.py index ea6a18ebf605..cd670da937c0 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/pagers.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/__init__.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/__init__.py index 31a0cfa042ce..f4bb9b9d16c0 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/__init__.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/__init__.py @@ -25,13 +25,11 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[EnterpriseKnowledgeGraphServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[EnterpriseKnowledgeGraphServiceTransport]] _transport_registry["grpc"] = EnterpriseKnowledgeGraphServiceGrpcTransport -_transport_registry[ - "grpc_asyncio" -] = EnterpriseKnowledgeGraphServiceGrpcAsyncIOTransport +_transport_registry["grpc_asyncio"] = ( + EnterpriseKnowledgeGraphServiceGrpcAsyncIOTransport +) _transport_registry["rest"] = EnterpriseKnowledgeGraphServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/base.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/base.py index b376378ac647..e6bb1a2e2d32 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/base.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.enterpriseknowledgegraph_v1 import gapic_version as package_version from google.cloud.enterpriseknowledgegraph_v1.types import service diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc.py index 8eb4e031e0c5..d7f889bcaf58 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.enterpriseknowledgegraph_v1.types import service @@ -349,12 +349,12 @@ def create_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "create_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CreateEntityReconciliationJob", - request_serializer=service.CreateEntityReconciliationJobRequest.serialize, - response_deserializer=service.EntityReconciliationJob.deserialize, + self._stubs["create_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CreateEntityReconciliationJob", + request_serializer=service.CreateEntityReconciliationJobRequest.serialize, + response_deserializer=service.EntityReconciliationJob.deserialize, + ) ) return self._stubs["create_entity_reconciliation_job"] @@ -379,12 +379,12 @@ def get_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "get_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/GetEntityReconciliationJob", - request_serializer=service.GetEntityReconciliationJobRequest.serialize, - response_deserializer=service.EntityReconciliationJob.deserialize, + self._stubs["get_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/GetEntityReconciliationJob", + request_serializer=service.GetEntityReconciliationJobRequest.serialize, + response_deserializer=service.EntityReconciliationJob.deserialize, + ) ) return self._stubs["get_entity_reconciliation_job"] @@ -411,12 +411,12 @@ def list_entity_reconciliation_jobs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_entity_reconciliation_jobs" not in self._stubs: - self._stubs[ - "list_entity_reconciliation_jobs" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/ListEntityReconciliationJobs", - request_serializer=service.ListEntityReconciliationJobsRequest.serialize, - response_deserializer=service.ListEntityReconciliationJobsResponse.deserialize, + self._stubs["list_entity_reconciliation_jobs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/ListEntityReconciliationJobs", + request_serializer=service.ListEntityReconciliationJobsRequest.serialize, + response_deserializer=service.ListEntityReconciliationJobsResponse.deserialize, + ) ) return self._stubs["list_entity_reconciliation_jobs"] @@ -441,12 +441,12 @@ def cancel_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "cancel_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CancelEntityReconciliationJob", - request_serializer=service.CancelEntityReconciliationJobRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["cancel_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CancelEntityReconciliationJob", + request_serializer=service.CancelEntityReconciliationJobRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["cancel_entity_reconciliation_job"] @@ -472,12 +472,12 @@ def delete_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "delete_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/DeleteEntityReconciliationJob", - request_serializer=service.DeleteEntityReconciliationJobRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/DeleteEntityReconciliationJob", + request_serializer=service.DeleteEntityReconciliationJobRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_entity_reconciliation_job"] diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc_asyncio.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc_asyncio.py index 172fc31a59d7..46910f13641f 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.enterpriseknowledgegraph_v1.types import service @@ -358,12 +358,12 @@ def create_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "create_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CreateEntityReconciliationJob", - request_serializer=service.CreateEntityReconciliationJobRequest.serialize, - response_deserializer=service.EntityReconciliationJob.deserialize, + self._stubs["create_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CreateEntityReconciliationJob", + request_serializer=service.CreateEntityReconciliationJobRequest.serialize, + response_deserializer=service.EntityReconciliationJob.deserialize, + ) ) return self._stubs["create_entity_reconciliation_job"] @@ -389,12 +389,12 @@ def get_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "get_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/GetEntityReconciliationJob", - request_serializer=service.GetEntityReconciliationJobRequest.serialize, - response_deserializer=service.EntityReconciliationJob.deserialize, + self._stubs["get_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/GetEntityReconciliationJob", + request_serializer=service.GetEntityReconciliationJobRequest.serialize, + response_deserializer=service.EntityReconciliationJob.deserialize, + ) ) return self._stubs["get_entity_reconciliation_job"] @@ -421,12 +421,12 @@ def list_entity_reconciliation_jobs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_entity_reconciliation_jobs" not in self._stubs: - self._stubs[ - "list_entity_reconciliation_jobs" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/ListEntityReconciliationJobs", - request_serializer=service.ListEntityReconciliationJobsRequest.serialize, - response_deserializer=service.ListEntityReconciliationJobsResponse.deserialize, + self._stubs["list_entity_reconciliation_jobs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/ListEntityReconciliationJobs", + request_serializer=service.ListEntityReconciliationJobsRequest.serialize, + response_deserializer=service.ListEntityReconciliationJobsResponse.deserialize, + ) ) return self._stubs["list_entity_reconciliation_jobs"] @@ -453,12 +453,12 @@ def cancel_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "cancel_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CancelEntityReconciliationJob", - request_serializer=service.CancelEntityReconciliationJobRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["cancel_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CancelEntityReconciliationJob", + request_serializer=service.CancelEntityReconciliationJobRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["cancel_entity_reconciliation_job"] @@ -486,12 +486,12 @@ def delete_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "delete_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/DeleteEntityReconciliationJob", - request_serializer=service.DeleteEntityReconciliationJobRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/DeleteEntityReconciliationJob", + request_serializer=service.DeleteEntityReconciliationJobRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_entity_reconciliation_job"] diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest.py index 9cf506748c06..73fa16b562f7 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.enterpriseknowledgegraph_v1.types import service @@ -656,9 +656,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseCancelEntityReconciliationJob._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseCancelEntityReconciliationJob._get_http_options() request, metadata = self._interceptor.pre_cancel_entity_reconciliation_job( request, metadata @@ -779,9 +777,7 @@ def __call__( Entity reconciliation job message. """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseCreateEntityReconciliationJob._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseCreateEntityReconciliationJob._get_http_options() request, metadata = self._interceptor.pre_create_entity_reconciliation_job( request, metadata @@ -850,11 +846,10 @@ def __call__( resp = self._interceptor.post_create_entity_reconciliation_job(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_entity_reconciliation_job_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_entity_reconciliation_job_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -934,9 +929,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseDeleteEntityReconciliationJob._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseDeleteEntityReconciliationJob._get_http_options() request, metadata = self._interceptor.pre_delete_entity_reconciliation_job( request, metadata @@ -1051,9 +1044,7 @@ def __call__( Entity reconciliation job message. """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseGetEntityReconciliationJob._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseGetEntityReconciliationJob._get_http_options() request, metadata = self._interceptor.pre_get_entity_reconciliation_job( request, metadata @@ -1117,11 +1108,10 @@ def __call__( resp = self._interceptor.post_get_entity_reconciliation_job(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_entity_reconciliation_job_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_entity_reconciliation_job_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1207,9 +1197,7 @@ def __call__( """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseListEntityReconciliationJobs._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseListEntityReconciliationJobs._get_http_options() request, metadata = self._interceptor.pre_list_entity_reconciliation_jobs( request, metadata @@ -1273,11 +1261,10 @@ def __call__( resp = self._interceptor.post_list_entity_reconciliation_jobs(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_entity_reconciliation_jobs_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_entity_reconciliation_jobs_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1362,9 +1349,7 @@ def __call__( """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseLookup._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseLookup._get_http_options() request, metadata = self._interceptor.pre_lookup(request, metadata) transcoded_request = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseLookup._get_transcoded_request( @@ -1512,9 +1497,7 @@ def __call__( """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseLookupPublicKg._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseLookupPublicKg._get_http_options() request, metadata = self._interceptor.pre_lookup_public_kg( request, metadata @@ -1662,9 +1645,7 @@ def __call__( """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseSearch._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseSearch._get_http_options() request, metadata = self._interceptor.pre_search(request, metadata) transcoded_request = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseSearch._get_transcoded_request( @@ -1812,9 +1793,7 @@ def __call__( """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseSearchPublicKg._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseSearchPublicKg._get_http_options() request, metadata = self._interceptor.pre_search_public_kg( request, metadata @@ -1910,7 +1889,9 @@ def cancel_entity_reconciliation_job( ) -> Callable[[service.CancelEntityReconciliationJobRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CancelEntityReconciliationJob(self._session, self._host, self._interceptor) # type: ignore + return self._CancelEntityReconciliationJob( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_entity_reconciliation_job( @@ -1920,7 +1901,9 @@ def create_entity_reconciliation_job( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateEntityReconciliationJob(self._session, self._host, self._interceptor) # type: ignore + return self._CreateEntityReconciliationJob( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_entity_reconciliation_job( @@ -1928,7 +1911,9 @@ def delete_entity_reconciliation_job( ) -> Callable[[service.DeleteEntityReconciliationJobRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteEntityReconciliationJob(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteEntityReconciliationJob( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_entity_reconciliation_job( @@ -1938,7 +1923,9 @@ def get_entity_reconciliation_job( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetEntityReconciliationJob(self._session, self._host, self._interceptor) # type: ignore + return self._GetEntityReconciliationJob( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_entity_reconciliation_jobs( @@ -1949,7 +1936,9 @@ def list_entity_reconciliation_jobs( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListEntityReconciliationJobs(self._session, self._host, self._interceptor) # type: ignore + return self._ListEntityReconciliationJobs( + self._session, self._host, self._interceptor + ) # type: ignore @property def lookup(self) -> Callable[[service.LookupRequest], service.LookupResponse]: diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest_base.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest_base.py index fff1de26e42f..07c268f90aee 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest_base.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.enterpriseknowledgegraph_v1.types import service diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/__init__.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/__init__.py index 4e7fa70adb23..a2449e24070e 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/__init__.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/__init__.py @@ -13,8 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .job_state import JobState -from .operation_metadata import CommonOperationMetadata +from .job_state import ( + JobState, +) +from .operation_metadata import ( + CommonOperationMetadata, +) from .service import ( AffinityClusteringConfig, BigQueryInputConfig, diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/job_state.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/job_state.py index 7084f7a9f9b3..bb8095236d3c 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/job_state.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/job_state.py @@ -56,6 +56,7 @@ class JobState(proto.Enum): Entity Recon API: The exporting clusters job is running. """ + JOB_STATE_UNSPECIFIED = 0 JOB_STATE_PENDING = 9 JOB_STATE_RUNNING = 1 diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/operation_metadata.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/operation_metadata.py index 25b1a7feb207..20d6e4896a0c 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/operation_metadata.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/operation_metadata.py @@ -59,6 +59,7 @@ class State(proto.Enum): PENDING (6): Operation is pending not running yet. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 CANCELLING = 2 diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/service.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/service.py index d372daa76795..27f48506a12c 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/service.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/service.py @@ -91,6 +91,7 @@ class EntityType(proto.Enum): PERSON (7): Person entity. """ + ENTITY_TYPE_UNSPECIFIED = 0 PEOPLE = 1 ESTABLISHMENT = 2 @@ -100,12 +101,12 @@ class EntityType(proto.Enum): LOCAL_BUSINESS = 6 PERSON = 7 - bigquery_input_configs: MutableSequence[ - "BigQueryInputConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="BigQueryInputConfig", + bigquery_input_configs: MutableSequence["BigQueryInputConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="BigQueryInputConfig", + ) ) entity_type: EntityType = proto.Field( proto.ENUM, @@ -386,12 +387,12 @@ class ListEntityReconciliationJobsResponse(proto.Message): def raw_page(self): return self - entity_reconciliation_jobs: MutableSequence[ - "EntityReconciliationJob" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="EntityReconciliationJob", + entity_reconciliation_jobs: MutableSequence["EntityReconciliationJob"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="EntityReconciliationJob", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-enterpriseknowledgegraph/mypy.ini b/packages/google-cloud-enterpriseknowledgegraph/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/mypy.ini +++ b/packages/google-cloud-enterpriseknowledgegraph/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-enterpriseknowledgegraph/noxfile.py b/packages/google-cloud-enterpriseknowledgegraph/noxfile.py index d897d8e771fe..b7d03dc4b9bb 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/noxfile.py +++ b/packages/google-cloud-enterpriseknowledgegraph/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-enterpriseknowledgegraph/tests/unit/gapic/enterpriseknowledgegraph_v1/test_enterprise_knowledge_graph_service.py b/packages/google-cloud-enterpriseknowledgegraph/tests/unit/gapic/enterpriseknowledgegraph_v1/test_enterprise_knowledge_graph_service.py index 562a6adde91d..b7f9606f2c3f 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/tests/unit/gapic/enterpriseknowledgegraph_v1/test_enterprise_knowledge_graph_service.py +++ b/packages/google-cloud-enterpriseknowledgegraph/tests/unit/gapic/enterpriseknowledgegraph_v1/test_enterprise_knowledge_graph_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,20 +43,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.any_pb2 as any_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.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account from google.cloud.enterpriseknowledgegraph_v1.services.enterprise_knowledge_graph_service import ( EnterpriseKnowledgeGraphServiceAsyncClient, @@ -1065,10 +1070,9 @@ def test_enterprise_knowledge_graph_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1113,10 +1117,9 @@ def test_enterprise_knowledge_graph_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1152,10 +1155,9 @@ def test_enterprise_knowledge_graph_service_client_get_mtls_endpoint_and_cert_so "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1420,9 +1422,7 @@ def test_enterprise_knowledge_graph_service_client_create_channel_credentials_fi google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3488,9 +3488,9 @@ async def test_lookup_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.lookup - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.lookup] = ( + mock_rpc + ) request = {} await client.lookup(request) @@ -3815,9 +3815,9 @@ async def test_search_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.search - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.search] = ( + mock_rpc + ) request = {} await client.search(request) @@ -4103,9 +4103,9 @@ def test_lookup_public_kg_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.lookup_public_kg - ] = mock_rpc + client._transport._wrapped_methods[client._transport.lookup_public_kg] = ( + mock_rpc + ) request = {} client.lookup_public_kg(request) @@ -4434,9 +4434,9 @@ def test_search_public_kg_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_public_kg - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_public_kg] = ( + mock_rpc + ) request = {} client.search_public_kg(request) @@ -6147,9 +6147,9 @@ def test_lookup_public_kg_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.lookup_public_kg - ] = mock_rpc + client._transport._wrapped_methods[client._transport.lookup_public_kg] = ( + mock_rpc + ) request = {} client.lookup_public_kg(request) @@ -6362,9 +6362,9 @@ def test_search_public_kg_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_public_kg - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_public_kg] = ( + mock_rpc + ) request = {} client.search_public_kg(request) diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/__init__.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/__init__.py index 53c1012f3184..823cd59fbe49 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/__init__.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.essential_contacts_service import ( EssentialContactsServiceAsyncClient, EssentialContactsServiceClient, diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/async_client.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/async_client.py index 5a2753828948..a87aa9326e4a 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/async_client.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.essential_contacts_v1 import gapic_version as package_version @@ -124,7 +124,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EssentialContactsServiceAsyncClient: The constructed client. """ - return EssentialContactsServiceClient.from_service_account_info.__func__(EssentialContactsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EssentialContactsServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EssentialContactsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +143,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EssentialContactsServiceAsyncClient: The constructed client. """ - return EssentialContactsServiceClient.from_service_account_file.__func__(EssentialContactsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EssentialContactsServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + EssentialContactsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -178,7 +186,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return EssentialContactsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return EssentialContactsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> EssentialContactsServiceTransport: diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/client.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/client.py index d87496ce2bfa..9143bae26d8e 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/client.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.essential_contacts_v1 import gapic_version as package_version @@ -83,9 +83,7 @@ class EssentialContactsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EssentialContactsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EssentialContactsServiceTransport]] _transport_registry["grpc"] = EssentialContactsServiceGrpcTransport _transport_registry["grpc_asyncio"] = EssentialContactsServiceGrpcAsyncIOTransport _transport_registry["rest"] = EssentialContactsServiceRestTransport @@ -626,11 +624,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EssentialContactsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EssentialContactsServiceClient._read_environment_variables() + ) self._client_cert_source = ( EssentialContactsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -667,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EssentialContactsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/pagers.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/pagers.py index 263e9b4669d5..38aab8c8c004 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/pagers.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/__init__.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/__init__.py index d87d47428cd3..3dca773575d2 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/__init__.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[EssentialContactsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[EssentialContactsServiceTransport]] _transport_registry["grpc"] = EssentialContactsServiceGrpcTransport _transport_registry["grpc_asyncio"] = EssentialContactsServiceGrpcAsyncIOTransport _transport_registry["rest"] = EssentialContactsServiceRestTransport diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/base.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/base.py index c6423abbc8ed..1d7320da49ee 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/base.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.essential_contacts_v1 import gapic_version as package_version from google.cloud.essential_contacts_v1.types import service diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc.py index 2a727495de93..4d76b4fd1d72 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.essential_contacts_v1.types import service diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc_asyncio.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc_asyncio.py index 5e3368c8c0a2..51283d9a8365 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.essential_contacts_v1.types import service diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest.py index dad043dc3075..2df2a91b79cb 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.essential_contacts_v1.types import service @@ -523,9 +523,7 @@ def __call__( """ - http_options = ( - _BaseEssentialContactsServiceRestTransport._BaseComputeContacts._get_http_options() - ) + http_options = _BaseEssentialContactsServiceRestTransport._BaseComputeContacts._get_http_options() request, metadata = self._interceptor.pre_compute_contacts( request, metadata @@ -676,9 +674,7 @@ def __call__( """ - http_options = ( - _BaseEssentialContactsServiceRestTransport._BaseCreateContact._get_http_options() - ) + http_options = _BaseEssentialContactsServiceRestTransport._BaseCreateContact._get_http_options() request, metadata = self._interceptor.pre_create_contact(request, metadata) transcoded_request = _BaseEssentialContactsServiceRestTransport._BaseCreateContact._get_transcoded_request( @@ -825,9 +821,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEssentialContactsServiceRestTransport._BaseDeleteContact._get_http_options() - ) + http_options = _BaseEssentialContactsServiceRestTransport._BaseDeleteContact._get_http_options() request, metadata = self._interceptor.pre_delete_contact(request, metadata) transcoded_request = _BaseEssentialContactsServiceRestTransport._BaseDeleteContact._get_transcoded_request( @@ -941,9 +935,7 @@ def __call__( """ - http_options = ( - _BaseEssentialContactsServiceRestTransport._BaseGetContact._get_http_options() - ) + http_options = _BaseEssentialContactsServiceRestTransport._BaseGetContact._get_http_options() request, metadata = self._interceptor.pre_get_contact(request, metadata) transcoded_request = _BaseEssentialContactsServiceRestTransport._BaseGetContact._get_transcoded_request( @@ -1089,9 +1081,7 @@ def __call__( """ - http_options = ( - _BaseEssentialContactsServiceRestTransport._BaseListContacts._get_http_options() - ) + http_options = _BaseEssentialContactsServiceRestTransport._BaseListContacts._get_http_options() request, metadata = self._interceptor.pre_list_contacts(request, metadata) transcoded_request = _BaseEssentialContactsServiceRestTransport._BaseListContacts._get_transcoded_request( @@ -1234,9 +1224,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEssentialContactsServiceRestTransport._BaseSendTestMessage._get_http_options() - ) + http_options = _BaseEssentialContactsServiceRestTransport._BaseSendTestMessage._get_http_options() request, metadata = self._interceptor.pre_send_test_message( request, metadata @@ -1358,9 +1346,7 @@ def __call__( """ - http_options = ( - _BaseEssentialContactsServiceRestTransport._BaseUpdateContact._get_http_options() - ) + http_options = _BaseEssentialContactsServiceRestTransport._BaseUpdateContact._get_http_options() request, metadata = self._interceptor.pre_update_contact(request, metadata) transcoded_request = _BaseEssentialContactsServiceRestTransport._BaseUpdateContact._get_transcoded_request( diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest_base.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest_base.py index 5337acb607e0..2ef77c5b329d 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest_base.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.essential_contacts_v1.types import service diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/__init__.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/__init__.py index 6282cba27b92..8a604cb4d775 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/__init__.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .enums import NotificationCategory, ValidationState +from .enums import ( + NotificationCategory, + ValidationState, +) from .service import ( ComputeContactsRequest, ComputeContactsResponse, diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/enums.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/enums.py index 4127726c5981..d769f4cab57e 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/enums.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/enums.py @@ -66,6 +66,7 @@ class NotificationCategory(proto.Enum): technical incident notifications will go to these contacts instead of TECHNICAL. """ + NOTIFICATION_CATEGORY_UNSPECIFIED = 0 ALL = 2 SUSPENSION = 3 @@ -95,6 +96,7 @@ class ValidationState(proto.Enum): become the state if the contact's email is found to be unreachable. """ + VALIDATION_STATE_UNSPECIFIED = 0 VALID = 1 INVALID = 2 diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/service.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/service.py index 07f94dfec0bd..8f8b8c750e4c 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/service.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/service.py @@ -79,12 +79,12 @@ class Contact(proto.Message): proto.STRING, number=2, ) - notification_category_subscriptions: MutableSequence[ - enums.NotificationCategory - ] = proto.RepeatedField( - proto.ENUM, - number=3, - enum=enums.NotificationCategory, + notification_category_subscriptions: MutableSequence[enums.NotificationCategory] = ( + proto.RepeatedField( + proto.ENUM, + number=3, + enum=enums.NotificationCategory, + ) ) language_tag: str = proto.Field( proto.STRING, @@ -282,12 +282,12 @@ class ComputeContactsRequest(proto.Message): proto.STRING, number=1, ) - notification_categories: MutableSequence[ - enums.NotificationCategory - ] = proto.RepeatedField( - proto.ENUM, - number=6, - enum=enums.NotificationCategory, + notification_categories: MutableSequence[enums.NotificationCategory] = ( + proto.RepeatedField( + proto.ENUM, + number=6, + enum=enums.NotificationCategory, + ) ) page_size: int = proto.Field( proto.INT32, diff --git a/packages/google-cloud-essential-contacts/mypy.ini b/packages/google-cloud-essential-contacts/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-essential-contacts/mypy.ini +++ b/packages/google-cloud-essential-contacts/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-essential-contacts/noxfile.py b/packages/google-cloud-essential-contacts/noxfile.py index fc2115b9ca16..dad316bf5b74 100644 --- a/packages/google-cloud-essential-contacts/noxfile.py +++ b/packages/google-cloud-essential-contacts/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-essential-contacts/tests/unit/gapic/essential_contacts_v1/test_essential_contacts_service.py b/packages/google-cloud-essential-contacts/tests/unit/gapic/essential_contacts_v1/test_essential_contacts_service.py index 7492713e025f..38135e902dcb 100644 --- a/packages/google-cloud-essential-contacts/tests/unit/gapic/essential_contacts_v1/test_essential_contacts_service.py +++ b/packages/google-cloud-essential-contacts/tests/unit/gapic/essential_contacts_v1/test_essential_contacts_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.essential_contacts_v1.services.essential_contacts_service import ( EssentialContactsServiceAsyncClient, @@ -1005,10 +1010,9 @@ def test_essential_contacts_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1053,10 +1057,9 @@ def test_essential_contacts_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1092,10 +1095,9 @@ def test_essential_contacts_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1356,9 +1358,7 @@ def test_essential_contacts_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3330,9 +3330,9 @@ def test_compute_contacts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compute_contacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compute_contacts] = ( + mock_rpc + ) request = {} client.compute_contacts(request) @@ -3768,9 +3768,9 @@ def test_send_test_message_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.send_test_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.send_test_message] = ( + mock_rpc + ) request = {} client.send_test_message(request) @@ -4899,9 +4899,9 @@ def test_compute_contacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compute_contacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compute_contacts] = ( + mock_rpc + ) request = {} client.compute_contacts(request) @@ -5099,9 +5099,9 @@ def test_send_test_message_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.send_test_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.send_test_message] = ( + mock_rpc + ) request = {} client.send_test_message(request) diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/__init__.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/__init__.py index 26a983d53376..8098232f8629 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/__init__.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.publisher import PublisherAsyncClient, PublisherClient from .types.cloud_event import CloudEvent from .types.publisher import ( diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/async_client.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/async_client.py index fbe0e21eaf46..742ea0e7cacf 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/async_client.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.eventarc_publishing_v1 import gapic_version as package_version @@ -139,7 +139,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): @@ -155,7 +158,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 diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/client.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/client.py index ee593afd9ff1..6a577577f19d 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/client.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.eventarc_publishing_v1 import gapic_version as package_version @@ -630,11 +630,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PublisherClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PublisherClient._read_environment_variables() + ) self._client_cert_source = PublisherClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -669,8 +667,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PublisherTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/base.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/base.py index cfa70fc18abf..3197b0dd9238 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/base.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.eventarc_publishing_v1 import gapic_version as package_version from google.cloud.eventarc_publishing_v1.types import publisher diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc.py index 87a4667d7277..4661831a78ff 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.eventarc_publishing_v1.types import publisher @@ -379,12 +379,12 @@ def publish_channel_connection_events( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "publish_channel_connection_events" not in self._stubs: - self._stubs[ - "publish_channel_connection_events" - ] = self._logged_channel.unary_unary( - "/google.cloud.eventarc.publishing.v1.Publisher/PublishChannelConnectionEvents", - request_serializer=publisher.PublishChannelConnectionEventsRequest.serialize, - response_deserializer=publisher.PublishChannelConnectionEventsResponse.deserialize, + self._stubs["publish_channel_connection_events"] = ( + self._logged_channel.unary_unary( + "/google.cloud.eventarc.publishing.v1.Publisher/PublishChannelConnectionEvents", + request_serializer=publisher.PublishChannelConnectionEventsRequest.serialize, + response_deserializer=publisher.PublishChannelConnectionEventsResponse.deserialize, + ) ) return self._stubs["publish_channel_connection_events"] diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc_asyncio.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc_asyncio.py index 031427fc1011..73d026b28be4 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc_asyncio.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.eventarc_publishing_v1.types import publisher @@ -387,12 +387,12 @@ def publish_channel_connection_events( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "publish_channel_connection_events" not in self._stubs: - self._stubs[ - "publish_channel_connection_events" - ] = self._logged_channel.unary_unary( - "/google.cloud.eventarc.publishing.v1.Publisher/PublishChannelConnectionEvents", - request_serializer=publisher.PublishChannelConnectionEventsRequest.serialize, - response_deserializer=publisher.PublishChannelConnectionEventsResponse.deserialize, + self._stubs["publish_channel_connection_events"] = ( + self._logged_channel.unary_unary( + "/google.cloud.eventarc.publishing.v1.Publisher/PublishChannelConnectionEvents", + request_serializer=publisher.PublishChannelConnectionEventsRequest.serialize, + response_deserializer=publisher.PublishChannelConnectionEventsResponse.deserialize, + ) ) return self._stubs["publish_channel_connection_events"] diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/rest.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/rest.py index 104a2d5befcb..54b67ab78671 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/rest.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -583,9 +583,7 @@ def __call__( """ - http_options = ( - _BasePublisherRestTransport._BasePublishChannelConnectionEvents._get_http_options() - ) + http_options = _BasePublisherRestTransport._BasePublishChannelConnectionEvents._get_http_options() request, metadata = self._interceptor.pre_publish_channel_connection_events( request, metadata @@ -656,11 +654,10 @@ def __call__( resp = self._interceptor.post_publish_channel_connection_events(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_publish_channel_connection_events_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_publish_channel_connection_events_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -865,7 +862,9 @@ def publish_channel_connection_events( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PublishChannelConnectionEvents(self._session, self._host, self._interceptor) # type: ignore + return self._PublishChannelConnectionEvents( + self._session, self._host, self._interceptor + ) # type: ignore @property def publish_events( diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/__init__.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/__init__.py index a610e5d26bc8..2a9d51149b13 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/__init__.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .cloud_event import CloudEvent +from .cloud_event import ( + CloudEvent, +) from .publisher import ( PublishChannelConnectionEventsRequest, PublishChannelConnectionEventsResponse, diff --git a/packages/google-cloud-eventarc-publishing/mypy.ini b/packages/google-cloud-eventarc-publishing/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-eventarc-publishing/mypy.ini +++ b/packages/google-cloud-eventarc-publishing/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-eventarc-publishing/noxfile.py b/packages/google-cloud-eventarc-publishing/noxfile.py index 19070e539837..b5e2bf28b493 100644 --- a/packages/google-cloud-eventarc-publishing/noxfile.py +++ b/packages/google-cloud-eventarc-publishing/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-eventarc-publishing/tests/unit/gapic/eventarc_publishing_v1/test_publisher.py b/packages/google-cloud-eventarc-publishing/tests/unit/gapic/eventarc_publishing_v1/test_publisher.py index e7d7ff436d25..031cb04bc9c1 100644 --- a/packages/google-cloud-eventarc-publishing/tests/unit/gapic/eventarc_publishing_v1/test_publisher.py +++ b/packages/google-cloud-eventarc-publishing/tests/unit/gapic/eventarc_publishing_v1/test_publisher.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.any_pb2 as any_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.eventarc_publishing_v1.services.publisher import ( PublisherAsyncClient, @@ -915,10 +920,9 @@ def test_publisher_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -963,10 +967,9 @@ def test_publisher_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1002,10 +1005,9 @@ def test_publisher_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1238,9 +1240,7 @@ def test_publisher_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/__init__.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/__init__.py index e692e54a8f2d..e2fb52e5f7c5 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/__init__.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.eventarc import EventarcAsyncClient, EventarcClient from .types.channel import Channel from .types.channel_connection import ChannelConnection diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/async_client.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/async_client.py index e9a8c19f1310..81aec84c91c4 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/async_client.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.eventarc_v1 import gapic_version as package_version @@ -46,34 +46,38 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.eventarc_v1.services.eventarc import pagers +from google.cloud.eventarc_v1.types import ( + channel, + channel_connection, + discovery, + enrollment, + eventarc, + google_api_source, + google_channel_config, + logging_config, + message_bus, + pipeline, + trigger, +) +from google.cloud.eventarc_v1.types import channel as gce_channel from google.cloud.eventarc_v1.types import channel_connection as gce_channel_connection +from google.cloud.eventarc_v1.types import enrollment as gce_enrollment from google.cloud.eventarc_v1.types import google_api_source as gce_google_api_source from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import channel -from google.cloud.eventarc_v1.types import channel as gce_channel -from google.cloud.eventarc_v1.types import channel_connection -from google.cloud.eventarc_v1.types import discovery -from google.cloud.eventarc_v1.types import enrollment -from google.cloud.eventarc_v1.types import enrollment as gce_enrollment -from google.cloud.eventarc_v1.types import eventarc -from google.cloud.eventarc_v1.types import google_api_source -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import logging_config -from google.cloud.eventarc_v1.types import message_bus from google.cloud.eventarc_v1.types import message_bus as gce_message_bus -from google.cloud.eventarc_v1.types import pipeline from google.cloud.eventarc_v1.types import pipeline as gce_pipeline -from google.cloud.eventarc_v1.types import trigger from google.cloud.eventarc_v1.types import trigger as gce_trigger from .client import EventarcClient @@ -175,7 +179,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EventarcAsyncClient: The constructed client. """ - return EventarcClient.from_service_account_info.__func__(EventarcAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EventarcClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EventarcAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -191,7 +198,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EventarcAsyncClient: The constructed client. """ - return EventarcClient.from_service_account_file.__func__(EventarcAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EventarcClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EventarcAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/client.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/client.py index b9dc0ee97d35..dab76effeb7b 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/client.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.eventarc_v1 import gapic_version as package_version @@ -63,34 +63,38 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.eventarc_v1.services.eventarc import pagers +from google.cloud.eventarc_v1.types import ( + channel, + channel_connection, + discovery, + enrollment, + eventarc, + google_api_source, + google_channel_config, + logging_config, + message_bus, + pipeline, + trigger, +) +from google.cloud.eventarc_v1.types import channel as gce_channel from google.cloud.eventarc_v1.types import channel_connection as gce_channel_connection +from google.cloud.eventarc_v1.types import enrollment as gce_enrollment from google.cloud.eventarc_v1.types import google_api_source as gce_google_api_source from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import channel -from google.cloud.eventarc_v1.types import channel as gce_channel -from google.cloud.eventarc_v1.types import channel_connection -from google.cloud.eventarc_v1.types import discovery -from google.cloud.eventarc_v1.types import enrollment -from google.cloud.eventarc_v1.types import enrollment as gce_enrollment -from google.cloud.eventarc_v1.types import eventarc -from google.cloud.eventarc_v1.types import google_api_source -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import logging_config -from google.cloud.eventarc_v1.types import message_bus from google.cloud.eventarc_v1.types import message_bus as gce_message_bus -from google.cloud.eventarc_v1.types import pipeline from google.cloud.eventarc_v1.types import pipeline as gce_pipeline -from google.cloud.eventarc_v1.types import trigger from google.cloud.eventarc_v1.types import trigger as gce_trigger from .transports.base import DEFAULT_CLIENT_INFO, EventarcTransport @@ -966,11 +970,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EventarcClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EventarcClient._read_environment_variables() + ) self._client_cert_source = EventarcClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1005,8 +1007,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EventarcTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/pagers.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/pagers.py index 81996d3eb220..c5d9cb669ecb 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/pagers.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/pagers.py @@ -77,7 +77,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -153,7 +153,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -233,7 +233,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -309,7 +309,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -389,7 +389,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -465,7 +465,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -545,7 +545,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -621,7 +621,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -701,7 +701,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -777,7 +777,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -857,7 +857,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -933,7 +933,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1013,7 +1013,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1089,7 +1089,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1169,7 +1169,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1245,7 +1245,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1325,7 +1325,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1401,7 +1401,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/base.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/base.py index ec0c776fd9f0..7a028f49eb37 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/base.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.eventarc_v1 import gapic_version as package_version from google.cloud.eventarc_v1.types import ( @@ -37,12 +39,14 @@ enrollment, eventarc, google_api_source, + google_channel_config, + message_bus, + pipeline, + trigger, ) from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import message_bus, pipeline, trigger DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -992,13 +996,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py index 19f57ded9bd9..5149925abe3c 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.eventarc_v1.types import ( channel, @@ -39,12 +41,14 @@ enrollment, eventarc, google_api_source, + google_channel_config, + message_bus, + pipeline, + trigger, ) from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import message_bus, pipeline, trigger from .base import DEFAULT_CLIENT_INFO, EventarcTransport @@ -829,12 +833,12 @@ def update_google_channel_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_google_channel_config" not in self._stubs: - self._stubs[ - "update_google_channel_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.eventarc.v1.Eventarc/UpdateGoogleChannelConfig", - request_serializer=eventarc.UpdateGoogleChannelConfigRequest.serialize, - response_deserializer=gce_google_channel_config.GoogleChannelConfig.deserialize, + self._stubs["update_google_channel_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.eventarc.v1.Eventarc/UpdateGoogleChannelConfig", + request_serializer=eventarc.UpdateGoogleChannelConfigRequest.serialize, + response_deserializer=gce_google_channel_config.GoogleChannelConfig.deserialize, + ) ) return self._stubs["update_google_channel_config"] @@ -914,12 +918,12 @@ def list_message_bus_enrollments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_message_bus_enrollments" not in self._stubs: - self._stubs[ - "list_message_bus_enrollments" - ] = self._logged_channel.unary_unary( - "/google.cloud.eventarc.v1.Eventarc/ListMessageBusEnrollments", - request_serializer=eventarc.ListMessageBusEnrollmentsRequest.serialize, - response_deserializer=eventarc.ListMessageBusEnrollmentsResponse.deserialize, + self._stubs["list_message_bus_enrollments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.eventarc.v1.Eventarc/ListMessageBusEnrollments", + request_serializer=eventarc.ListMessageBusEnrollmentsRequest.serialize, + response_deserializer=eventarc.ListMessageBusEnrollmentsResponse.deserialize, + ) ) return self._stubs["list_message_bus_enrollments"] diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py index cacec0272f88..5b16f3fe0003 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.eventarc_v1.types import ( channel, @@ -42,12 +44,14 @@ enrollment, eventarc, google_api_source, + google_channel_config, + message_bus, + pipeline, + trigger, ) from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import message_bus, pipeline, trigger from .base import DEFAULT_CLIENT_INFO, EventarcTransport from .grpc import EventarcGrpcTransport @@ -852,12 +856,12 @@ def update_google_channel_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_google_channel_config" not in self._stubs: - self._stubs[ - "update_google_channel_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.eventarc.v1.Eventarc/UpdateGoogleChannelConfig", - request_serializer=eventarc.UpdateGoogleChannelConfigRequest.serialize, - response_deserializer=gce_google_channel_config.GoogleChannelConfig.deserialize, + self._stubs["update_google_channel_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.eventarc.v1.Eventarc/UpdateGoogleChannelConfig", + request_serializer=eventarc.UpdateGoogleChannelConfigRequest.serialize, + response_deserializer=gce_google_channel_config.GoogleChannelConfig.deserialize, + ) ) return self._stubs["update_google_channel_config"] @@ -937,12 +941,12 @@ def list_message_bus_enrollments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_message_bus_enrollments" not in self._stubs: - self._stubs[ - "list_message_bus_enrollments" - ] = self._logged_channel.unary_unary( - "/google.cloud.eventarc.v1.Eventarc/ListMessageBusEnrollments", - request_serializer=eventarc.ListMessageBusEnrollmentsRequest.serialize, - response_deserializer=eventarc.ListMessageBusEnrollmentsResponse.deserialize, + self._stubs["list_message_bus_enrollments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.eventarc.v1.Eventarc/ListMessageBusEnrollments", + request_serializer=eventarc.ListMessageBusEnrollmentsRequest.serialize, + response_deserializer=eventarc.ListMessageBusEnrollmentsResponse.deserialize, + ) ) return self._stubs["list_message_bus_enrollments"] diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest.py index ce76e487bb2b..2355a61e77a6 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -39,12 +41,14 @@ enrollment, eventarc, google_api_source, + google_channel_config, + message_bus, + pipeline, + trigger, ) from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import message_bus, pipeline, trigger from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEventarcRestTransport @@ -2832,9 +2836,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseCreateChannelConnection._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseCreateChannelConnection._get_http_options() request, metadata = self._interceptor.pre_create_channel_connection( request, metadata @@ -3144,9 +3146,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseCreateGoogleApiSource._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseCreateGoogleApiSource._get_http_options() request, metadata = self._interceptor.pre_create_google_api_source( request, metadata @@ -3919,9 +3919,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseDeleteChannelConnection._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseDeleteChannelConnection._get_http_options() request, metadata = self._interceptor.pre_delete_channel_connection( request, metadata @@ -4217,9 +4215,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseDeleteGoogleApiSource._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseDeleteGoogleApiSource._get_http_options() request, metadata = self._interceptor.pre_delete_google_api_source( request, metadata @@ -5438,9 +5434,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseGetGoogleChannelConfig._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseGetGoogleChannelConfig._get_http_options() request, metadata = self._interceptor.pre_get_google_channel_config( request, metadata @@ -6193,9 +6187,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseListChannelConnections._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseListChannelConnections._get_http_options() request, metadata = self._interceptor.pre_list_channel_connections( request, metadata @@ -6796,9 +6788,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseListMessageBusEnrollments._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseListMessageBusEnrollments._get_http_options() request, metadata = self._interceptor.pre_list_message_bus_enrollments( request, metadata @@ -7863,9 +7853,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseUpdateGoogleApiSource._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseUpdateGoogleApiSource._get_http_options() request, metadata = self._interceptor.pre_update_google_api_source( request, metadata @@ -8023,9 +8011,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseUpdateGoogleChannelConfig._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseUpdateGoogleChannelConfig._get_http_options() request, metadata = self._interceptor.pre_update_google_channel_config( request, metadata @@ -8608,7 +8594,9 @@ def create_channel_connection( ) -> Callable[[eventarc.CreateChannelConnectionRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateChannelConnection(self._session, self._host, self._interceptor) # type: ignore + return self._CreateChannelConnection( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_enrollment( @@ -8664,7 +8652,9 @@ def delete_channel_connection( ) -> Callable[[eventarc.DeleteChannelConnectionRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteChannelConnection(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteChannelConnection( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_enrollment( @@ -8749,7 +8739,9 @@ def get_google_channel_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetGoogleChannelConfig(self._session, self._host, self._interceptor) # type: ignore + return self._GetGoogleChannelConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_message_bus( @@ -8790,7 +8782,9 @@ def list_channel_connections( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListChannelConnections(self._session, self._host, self._interceptor) # type: ignore + return self._ListChannelConnections( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_channels( @@ -8827,7 +8821,9 @@ def list_message_bus_enrollments( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListMessageBusEnrollments(self._session, self._host, self._interceptor) # type: ignore + return self._ListMessageBusEnrollments( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_message_buses( @@ -8896,7 +8892,9 @@ def update_google_channel_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateGoogleChannelConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateGoogleChannelConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_message_bus( diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest_base.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest_base.py index 63829611cb7b..ec4305579cf7 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest_base.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format @@ -31,12 +33,14 @@ enrollment, eventarc, google_api_source, + google_channel_config, + message_bus, + pipeline, + trigger, ) from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import message_bus, pipeline, trigger from .base import DEFAULT_CLIENT_INFO, EventarcTransport diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/__init__.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/__init__.py index 509eea237a19..b358427e7429 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/__init__.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/__init__.py @@ -13,10 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .channel import Channel -from .channel_connection import ChannelConnection -from .discovery import EventType, FilteringAttribute, Provider -from .enrollment import Enrollment +from .channel import ( + Channel, +) +from .channel_connection import ( + ChannelConnection, +) +from .discovery import ( + EventType, + FilteringAttribute, + Provider, +) +from .enrollment import ( + Enrollment, +) from .eventarc import ( CreateChannelConnectionRequest, CreateChannelRequest, @@ -68,12 +78,24 @@ UpdatePipelineRequest, UpdateTriggerRequest, ) -from .google_api_source import GoogleApiSource -from .google_channel_config import GoogleChannelConfig -from .logging_config import LoggingConfig -from .message_bus import MessageBus -from .network_config import NetworkConfig -from .pipeline import Pipeline +from .google_api_source import ( + GoogleApiSource, +) +from .google_channel_config import ( + GoogleChannelConfig, +) +from .logging_config import ( + LoggingConfig, +) +from .message_bus import ( + MessageBus, +) +from .network_config import ( + NetworkConfig, +) +from .pipeline import ( + Pipeline, +) from .trigger import ( GKE, CloudRun, diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/channel.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/channel.py index e8d0fe2fbff2..54113d1b4b45 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/channel.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/channel.py @@ -115,6 +115,7 @@ class State(proto.Enum): the subscriber should create a new Channel and give it to the provider. """ + STATE_UNSPECIFIED = 0 PENDING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/eventarc.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/eventarc.py index 6a37b892fbe2..4c3a05a0a911 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/eventarc.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/eventarc.py @@ -21,14 +21,14 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.eventarc_v1.types import channel as gce_channel from google.cloud.eventarc_v1.types import channel_connection as gce_channel_connection +from google.cloud.eventarc_v1.types import discovery +from google.cloud.eventarc_v1.types import enrollment as gce_enrollment from google.cloud.eventarc_v1.types import google_api_source as gce_google_api_source from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import channel as gce_channel -from google.cloud.eventarc_v1.types import discovery -from google.cloud.eventarc_v1.types import enrollment as gce_enrollment from google.cloud.eventarc_v1.types import message_bus as gce_message_bus from google.cloud.eventarc_v1.types import pipeline as gce_pipeline from google.cloud.eventarc_v1.types import trigger as gce_trigger @@ -656,12 +656,12 @@ class ListChannelConnectionsResponse(proto.Message): def raw_page(self): return self - channel_connections: MutableSequence[ - gce_channel_connection.ChannelConnection - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gce_channel_connection.ChannelConnection, + channel_connections: MutableSequence[gce_channel_connection.ChannelConnection] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gce_channel_connection.ChannelConnection, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1554,12 +1554,12 @@ class ListGoogleApiSourcesResponse(proto.Message): def raw_page(self): return self - google_api_sources: MutableSequence[ - gce_google_api_source.GoogleApiSource - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gce_google_api_source.GoogleApiSource, + google_api_sources: MutableSequence[gce_google_api_source.GoogleApiSource] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gce_google_api_source.GoogleApiSource, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/logging_config.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/logging_config.py index 7b57ee465f91..176307323d97 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/logging_config.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/logging_config.py @@ -74,6 +74,7 @@ class LogSeverity(proto.Enum): EMERGENCY (9): One or more systems are unusable. """ + LOG_SEVERITY_UNSPECIFIED = 0 NONE = 1 DEBUG = 2 diff --git a/packages/google-cloud-eventarc/mypy.ini b/packages/google-cloud-eventarc/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-eventarc/mypy.ini +++ b/packages/google-cloud-eventarc/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-eventarc/noxfile.py b/packages/google-cloud-eventarc/noxfile.py index 776be6e7a999..caf8783163c4 100644 --- a/packages/google-cloud-eventarc/noxfile.py +++ b/packages/google-cloud-eventarc/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py b/packages/google-cloud-eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py index faf866aefead..806933859131 100644 --- a/packages/google-cloud-eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py +++ b/packages/google-cloud-eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +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 google.rpc.code_pb2 as code_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,23 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 google.rpc.code_pb2 as code_pb2 # type: ignore from google.cloud.eventarc_v1.services.eventarc import ( EventarcAsyncClient, @@ -76,27 +78,29 @@ pagers, transports, ) +from google.cloud.eventarc_v1.types import ( + channel, + channel_connection, + discovery, + enrollment, + eventarc, + google_api_source, + google_channel_config, + logging_config, + message_bus, + network_config, + pipeline, + trigger, +) +from google.cloud.eventarc_v1.types import channel as gce_channel from google.cloud.eventarc_v1.types import channel_connection as gce_channel_connection +from google.cloud.eventarc_v1.types import enrollment as gce_enrollment from google.cloud.eventarc_v1.types import google_api_source as gce_google_api_source from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import channel -from google.cloud.eventarc_v1.types import channel as gce_channel -from google.cloud.eventarc_v1.types import channel_connection -from google.cloud.eventarc_v1.types import discovery -from google.cloud.eventarc_v1.types import enrollment -from google.cloud.eventarc_v1.types import enrollment as gce_enrollment -from google.cloud.eventarc_v1.types import eventarc -from google.cloud.eventarc_v1.types import google_api_source -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import logging_config -from google.cloud.eventarc_v1.types import message_bus from google.cloud.eventarc_v1.types import message_bus as gce_message_bus -from google.cloud.eventarc_v1.types import network_config -from google.cloud.eventarc_v1.types import pipeline from google.cloud.eventarc_v1.types import pipeline as gce_pipeline -from google.cloud.eventarc_v1.types import trigger from google.cloud.eventarc_v1.types import trigger as gce_trigger CRED_INFO_JSON = { @@ -946,10 +950,9 @@ def test_eventarc_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +997,9 @@ def test_eventarc_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1035,9 @@ def test_eventarc_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1265,9 +1266,7 @@ def test_eventarc_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -6016,9 +6015,9 @@ def test_get_channel_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_channel_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_channel_connection] = ( + mock_rpc + ) request = {} client.get_channel_connection(request) @@ -8695,9 +8694,9 @@ def test_list_message_buses_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_message_buses - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_message_buses] = ( + mock_rpc + ) request = {} client.list_message_buses(request) @@ -9796,9 +9795,9 @@ def test_create_message_bus_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_message_bus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_message_bus] = ( + mock_rpc + ) request = {} client.create_message_bus(request) @@ -10157,9 +10156,9 @@ def test_update_message_bus_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_message_bus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_message_bus] = ( + mock_rpc + ) request = {} client.update_message_bus(request) @@ -10514,9 +10513,9 @@ def test_delete_message_bus_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_message_bus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_message_bus] = ( + mock_rpc + ) request = {} client.delete_message_bus(request) @@ -11221,9 +11220,9 @@ def test_list_enrollments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_enrollments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_enrollments] = ( + mock_rpc + ) request = {} client.list_enrollments(request) @@ -11745,9 +11744,9 @@ def test_create_enrollment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_enrollment] = ( + mock_rpc + ) request = {} client.create_enrollment(request) @@ -12104,9 +12103,9 @@ def test_update_enrollment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_enrollment] = ( + mock_rpc + ) request = {} client.update_enrollment(request) @@ -12459,9 +12458,9 @@ def test_delete_enrollment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_enrollment] = ( + mock_rpc + ) request = {} client.delete_enrollment(request) @@ -14715,9 +14714,9 @@ def test_get_google_api_source_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_google_api_source - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_google_api_source] = ( + mock_rpc + ) request = {} client.get_google_api_source(request) @@ -18928,9 +18927,9 @@ def test_get_channel_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_channel_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_channel_connection] = ( + mock_rpc + ) request = {} client.get_channel_connection(request) @@ -20333,9 +20332,9 @@ def test_list_message_buses_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_message_buses - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_message_buses] = ( + mock_rpc + ) request = {} client.list_message_buses(request) @@ -20860,9 +20859,9 @@ def test_create_message_bus_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_message_bus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_message_bus] = ( + mock_rpc + ) request = {} client.create_message_bus(request) @@ -21080,9 +21079,9 @@ def test_update_message_bus_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_message_bus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_message_bus] = ( + mock_rpc + ) request = {} client.update_message_bus(request) @@ -21280,9 +21279,9 @@ def test_delete_message_bus_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_message_bus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_message_bus] = ( + mock_rpc + ) request = {} client.delete_message_bus(request) @@ -21660,9 +21659,9 @@ def test_list_enrollments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_enrollments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_enrollments] = ( + mock_rpc + ) request = {} client.list_enrollments(request) @@ -21920,9 +21919,9 @@ def test_create_enrollment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_enrollment] = ( + mock_rpc + ) request = {} client.create_enrollment(request) @@ -22138,9 +22137,9 @@ def test_update_enrollment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_enrollment] = ( + mock_rpc + ) request = {} client.update_enrollment(request) @@ -22336,9 +22335,9 @@ def test_delete_enrollment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_enrollment] = ( + mock_rpc + ) request = {} client.delete_enrollment(request) @@ -23579,9 +23578,9 @@ def test_get_google_api_source_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_google_api_source - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_google_api_source] = ( + mock_rpc + ) request = {} client.get_google_api_source(request) diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/__init__.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/__init__.py index f0a5be5d0223..caa6bf474138 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/__init__.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_filestore_manager import ( CloudFilestoreManagerAsyncClient, CloudFilestoreManagerClient, diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/async_client.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/async_client.py index f93773708d7b..e459e3a8dba1 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/async_client.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.filestore_v1 import gapic_version as package_version @@ -46,13 +46,13 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.common.types import operation_metadata -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.cloud.common.types import operation_metadata +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.filestore_v1.services.cloud_filestore_manager import pagers from google.cloud.filestore_v1.types import cloud_filestore_service @@ -152,7 +152,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudFilestoreManagerAsyncClient: The constructed client. """ - return CloudFilestoreManagerClient.from_service_account_info.__func__(CloudFilestoreManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudFilestoreManagerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CloudFilestoreManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -168,7 +171,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudFilestoreManagerAsyncClient: The constructed client. """ - return CloudFilestoreManagerClient.from_service_account_file.__func__(CloudFilestoreManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudFilestoreManagerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CloudFilestoreManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -206,7 +212,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudFilestoreManagerClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudFilestoreManagerClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudFilestoreManagerTransport: diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/client.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/client.py index c3e522b00582..64ab2d4e4ff9 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/client.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.filestore_v1 import gapic_version as package_version @@ -63,13 +63,13 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.common.types import operation_metadata -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.cloud.common.types import operation_metadata +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.filestore_v1.services.cloud_filestore_manager import pagers from google.cloud.filestore_v1.types import cloud_filestore_service @@ -88,9 +88,7 @@ class CloudFilestoreManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudFilestoreManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudFilestoreManagerTransport]] _transport_registry["grpc"] = CloudFilestoreManagerGrpcTransport _transport_registry["grpc_asyncio"] = CloudFilestoreManagerGrpcAsyncIOTransport _transport_registry["rest"] = CloudFilestoreManagerRestTransport @@ -705,11 +703,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudFilestoreManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudFilestoreManagerClient._read_environment_variables() + ) self._client_cert_source = CloudFilestoreManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -744,8 +740,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudFilestoreManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/pagers.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/pagers.py index 9b20555d4d14..3a1412324f32 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/pagers.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -225,7 +225,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -459,7 +459,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/__init__.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/__init__.py index f15214f27465..0261bfd726bc 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/__init__.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudFilestoreManagerTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudFilestoreManagerTransport]] _transport_registry["grpc"] = CloudFilestoreManagerGrpcTransport _transport_registry["grpc_asyncio"] = CloudFilestoreManagerGrpcAsyncIOTransport _transport_registry["rest"] = CloudFilestoreManagerRestTransport diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/base.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/base.py index 8084e7348bb0..a5b716df01ca 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/base.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.filestore_v1 import gapic_version as package_version from google.cloud.filestore_v1.types import cloud_filestore_service @@ -513,13 +513,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc.py index 1b7639e4411f..f7a5bb271104 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.filestore_v1.types import cloud_filestore_service diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc_asyncio.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc_asyncio.py index 669a6b4cf1b1..8ecf149df40f 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.filestore_v1.types import cloud_filestore_service diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/rest.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/rest.py index bfd47266e4fb..d46707a1524c 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/rest.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1488,9 +1488,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseCreateBackup._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseCreateBackup._get_http_options() request, metadata = self._interceptor.pre_create_backup(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseCreateBackup._get_transcoded_request( @@ -1641,9 +1639,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseCreateInstance._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseCreateInstance._get_http_options() request, metadata = self._interceptor.pre_create_instance(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseCreateInstance._get_transcoded_request( @@ -1794,9 +1790,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseCreateSnapshot._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseCreateSnapshot._get_http_options() request, metadata = self._interceptor.pre_create_snapshot(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseCreateSnapshot._get_transcoded_request( @@ -1945,9 +1939,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseDeleteBackup._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseDeleteBackup._get_http_options() request, metadata = self._interceptor.pre_delete_backup(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseDeleteBackup._get_transcoded_request( @@ -2092,9 +2084,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseDeleteInstance._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseDeleteInstance._get_http_options() request, metadata = self._interceptor.pre_delete_instance(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseDeleteInstance._get_transcoded_request( @@ -2239,9 +2229,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseDeleteSnapshot._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseDeleteSnapshot._get_http_options() request, metadata = self._interceptor.pre_delete_snapshot(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseDeleteSnapshot._get_transcoded_request( @@ -2383,9 +2371,7 @@ def __call__( A Filestore backup. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseGetBackup._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseGetBackup._get_http_options() request, metadata = self._interceptor.pre_get_backup(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseGetBackup._get_transcoded_request( @@ -2529,9 +2515,7 @@ def __call__( A Filestore instance. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseGetInstance._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseGetInstance._get_http_options() request, metadata = self._interceptor.pre_get_instance(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseGetInstance._get_transcoded_request( @@ -2677,9 +2661,7 @@ def __call__( A Filestore snapshot. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseGetSnapshot._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseGetSnapshot._get_http_options() request, metadata = self._interceptor.pre_get_snapshot(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseGetSnapshot._get_transcoded_request( @@ -2826,9 +2808,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseListBackups._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseListBackups._get_http_options() request, metadata = self._interceptor.pre_list_backups(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseListBackups._get_transcoded_request( @@ -2975,9 +2955,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseListInstances._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseListInstances._get_http_options() request, metadata = self._interceptor.pre_list_instances(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseListInstances._get_transcoded_request( @@ -3124,9 +3102,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseListSnapshots._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseListSnapshots._get_http_options() request, metadata = self._interceptor.pre_list_snapshots(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseListSnapshots._get_transcoded_request( @@ -3276,9 +3252,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BasePromoteReplica._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BasePromoteReplica._get_http_options() request, metadata = self._interceptor.pre_promote_replica(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BasePromoteReplica._get_transcoded_request( @@ -3430,9 +3404,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseRestoreInstance._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseRestoreInstance._get_http_options() request, metadata = self._interceptor.pre_restore_instance( request, metadata @@ -3588,9 +3560,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseRevertInstance._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseRevertInstance._get_http_options() request, metadata = self._interceptor.pre_revert_instance(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseRevertInstance._get_transcoded_request( @@ -3741,9 +3711,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseUpdateBackup._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseUpdateBackup._get_http_options() request, metadata = self._interceptor.pre_update_backup(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseUpdateBackup._get_transcoded_request( @@ -3894,9 +3862,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseUpdateInstance._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseUpdateInstance._get_http_options() request, metadata = self._interceptor.pre_update_instance(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseUpdateInstance._get_transcoded_request( @@ -4048,9 +4014,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseUpdateSnapshot._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseUpdateSnapshot._get_http_options() request, metadata = self._interceptor.pre_update_snapshot(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseUpdateSnapshot._get_transcoded_request( @@ -4382,9 +4346,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseGetLocation._get_transcoded_request( @@ -4523,9 +4485,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseListLocations._get_transcoded_request( @@ -4662,9 +4622,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -4784,9 +4742,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -4904,9 +4860,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseGetOperation._get_transcoded_request( @@ -5045,9 +4999,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/types/cloud_filestore_service.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/types/cloud_filestore_service.py index 8b0e61c6ef09..aa00ae77b919 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/types/cloud_filestore_service.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/types/cloud_filestore_service.py @@ -111,6 +111,7 @@ class AddressMode(proto.Enum): MODE_IPV4 (1): Use the IPv4 internet protocol. """ + ADDRESS_MODE_UNSPECIFIED = 0 MODE_IPV4 = 1 @@ -129,6 +130,7 @@ class ConnectMode(proto.Enum): provides an IP address range for multiple Google Cloud services, including Filestore. """ + CONNECT_MODE_UNSPECIFIED = 0 DIRECT_PEERING = 1 PRIVATE_SERVICE_ACCESS = 2 @@ -249,6 +251,7 @@ class AccessMode(proto.Enum): The client can read and write the file share (default). """ + ACCESS_MODE_UNSPECIFIED = 0 READ_ONLY = 1 READ_WRITE = 2 @@ -266,6 +269,7 @@ class SquashMode(proto.Enum): The Root user has squashed access to the anonymous uid/gid. """ + SQUASH_MODE_UNSPECIFIED = 0 NO_ROOT_SQUASH = 1 ROOT_SQUASH = 2 @@ -328,6 +332,7 @@ class State(proto.Enum): You can get further details from the ``stateReasons`` field of the ``ReplicaConfig`` object. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 3 @@ -347,6 +352,7 @@ class StateReason(proto.Enum): The remove replica peer instance operation failed. """ + STATE_REASON_UNSPECIFIED = 0 PEER_INSTANCE_UNREACHABLE = 1 REMOVE_FAILED = 2 @@ -397,6 +403,7 @@ class Role(proto.Enum): The instance is the ``STANDBY`` replication member, functions as the replication destination instance. """ + ROLE_UNSPECIFIED = 0 ACTIVE = 1 STANDBY = 2 @@ -533,6 +540,7 @@ class State(proto.Enum): PROMOTING (13): The replica instance is being promoted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -580,6 +588,7 @@ class Tier(proto.Enum): availability needed for mission-critical workloads. """ + TIER_UNSPECIFIED = 0 STANDARD = 1 PREMIUM = 2 @@ -601,6 +610,7 @@ class SuspensionReason(proto.Enum): The KMS key used by the instance is either revoked or denied access to. """ + SUSPENSION_REASON_UNSPECIFIED = 0 KMS_KEY_ISSUE = 1 @@ -616,6 +626,7 @@ class FileProtocol(proto.Enum): NFS_V4_1 (2): NFS 4.1. """ + FILE_PROTOCOL_UNSPECIFIED = 0 NFS_V3 = 1 NFS_V4_1 = 2 @@ -1152,6 +1163,7 @@ class State(proto.Enum): DELETING (3): Snapshot is being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -1455,6 +1467,7 @@ class State(proto.Enum): creating new instances or restoring existing instances. """ + STATE_UNSPECIFIED = 0 CREATING = 1 FINALIZING = 2 diff --git a/packages/google-cloud-filestore/mypy.ini b/packages/google-cloud-filestore/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-filestore/mypy.ini +++ b/packages/google-cloud-filestore/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-filestore/noxfile.py b/packages/google-cloud-filestore/noxfile.py index 46e6acabed01..196a01ea4196 100644 --- a/packages/google-cloud-filestore/noxfile.py +++ b/packages/google-cloud-filestore/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-filestore/tests/unit/gapic/filestore_v1/test_cloud_filestore_manager.py b/packages/google-cloud-filestore/tests/unit/gapic/filestore_v1/test_cloud_filestore_manager.py index 54b622466fba..e92885476a17 100644 --- a/packages/google-cloud-filestore/tests/unit/gapic/filestore_v1/test_cloud_filestore_manager.py +++ b/packages/google-cloud-filestore/tests/unit/gapic/filestore_v1/test_cloud_filestore_manager.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +59,14 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.common.types import operation_metadata from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.cloud.filestore_v1.services.cloud_filestore_manager import ( CloudFilestoreManagerAsyncClient, @@ -1010,10 +1010,9 @@ def test_cloud_filestore_manager_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1057,9 @@ def test_cloud_filestore_manager_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1097,10 +1095,9 @@ def test_cloud_filestore_manager_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1360,9 +1357,7 @@ def test_cloud_filestore_manager_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3062,9 +3057,9 @@ def test_restore_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_instance] = ( + mock_rpc + ) request = {} client.restore_instance(request) @@ -8610,9 +8605,9 @@ def test_restore_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_instance] = ( + mock_rpc + ) request = {} client.restore_instance(request) diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/__init__.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/__init__.py index a2391c72dadd..d31214700e04 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/__init__.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.aml import AMLAsyncClient, AMLClient from .types.backtest_result import ( BacktestResult, diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/async_client.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/async_client.py index f70924e284a9..36f3b074cc20 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/async_client.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.financialservices_v1 import gapic_version as package_version @@ -47,38 +47,40 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.type.datetime_pb2 as datetime_pb2 # type: ignore import google.type.interval_pb2 as interval_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.financialservices_v1.services.aml import pagers +from google.cloud.financialservices_v1.types import ( + backtest_result, + bigquery_destination, + dataset, + engine_config, + engine_version, + instance, + line_of_business, + model, + prediction_result, + service, +) from google.cloud.financialservices_v1.types import ( backtest_result as gcf_backtest_result, ) +from google.cloud.financialservices_v1.types import dataset as gcf_dataset from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config +from google.cloud.financialservices_v1.types import instance as gcf_instance from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) +from google.cloud.financialservices_v1.types import model as gcf_model from google.cloud.financialservices_v1.types import ( prediction_result as gcf_prediction_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import bigquery_destination -from google.cloud.financialservices_v1.types import dataset -from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance -from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import line_of_business -from google.cloud.financialservices_v1.types import model -from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result -from google.cloud.financialservices_v1.types import service from .client import AMLClient from .transports.base import DEFAULT_CLIENT_INFO, AMLTransport @@ -150,7 +152,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AMLAsyncClient: The constructed client. """ - return AMLClient.from_service_account_info.__func__(AMLAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AMLClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AMLAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -166,7 +171,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AMLAsyncClient: The constructed client. """ - return AMLClient.from_service_account_file.__func__(AMLAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AMLClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AMLAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/client.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/client.py index 528d9433a10f..c588cc620f5b 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/client.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.financialservices_v1 import gapic_version as package_version @@ -64,38 +64,40 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.type.datetime_pb2 as datetime_pb2 # type: ignore import google.type.interval_pb2 as interval_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.financialservices_v1.services.aml import pagers +from google.cloud.financialservices_v1.types import ( + backtest_result, + bigquery_destination, + dataset, + engine_config, + engine_version, + instance, + line_of_business, + model, + prediction_result, + service, +) from google.cloud.financialservices_v1.types import ( backtest_result as gcf_backtest_result, ) +from google.cloud.financialservices_v1.types import dataset as gcf_dataset from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config +from google.cloud.financialservices_v1.types import instance as gcf_instance from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) +from google.cloud.financialservices_v1.types import model as gcf_model from google.cloud.financialservices_v1.types import ( prediction_result as gcf_prediction_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import bigquery_destination -from google.cloud.financialservices_v1.types import dataset -from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance -from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import line_of_business -from google.cloud.financialservices_v1.types import model -from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result -from google.cloud.financialservices_v1.types import service from .transports.base import DEFAULT_CLIENT_INFO, AMLTransport from .transports.grpc import AMLGrpcTransport @@ -797,11 +799,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AMLClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AMLClient._read_environment_variables() + ) self._client_cert_source = AMLClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -836,8 +836,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AMLTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/pagers.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/pagers.py index cc9f14dc79b5..78ec55edb6e1 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/pagers.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/pagers.py @@ -75,7 +75,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -231,7 +231,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -307,7 +307,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -387,7 +387,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -463,7 +463,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -543,7 +543,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -619,7 +619,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -699,7 +699,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -775,7 +775,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -855,7 +855,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -933,7 +933,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1015,7 +1015,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1091,7 +1091,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/base.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/base.py index 6914c9ccf6c9..1bf82ae7edf3 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/base.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/base.py @@ -17,34 +17,36 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.financialservices_v1 import gapic_version as package_version from google.cloud.financialservices_v1.types import ( - backtest_result as gcf_backtest_result, + backtest_result, + dataset, + engine_config, + engine_version, + instance, + model, + prediction_result, ) -from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import ( - prediction_result as gcf_prediction_result, + backtest_result as gcf_backtest_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import dataset from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance +from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import model from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result +from google.cloud.financialservices_v1.types import ( + prediction_result as gcf_prediction_result, +) DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -771,13 +773,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc.py index 8a7766fa386b..4724405799ab 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc.py @@ -16,37 +16,39 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.financialservices_v1.types import ( - backtest_result as gcf_backtest_result, + backtest_result, + dataset, + engine_config, + engine_version, + instance, + model, + prediction_result, ) -from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import ( - prediction_result as gcf_prediction_result, + backtest_result as gcf_backtest_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import dataset from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance +from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import model from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result +from google.cloud.financialservices_v1.types import ( + prediction_result as gcf_prediction_result, +) from .base import DEFAULT_CLIENT_INFO, AMLTransport @@ -962,12 +964,12 @@ def export_engine_config_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_engine_config_metadata" not in self._stubs: - self._stubs[ - "export_engine_config_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.financialservices.v1.AML/ExportEngineConfigMetadata", - request_serializer=gcf_engine_config.ExportEngineConfigMetadataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["export_engine_config_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.financialservices.v1.AML/ExportEngineConfigMetadata", + request_serializer=gcf_engine_config.ExportEngineConfigMetadataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["export_engine_config_metadata"] @@ -1193,12 +1195,12 @@ def export_prediction_result_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_prediction_result_metadata" not in self._stubs: - self._stubs[ - "export_prediction_result_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.financialservices.v1.AML/ExportPredictionResultMetadata", - request_serializer=gcf_prediction_result.ExportPredictionResultMetadataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["export_prediction_result_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.financialservices.v1.AML/ExportPredictionResultMetadata", + request_serializer=gcf_prediction_result.ExportPredictionResultMetadataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["export_prediction_result_metadata"] @@ -1368,12 +1370,12 @@ def export_backtest_result_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_backtest_result_metadata" not in self._stubs: - self._stubs[ - "export_backtest_result_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.financialservices.v1.AML/ExportBacktestResultMetadata", - request_serializer=gcf_backtest_result.ExportBacktestResultMetadataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["export_backtest_result_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.financialservices.v1.AML/ExportBacktestResultMetadata", + request_serializer=gcf_backtest_result.ExportBacktestResultMetadataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["export_backtest_result_metadata"] diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc_asyncio.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc_asyncio.py index 194c05f80632..8e236598d2f5 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc_asyncio.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,28 +31,27 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.financialservices_v1.types import ( - backtest_result as gcf_backtest_result, + backtest_result, + dataset, + engine_config, + engine_version, + instance, + model, + prediction_result, ) -from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import ( - prediction_result as gcf_prediction_result, + backtest_result as gcf_backtest_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import dataset from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance +from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import model from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result +from google.cloud.financialservices_v1.types import ( + prediction_result as gcf_prediction_result, +) from .base import DEFAULT_CLIENT_INFO, AMLTransport from .grpc import AMLGrpcTransport @@ -997,12 +999,12 @@ def export_engine_config_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_engine_config_metadata" not in self._stubs: - self._stubs[ - "export_engine_config_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.financialservices.v1.AML/ExportEngineConfigMetadata", - request_serializer=gcf_engine_config.ExportEngineConfigMetadataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["export_engine_config_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.financialservices.v1.AML/ExportEngineConfigMetadata", + request_serializer=gcf_engine_config.ExportEngineConfigMetadataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["export_engine_config_metadata"] @@ -1233,12 +1235,12 @@ def export_prediction_result_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_prediction_result_metadata" not in self._stubs: - self._stubs[ - "export_prediction_result_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.financialservices.v1.AML/ExportPredictionResultMetadata", - request_serializer=gcf_prediction_result.ExportPredictionResultMetadataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["export_prediction_result_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.financialservices.v1.AML/ExportPredictionResultMetadata", + request_serializer=gcf_prediction_result.ExportPredictionResultMetadataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["export_prediction_result_metadata"] @@ -1412,12 +1414,12 @@ def export_backtest_result_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_backtest_result_metadata" not in self._stubs: - self._stubs[ - "export_backtest_result_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.financialservices.v1.AML/ExportBacktestResultMetadata", - request_serializer=gcf_backtest_result.ExportBacktestResultMetadataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["export_backtest_result_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.financialservices.v1.AML/ExportBacktestResultMetadata", + request_serializer=gcf_backtest_result.ExportBacktestResultMetadataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["export_backtest_result_metadata"] diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest.py index 525a451ee1d5..6ae4164c5969 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest.py @@ -16,37 +16,39 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version from google.cloud.financialservices_v1.types import ( - backtest_result as gcf_backtest_result, + backtest_result, + dataset, + engine_config, + engine_version, + instance, + model, + prediction_result, ) -from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import ( - prediction_result as gcf_prediction_result, + backtest_result as gcf_backtest_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import dataset from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance +from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import model from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result +from google.cloud.financialservices_v1.types import ( + prediction_result as gcf_prediction_result, +) from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAMLRestTransport @@ -4386,9 +4388,7 @@ def __call__( """ - http_options = ( - _BaseAMLRestTransport._BaseExportBacktestResultMetadata._get_http_options() - ) + http_options = _BaseAMLRestTransport._BaseExportBacktestResultMetadata._get_http_options() request, metadata = self._interceptor.pre_export_backtest_result_metadata( request, metadata @@ -4455,11 +4455,10 @@ def __call__( resp = self._interceptor.post_export_backtest_result_metadata(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_export_backtest_result_metadata_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_export_backtest_result_metadata_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4544,9 +4543,7 @@ def __call__( """ - http_options = ( - _BaseAMLRestTransport._BaseExportEngineConfigMetadata._get_http_options() - ) + http_options = _BaseAMLRestTransport._BaseExportEngineConfigMetadata._get_http_options() request, metadata = self._interceptor.pre_export_engine_config_metadata( request, metadata @@ -4613,11 +4610,10 @@ def __call__( resp = self._interceptor.post_export_engine_config_metadata(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_export_engine_config_metadata_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_export_engine_config_metadata_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4861,9 +4857,7 @@ def __call__( """ - http_options = ( - _BaseAMLRestTransport._BaseExportPredictionResultMetadata._get_http_options() - ) + http_options = _BaseAMLRestTransport._BaseExportPredictionResultMetadata._get_http_options() request, metadata = self._interceptor.pre_export_prediction_result_metadata( request, metadata @@ -4930,11 +4924,10 @@ def __call__( resp = self._interceptor.post_export_prediction_result_metadata(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_export_prediction_result_metadata_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_export_prediction_result_metadata_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8357,7 +8350,9 @@ def create_prediction_result( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreatePredictionResult(self._session, self._host, self._interceptor) # type: ignore + return self._CreatePredictionResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_backtest_result( @@ -8409,7 +8404,9 @@ def delete_prediction_result( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeletePredictionResult(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePredictionResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_backtest_result_metadata( @@ -8420,7 +8417,9 @@ def export_backtest_result_metadata( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ExportBacktestResultMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._ExportBacktestResultMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_engine_config_metadata( @@ -8430,7 +8429,9 @@ def export_engine_config_metadata( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ExportEngineConfigMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._ExportEngineConfigMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_model_metadata( @@ -8449,7 +8450,9 @@ def export_prediction_result_metadata( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ExportPredictionResultMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._ExportPredictionResultMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_registered_parties( @@ -8457,7 +8460,9 @@ def export_registered_parties( ) -> Callable[[instance.ExportRegisteredPartiesRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ExportRegisteredParties(self._session, self._host, self._interceptor) # type: ignore + return self._ExportRegisteredParties( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_backtest_result( @@ -8524,7 +8529,9 @@ def import_registered_parties( ) -> Callable[[instance.ImportRegisteredPartiesRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportRegisteredParties(self._session, self._host, self._interceptor) # type: ignore + return self._ImportRegisteredParties( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_backtest_results( @@ -8646,7 +8653,9 @@ def update_prediction_result( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdatePredictionResult(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePredictionResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest_base.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest_base.py index c754c7cd5f78..51382406dd1f 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest_base.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest_base.py @@ -23,22 +23,24 @@ from google.protobuf import json_format from google.cloud.financialservices_v1.types import ( - backtest_result as gcf_backtest_result, + backtest_result, + dataset, + engine_config, + engine_version, + instance, + model, + prediction_result, ) -from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import ( - prediction_result as gcf_prediction_result, + backtest_result as gcf_backtest_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import dataset from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance +from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import model from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result +from google.cloud.financialservices_v1.types import ( + prediction_result as gcf_prediction_result, +) from .base import DEFAULT_CLIENT_INFO, AMLTransport diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/__init__.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/__init__.py index 39fd49590d9f..f9c30b7369fc 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/__init__.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/__init__.py @@ -24,7 +24,9 @@ ListBacktestResultsResponse, UpdateBacktestResultRequest, ) -from .bigquery_destination import BigQueryDestination +from .bigquery_destination import ( + BigQueryDestination, +) from .dataset import ( CreateDatasetRequest, Dataset, @@ -64,7 +66,9 @@ ListInstancesResponse, UpdateInstanceRequest, ) -from .line_of_business import LineOfBusiness +from .line_of_business import ( + LineOfBusiness, +) from .model import ( CreateModelRequest, DeleteModelRequest, @@ -87,7 +91,9 @@ PredictionResult, UpdatePredictionResultRequest, ) -from .service import OperationMetadata +from .service import ( + OperationMetadata, +) __all__ = ( "BacktestResult", diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/backtest_result.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/backtest_result.py index a44e676a880a..50b7881dcccd 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/backtest_result.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/backtest_result.py @@ -21,10 +21,10 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.financialservices_v1.types import bigquery_destination from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) -from google.cloud.financialservices_v1.types import bigquery_destination __protobuf__ = proto.module( package="google.cloud.financialservices.v1", @@ -105,6 +105,7 @@ class State(proto.Enum): The resource is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/bigquery_destination.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/bigquery_destination.py index 68294fbcf61e..7faa79fef8b2 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/bigquery_destination.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/bigquery_destination.py @@ -58,6 +58,7 @@ class WriteDisposition(proto.Enum): If the table already exists, the data will be overwritten. """ + WRITE_DISPOSITION_UNSPECIFIED = 0 WRITE_EMPTY = 1 WRITE_TRUNCATE = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/dataset.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/dataset.py index da741092d426..797327260b10 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/dataset.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/dataset.py @@ -94,6 +94,7 @@ class State(proto.Enum): The resource is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_config.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_config.py index edf642ea4dd3..900a0d0cc99a 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_config.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_config.py @@ -21,10 +21,10 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.financialservices_v1.types import bigquery_destination from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) -from google.cloud.financialservices_v1.types import bigquery_destination __protobuf__ = proto.module( package="google.cloud.financialservices.v1", @@ -106,6 +106,7 @@ class State(proto.Enum): The resource is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -126,6 +127,7 @@ class HyperparameterSourceType(proto.Enum): The hyperparameters are inherited from another EngineConfig. """ + HYPERPARAMETER_SOURCE_TYPE_UNSPECIFIED = 0 TUNING = 1 INHERITED = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_version.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_version.py index 4a69af4fa5f4..a8a38b924c91 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_version.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_version.py @@ -79,6 +79,7 @@ class State(proto.Enum): Version is deprecated, listed for informational purposes only. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 LIMITED = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/instance.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/instance.py index 84adef7491a2..584a0d039477 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/instance.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/instance.py @@ -21,10 +21,10 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.financialservices_v1.types import bigquery_destination from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) -from google.cloud.financialservices_v1.types import bigquery_destination __protobuf__ = proto.module( package="google.cloud.financialservices.v1", @@ -91,6 +91,7 @@ class State(proto.Enum): The resource is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -403,6 +404,7 @@ class UpdateMode(proto.Enum): APPEND (2): Add new parties to Parties Table. """ + UPDATE_MODE_UNSPECIFIED = 0 REPLACE = 1 APPEND = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/line_of_business.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/line_of_business.py index aa7057a16532..7d7dbbe8e08d 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/line_of_business.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/line_of_business.py @@ -38,6 +38,7 @@ class LineOfBusiness(proto.Enum): RETAIL (2): Retail LineOfBusiness. """ + LINE_OF_BUSINESS_UNSPECIFIED = 0 COMMERCIAL = 1 RETAIL = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/model.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/model.py index 87bc02cb50b1..21a3a1f760ec 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/model.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/model.py @@ -21,10 +21,10 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.financialservices_v1.types import bigquery_destination from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) -from google.cloud.financialservices_v1.types import bigquery_destination __protobuf__ = proto.module( package="google.cloud.financialservices.v1", @@ -103,6 +103,7 @@ class State(proto.Enum): The resource is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/prediction_result.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/prediction_result.py index 3d50d0a968b0..7aeca6c52072 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/prediction_result.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/prediction_result.py @@ -21,10 +21,10 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.financialservices_v1.types import bigquery_destination from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) -from google.cloud.financialservices_v1.types import bigquery_destination __protobuf__ = proto.module( package="google.cloud.financialservices.v1", @@ -107,6 +107,7 @@ class State(proto.Enum): The resource is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-financialservices/mypy.ini b/packages/google-cloud-financialservices/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-financialservices/mypy.ini +++ b/packages/google-cloud-financialservices/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-financialservices/noxfile.py b/packages/google-cloud-financialservices/noxfile.py index 0cd19310d635..77dcc3dca922 100644 --- a/packages/google-cloud-financialservices/noxfile.py +++ b/packages/google-cloud-financialservices/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-financialservices/tests/unit/gapic/financialservices_v1/test_aml.py b/packages/google-cloud-financialservices/tests/unit/gapic/financialservices_v1/test_aml.py index 69f1514b7187..6bb78d1c866c 100644 --- a/packages/google-cloud-financialservices/tests/unit/gapic/financialservices_v1/test_aml.py +++ b/packages/google-cloud-financialservices/tests/unit/gapic/financialservices_v1/test_aml.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,21 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.type.datetime_pb2 as datetime_pb2 # type: ignore -import google.type.interval_pb2 as interval_pb2 # type: ignore from google.cloud.financialservices_v1.services.aml import ( AMLAsyncClient, @@ -75,29 +75,31 @@ pagers, transports, ) +from google.cloud.financialservices_v1.types import ( + backtest_result, + bigquery_destination, + dataset, + engine_config, + engine_version, + instance, + line_of_business, + model, + prediction_result, + service, +) from google.cloud.financialservices_v1.types import ( backtest_result as gcf_backtest_result, ) +from google.cloud.financialservices_v1.types import dataset as gcf_dataset from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config +from google.cloud.financialservices_v1.types import instance as gcf_instance from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) +from google.cloud.financialservices_v1.types import model as gcf_model from google.cloud.financialservices_v1.types import ( prediction_result as gcf_prediction_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import bigquery_destination -from google.cloud.financialservices_v1.types import dataset -from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance -from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import line_of_business -from google.cloud.financialservices_v1.types import model -from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result -from google.cloud.financialservices_v1.types import service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -907,10 +909,9 @@ def test_aml_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +956,9 @@ def test_aml_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +994,9 @@ def test_aml_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1224,9 +1223,7 @@ def test_aml_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -7379,9 +7376,9 @@ def test_export_model_metadata_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_model_metadata - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_model_metadata] = ( + mock_rpc + ) request = {} client.export_model_metadata(request) @@ -8082,9 +8079,9 @@ def test_list_engine_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_engine_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_engine_configs] = ( + mock_rpc + ) request = {} client.list_engine_configs(request) @@ -8636,9 +8633,9 @@ def test_get_engine_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_engine_config] = ( + mock_rpc + ) request = {} client.get_engine_config(request) @@ -8989,9 +8986,9 @@ def test_create_engine_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_engine_config] = ( + mock_rpc + ) request = {} client.create_engine_config(request) @@ -9355,9 +9352,9 @@ def test_update_engine_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_engine_config] = ( + mock_rpc + ) request = {} client.update_engine_config(request) @@ -10078,9 +10075,9 @@ def test_delete_engine_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_engine_config] = ( + mock_rpc + ) request = {} client.delete_engine_config(request) @@ -10431,9 +10428,9 @@ def test_get_engine_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_engine_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_engine_version] = ( + mock_rpc + ) request = {} client.get_engine_version(request) @@ -10784,9 +10781,9 @@ def test_list_engine_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_engine_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_engine_versions] = ( + mock_rpc + ) request = {} client.list_engine_versions(request) @@ -11896,9 +11893,9 @@ def test_get_prediction_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_prediction_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_prediction_result] = ( + mock_rpc + ) request = {} client.get_prediction_result(request) @@ -13699,9 +13696,9 @@ def test_list_backtest_results_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backtest_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backtest_results] = ( + mock_rpc + ) request = {} client.list_backtest_results(request) @@ -14255,9 +14252,9 @@ def test_get_backtest_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backtest_result] = ( + mock_rpc + ) request = {} client.get_backtest_result(request) @@ -14609,9 +14606,9 @@ def test_create_backtest_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backtest_result] = ( + mock_rpc + ) request = {} client.create_backtest_result(request) @@ -14976,9 +14973,9 @@ def test_update_backtest_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backtest_result] = ( + mock_rpc + ) request = {} client.update_backtest_result(request) @@ -15700,9 +15697,9 @@ def test_delete_backtest_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backtest_result] = ( + mock_rpc + ) request = {} client.delete_backtest_result(request) @@ -19280,9 +19277,9 @@ def test_export_model_metadata_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_model_metadata - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_model_metadata] = ( + mock_rpc + ) request = {} client.export_model_metadata(request) @@ -19657,9 +19654,9 @@ def test_list_engine_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_engine_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_engine_configs] = ( + mock_rpc + ) request = {} client.list_engine_configs(request) @@ -19923,9 +19920,9 @@ def test_get_engine_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_engine_config] = ( + mock_rpc + ) request = {} client.get_engine_config(request) @@ -20107,9 +20104,9 @@ def test_create_engine_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_engine_config] = ( + mock_rpc + ) request = {} client.create_engine_config(request) @@ -20329,9 +20326,9 @@ def test_update_engine_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_engine_config] = ( + mock_rpc + ) request = {} client.update_engine_config(request) @@ -20728,9 +20725,9 @@ def test_delete_engine_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_engine_config] = ( + mock_rpc + ) request = {} client.delete_engine_config(request) @@ -20913,9 +20910,9 @@ def test_get_engine_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_engine_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_engine_version] = ( + mock_rpc + ) request = {} client.get_engine_version(request) @@ -21097,9 +21094,9 @@ def test_list_engine_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_engine_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_engine_versions] = ( + mock_rpc + ) request = {} client.list_engine_versions(request) @@ -21637,9 +21634,9 @@ def test_get_prediction_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_prediction_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_prediction_result] = ( + mock_rpc + ) request = {} client.get_prediction_result(request) @@ -22635,9 +22632,9 @@ def test_list_backtest_results_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backtest_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backtest_results] = ( + mock_rpc + ) request = {} client.list_backtest_results(request) @@ -22903,9 +22900,9 @@ def test_get_backtest_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backtest_result] = ( + mock_rpc + ) request = {} client.get_backtest_result(request) @@ -23088,9 +23085,9 @@ def test_create_backtest_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backtest_result] = ( + mock_rpc + ) request = {} client.create_backtest_result(request) @@ -23311,9 +23308,9 @@ def test_update_backtest_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backtest_result] = ( + mock_rpc + ) request = {} client.update_backtest_result(request) @@ -23711,9 +23708,9 @@ def test_delete_backtest_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backtest_result] = ( + mock_rpc + ) request = {} client.delete_backtest_result(request) diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/__init__.py b/packages/google-cloud-functions/google/cloud/functions_v1/__init__.py index 02772ffc354a..f606afc732ec 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/__init__.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_functions_service import ( CloudFunctionsServiceAsyncClient, CloudFunctionsServiceClient, diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/async_client.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/async_client.py index 4c4f4c5111ab..0633fc337344 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/async_client.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.functions_v1 import gapic_version as package_version @@ -46,15 +46,17 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.functions_v1.services.cloud_functions_service import pagers from google.cloud.functions_v1.types import functions, operations @@ -139,7 +141,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudFunctionsServiceAsyncClient: The constructed client. """ - return CloudFunctionsServiceClient.from_service_account_info.__func__(CloudFunctionsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudFunctionsServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(CloudFunctionsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +160,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudFunctionsServiceAsyncClient: The constructed client. """ - return CloudFunctionsServiceClient.from_service_account_file.__func__(CloudFunctionsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudFunctionsServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(CloudFunctionsServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -193,7 +201,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudFunctionsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudFunctionsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudFunctionsServiceTransport: diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/client.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/client.py index 5f1ef3290741..fe00bc36cab2 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/client.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.functions_v1 import gapic_version as package_version @@ -63,15 +63,17 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.functions_v1.services.cloud_functions_service import pagers from google.cloud.functions_v1.types import functions, operations @@ -90,9 +92,7 @@ class CloudFunctionsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudFunctionsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudFunctionsServiceTransport]] _transport_registry["grpc"] = CloudFunctionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = CloudFunctionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = CloudFunctionsServiceRestTransport @@ -688,11 +688,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudFunctionsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudFunctionsServiceClient._read_environment_variables() + ) self._client_cert_source = CloudFunctionsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -727,8 +725,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudFunctionsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/pagers.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/pagers.py index 0947d608bef2..28c131615310 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/pagers.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/__init__.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/__init__.py index 15d2b6150200..6c6842ac2e7a 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/__init__.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudFunctionsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudFunctionsServiceTransport]] _transport_registry["grpc"] = CloudFunctionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = CloudFunctionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = CloudFunctionsServiceRestTransport diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/base.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/base.py index 1511c424b57e..d4577ea380ba 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/base.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/base.py @@ -17,19 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.functions_v1 import gapic_version as package_version from google.cloud.functions_v1.types import functions diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc.py index 3a4ff4cc7799..a5cdedf61a3a 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.functions_v1.types import functions diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc_asyncio.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc_asyncio.py index 2b8218c7b3d9..ab0d9a68387a 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc_asyncio.py @@ -17,25 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.functions_v1.types import functions diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest.py index 173306708ab0..558c3c702b70 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest.py @@ -16,21 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -961,9 +963,7 @@ def __call__( Response of ``CallFunction`` method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseCallFunction._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseCallFunction._get_http_options() request, metadata = self._interceptor.pre_call_function(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseCallFunction._get_transcoded_request( @@ -1115,9 +1115,7 @@ def __call__( """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseCreateFunction._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseCreateFunction._get_http_options() request, metadata = self._interceptor.pre_create_function(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseCreateFunction._get_transcoded_request( @@ -1266,9 +1264,7 @@ def __call__( """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseDeleteFunction._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseDeleteFunction._get_http_options() request, metadata = self._interceptor.pre_delete_function(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseDeleteFunction._get_transcoded_request( @@ -1410,9 +1406,7 @@ def __call__( Response of ``GenerateDownloadUrl`` method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseGenerateDownloadUrl._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseGenerateDownloadUrl._get_http_options() request, metadata = self._interceptor.pre_generate_download_url( request, metadata @@ -1567,9 +1561,7 @@ def __call__( Response of ``GenerateSourceUploadUrl`` method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseGenerateUploadUrl._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseGenerateUploadUrl._get_http_options() request, metadata = self._interceptor.pre_generate_upload_url( request, metadata @@ -1727,9 +1719,7 @@ def __call__( """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseGetFunction._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseGetFunction._get_http_options() request, metadata = self._interceptor.pre_get_function(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseGetFunction._get_transcoded_request( @@ -1947,9 +1937,7 @@ def __call__( """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2092,9 +2080,7 @@ def __call__( Response for the ``ListFunctions`` method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseListFunctions._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseListFunctions._get_http_options() request, metadata = self._interceptor.pre_list_functions(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseListFunctions._get_transcoded_request( @@ -2313,9 +2299,7 @@ def __call__( """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2464,9 +2448,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2622,9 +2604,7 @@ def __call__( """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseUpdateFunction._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseUpdateFunction._get_http_options() request, metadata = self._interceptor.pre_update_function(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseUpdateFunction._get_transcoded_request( @@ -2868,9 +2848,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -3009,9 +2987,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3150,9 +3126,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest_base.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest_base.py index 4f06963c289a..0c3b77a9cedd 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest_base.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.api_core import gapic_v1, path_template +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/types/__init__.py b/packages/google-cloud-functions/google/cloud/functions_v1/types/__init__.py index 110a919c29cd..5e8659f9439b 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/types/__init__.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/types/__init__.py @@ -35,7 +35,10 @@ SourceRepository, UpdateFunctionRequest, ) -from .operations import OperationMetadataV1, OperationType +from .operations import ( + OperationMetadataV1, + OperationType, +) __all__ = ( "CallFunctionRequest", diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/types/functions.py b/packages/google-cloud-functions/google/cloud/functions_v1/types/functions.py index 30c45a19004c..4fc739781c86 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/types/functions.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/types/functions.py @@ -71,6 +71,7 @@ class CloudFunctionStatus(proto.Enum): be updated or deleted to move it out of this state. """ + CLOUD_FUNCTION_STATUS_UNSPECIFIED = 0 ACTIVE = 1 OFFLINE = 2 @@ -321,6 +322,7 @@ class VpcConnectorEgressSettings(proto.Enum): Force the use of VPC Access Connector for all egress traffic from the function. """ + VPC_CONNECTOR_EGRESS_SETTINGS_UNSPECIFIED = 0 PRIVATE_RANGES_ONLY = 1 ALL_TRAFFIC = 2 @@ -345,6 +347,7 @@ class IngressSettings(proto.Enum): Allow HTTP traffic from private VPC sources and through GCLB. """ + INGRESS_SETTINGS_UNSPECIFIED = 0 ALLOW_ALL = 1 ALLOW_INTERNAL_ONLY = 2 @@ -367,6 +370,7 @@ class DockerRegistry(proto.Enum): also be specified by the user using the ``docker_repository`` field. """ + DOCKER_REGISTRY_UNSPECIFIED = 0 CONTAINER_REGISTRY = 1 ARTIFACT_REGISTRY = 2 @@ -633,6 +637,7 @@ class SecurityLevel(proto.Enum): application can examine the request to determine which protocol was used and respond accordingly. """ + SECURITY_LEVEL_UNSPECIFIED = 0 SECURE_ALWAYS = 1 SECURE_OPTIONAL = 2 diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/types/operations.py b/packages/google-cloud-functions/google/cloud/functions_v1/types/operations.py index 47a11cfd8aa1..585ed0341d2e 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/types/operations.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/types/operations.py @@ -43,6 +43,7 @@ class OperationType(proto.Enum): DELETE_FUNCTION (3): Triggered by DeleteFunction call. """ + OPERATION_UNSPECIFIED = 0 CREATE_FUNCTION = 1 UPDATE_FUNCTION = 2 diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/__init__.py b/packages/google-cloud-functions/google/cloud/functions_v2/__init__.py index 3328bc2025a6..c60161d267bb 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/__init__.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.function_service import FunctionServiceAsyncClient, FunctionServiceClient from .types.functions import ( AutomaticUpdatePolicy, diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/async_client.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/async_client.py index 6c2406ca8352..3a1b1a47e432 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/async_client.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.functions_v2 import gapic_version as package_version @@ -46,13 +46,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.functions_v2.services.function_service import pagers from google.cloud.functions_v2.types import functions @@ -147,7 +149,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FunctionServiceAsyncClient: The constructed client. """ - return FunctionServiceClient.from_service_account_info.__func__(FunctionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + FunctionServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(FunctionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -163,7 +168,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FunctionServiceAsyncClient: The constructed client. """ - return FunctionServiceClient.from_service_account_file.__func__(FunctionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + FunctionServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(FunctionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/client.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/client.py index bbf6ed116e86..80c54311aecc 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/client.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.functions_v2 import gapic_version as package_version @@ -63,13 +63,15 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.functions_v2.services.function_service import pagers from google.cloud.functions_v2.types import functions @@ -88,9 +90,7 @@ class FunctionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[FunctionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[FunctionServiceTransport]] _transport_registry["grpc"] = FunctionServiceGrpcTransport _transport_registry["grpc_asyncio"] = FunctionServiceGrpcAsyncIOTransport _transport_registry["rest"] = FunctionServiceRestTransport @@ -837,11 +837,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FunctionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FunctionServiceClient._read_environment_variables() + ) self._client_cert_source = FunctionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -876,8 +874,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FunctionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/pagers.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/pagers.py index e09a433570f0..575ec083e653 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/pagers.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/base.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/base.py index ee3abbe08d6b..29953094aebc 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/base.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.functions_v2 import gapic_version as package_version from google.cloud.functions_v2.types import functions diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc.py index f63177f6642a..03ecd4468196 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.functions_v2.types import functions diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc_asyncio.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc_asyncio.py index 21b5564dbb8b..516347fbe416 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.functions_v2.types import functions diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest.py index b1b7fc82e841..4961363d0138 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -867,9 +869,7 @@ def __call__( """ - http_options = ( - _BaseFunctionServiceRestTransport._BaseCreateFunction._get_http_options() - ) + http_options = _BaseFunctionServiceRestTransport._BaseCreateFunction._get_http_options() request, metadata = self._interceptor.pre_create_function(request, metadata) transcoded_request = _BaseFunctionServiceRestTransport._BaseCreateFunction._get_transcoded_request( @@ -1017,9 +1017,7 @@ def __call__( """ - http_options = ( - _BaseFunctionServiceRestTransport._BaseDeleteFunction._get_http_options() - ) + http_options = _BaseFunctionServiceRestTransport._BaseDeleteFunction._get_http_options() request, metadata = self._interceptor.pre_delete_function(request, metadata) transcoded_request = _BaseFunctionServiceRestTransport._BaseDeleteFunction._get_transcoded_request( @@ -1161,9 +1159,7 @@ def __call__( Response of ``GenerateDownloadUrl`` method. """ - http_options = ( - _BaseFunctionServiceRestTransport._BaseGenerateDownloadUrl._get_http_options() - ) + http_options = _BaseFunctionServiceRestTransport._BaseGenerateDownloadUrl._get_http_options() request, metadata = self._interceptor.pre_generate_download_url( request, metadata @@ -1316,9 +1312,7 @@ def __call__( Response of ``GenerateSourceUploadUrl`` method. """ - http_options = ( - _BaseFunctionServiceRestTransport._BaseGenerateUploadUrl._get_http_options() - ) + http_options = _BaseFunctionServiceRestTransport._BaseGenerateUploadUrl._get_http_options() request, metadata = self._interceptor.pre_generate_upload_url( request, metadata @@ -1909,9 +1903,7 @@ def __call__( """ - http_options = ( - _BaseFunctionServiceRestTransport._BaseUpdateFunction._get_http_options() - ) + http_options = _BaseFunctionServiceRestTransport._BaseUpdateFunction._get_http_options() request, metadata = self._interceptor.pre_update_function(request, metadata) transcoded_request = _BaseFunctionServiceRestTransport._BaseUpdateFunction._get_transcoded_request( @@ -2555,9 +2547,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseFunctionServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseFunctionServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2842,9 +2832,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseFunctionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseFunctionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseFunctionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest_base.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest_base.py index e352529de1c4..c3868d1d3167 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest_base.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/types/functions.py b/packages/google-cloud-functions/google/cloud/functions_v2/types/functions.py index b7a2aedbe4a5..27e43bd0ec67 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/types/functions.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/types/functions.py @@ -74,6 +74,7 @@ class OperationType(proto.Enum): DELETE_FUNCTION (3): DeleteFunction """ + OPERATIONTYPE_UNSPECIFIED = 0 CREATE_FUNCTION = 1 UPDATE_FUNCTION = 2 @@ -91,6 +92,7 @@ class Environment(proto.Enum): GEN_2 (2): Gen 2 """ + ENVIRONMENT_UNSPECIFIED = 0 GEN_1 = 1 GEN_2 = 2 @@ -171,6 +173,7 @@ class State(proto.Enum): be updated or deleted to move it out of this state. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 FAILED = 2 @@ -271,6 +274,7 @@ class Severity(proto.Enum): INFO (3): INFO-level severity. """ + SEVERITY_UNSPECIFIED = 0 ERROR = 1 WARNING = 2 @@ -601,6 +605,7 @@ class DockerRegistry(proto.Enum): also be specified by the user using the ``docker_repository`` field. """ + DOCKER_REGISTRY_UNSPECIFIED = 0 CONTAINER_REGISTRY = 1 ARTIFACT_REGISTRY = 2 @@ -783,6 +788,7 @@ class VpcConnectorEgressSettings(proto.Enum): Force the use of VPC Access Connector for all egress traffic from the function. """ + VPC_CONNECTOR_EGRESS_SETTINGS_UNSPECIFIED = 0 PRIVATE_RANGES_ONLY = 1 ALL_TRAFFIC = 2 @@ -807,6 +813,7 @@ class IngressSettings(proto.Enum): Allow HTTP traffic from private VPC sources and through GCLB. """ + INGRESS_SETTINGS_UNSPECIFIED = 0 ALLOW_ALL = 1 ALLOW_INTERNAL_ONLY = 2 @@ -835,6 +842,7 @@ class SecurityLevel(proto.Enum): application can examine the request to determine which protocol was used and respond accordingly. """ + SECURITY_LEVEL_UNSPECIFIED = 0 SECURE_ALWAYS = 1 SECURE_OPTIONAL = 2 @@ -1110,6 +1118,7 @@ class RetryPolicy(proto.Enum): Retry on any failure, retry up to 7 days with an exponential backoff (capped at 10 seconds). """ + RETRY_POLICY_UNSPECIFIED = 0 RETRY_POLICY_DO_NOT_RETRY = 1 RETRY_POLICY_RETRY = 2 @@ -1543,6 +1552,7 @@ class RuntimeStage(proto.Enum): DECOMMISSIONED (6): The runtime is no longer supported. """ + RUNTIME_STAGE_UNSPECIFIED = 0 DEVELOPMENT = 1 ALPHA = 2 @@ -1791,6 +1801,7 @@ class Name(proto.Enum): TRIGGER_ROLLBACK (6): Trigger Rollback Stage """ + NAME_UNSPECIFIED = 0 ARTIFACT_REGISTRY = 1 BUILD = 2 @@ -1812,6 +1823,7 @@ class State(proto.Enum): COMPLETE (3): Stage has completed. """ + STATE_UNSPECIFIED = 0 NOT_STARTED = 1 IN_PROGRESS = 2 diff --git a/packages/google-cloud-functions/mypy.ini b/packages/google-cloud-functions/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-functions/mypy.ini +++ b/packages/google-cloud-functions/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-functions/noxfile.py b/packages/google-cloud-functions/noxfile.py index c70ad80a3ef9..2f4b168cbb0c 100644 --- a/packages/google-cloud-functions/noxfile.py +++ b/packages/google-cloud-functions/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_async.py b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_async.py index 4e4132f6de64..c34d2bcb0363 100644 --- a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_async.py +++ b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-functions -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START cloudfunctions_v1_generated_CloudFunctionsService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import functions_v1 diff --git a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_sync.py b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_sync.py index a4c4fe590714..cad2ec5a4692 100644 --- a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_sync.py +++ b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-functions -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START cloudfunctions_v1_generated_CloudFunctionsService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import functions_v1 diff --git a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_async.py b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_async.py index 851900811728..d3dab46649ee 100644 --- a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_async.py +++ b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-functions -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START cloudfunctions_v1_generated_CloudFunctionsService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import functions_v1 diff --git a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_sync.py b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_sync.py index 0c7af2b6738d..4e359995646c 100644 --- a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_sync.py +++ b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-functions -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START cloudfunctions_v1_generated_CloudFunctionsService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import functions_v1 diff --git a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_async.py b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_async.py index 6e4b61986a9c..c8f434a72cc2 100644 --- a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_async.py +++ b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-functions -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START cloudfunctions_v1_generated_CloudFunctionsService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import functions_v1 diff --git a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_sync.py b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_sync.py index be5e4f0f8024..7874e9298800 100644 --- a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-functions -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START cloudfunctions_v1_generated_CloudFunctionsService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import functions_v1 diff --git a/packages/google-cloud-functions/tests/unit/gapic/functions_v1/test_cloud_functions_service.py b/packages/google-cloud-functions/tests/unit/gapic/functions_v1/test_cloud_functions_service.py index 697a537aab10..89ffb1ba10d7 100644 --- a/packages/google-cloud-functions/tests/unit/gapic/functions_v1/test_cloud_functions_service.py +++ b/packages/google-cloud-functions/tests/unit/gapic/functions_v1/test_cloud_functions_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,27 +63,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.options_pb2 as options_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.functions_v1.services.cloud_functions_service import ( CloudFunctionsServiceAsyncClient, @@ -1016,10 +1018,9 @@ def test_cloud_functions_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1064,10 +1065,9 @@ def test_cloud_functions_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1103,10 +1103,9 @@ def test_cloud_functions_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1366,9 +1365,7 @@ def test_cloud_functions_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3678,9 +3675,9 @@ def test_generate_upload_url_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_upload_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_upload_url] = ( + mock_rpc + ) request = {} client.generate_upload_url(request) @@ -3934,9 +3931,9 @@ def test_generate_download_url_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_download_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_download_url] = ( + mock_rpc + ) request = {} client.generate_download_url(request) @@ -4710,9 +4707,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5929,9 +5926,9 @@ def test_generate_upload_url_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_upload_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_upload_url] = ( + mock_rpc + ) request = {} client.generate_upload_url(request) @@ -5970,9 +5967,9 @@ def test_generate_download_url_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_download_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_download_url] = ( + mock_rpc + ) request = {} client.generate_download_url(request) @@ -6257,9 +6254,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) diff --git a/packages/google-cloud-functions/tests/unit/gapic/functions_v2/test_function_service.py b/packages/google-cloud-functions/tests/unit/gapic/functions_v2/test_function_service.py index 25bc0ae3710c..c8c017eed270 100644 --- a/packages/google-cloud-functions/tests/unit/gapic/functions_v2/test_function_service.py +++ b/packages/google-cloud-functions/tests/unit/gapic/functions_v2/test_function_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.functions_v2.services.function_service import ( FunctionServiceAsyncClient, @@ -986,10 +988,9 @@ def test_function_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1034,10 +1035,9 @@ def test_function_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1073,10 +1073,9 @@ def test_function_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1323,9 +1322,7 @@ def test_function_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3321,9 +3318,9 @@ def test_generate_upload_url_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_upload_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_upload_url] = ( + mock_rpc + ) request = {} client.generate_upload_url(request) @@ -3577,9 +3574,9 @@ def test_generate_download_url_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_download_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_download_url] = ( + mock_rpc + ) request = {} client.generate_download_url(request) @@ -5067,9 +5064,9 @@ def test_generate_upload_url_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_upload_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_upload_url] = ( + mock_rpc + ) request = {} client.generate_upload_url(request) @@ -5193,9 +5190,9 @@ def test_generate_download_url_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_download_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_download_url] = ( + mock_rpc + ) request = {} client.generate_download_url(request) diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/__init__.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/__init__.py index 318cb910e0ab..e1adc44f6e0c 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/__init__.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.gdc_hardware_management import ( GDCHardwareManagementAsyncClient, GDCHardwareManagementClient, diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/async_client.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/async_client.py index df907ff2f5a2..e8dd7214dcae 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/async_client.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gdchardwaremanagement_v1alpha import gapic_version as package_version @@ -46,12 +46,12 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.gdchardwaremanagement_v1alpha.services.gdc_hardware_management import ( pagers, @@ -146,7 +146,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GDCHardwareManagementAsyncClient: The constructed client. """ - return GDCHardwareManagementClient.from_service_account_info.__func__(GDCHardwareManagementAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GDCHardwareManagementClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GDCHardwareManagementAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -162,7 +165,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GDCHardwareManagementAsyncClient: The constructed client. """ - return GDCHardwareManagementClient.from_service_account_file.__func__(GDCHardwareManagementAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GDCHardwareManagementClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(GDCHardwareManagementAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -200,7 +206,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GDCHardwareManagementClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GDCHardwareManagementClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GDCHardwareManagementTransport: diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/client.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/client.py index edb86943c57c..6430f3e7144f 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/client.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gdchardwaremanagement_v1alpha import gapic_version as package_version @@ -63,12 +63,12 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.gdchardwaremanagement_v1alpha.services.gdc_hardware_management import ( pagers, @@ -89,9 +89,7 @@ class GDCHardwareManagementClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GDCHardwareManagementTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GDCHardwareManagementTransport]] _transport_registry["grpc"] = GDCHardwareManagementGrpcTransport _transport_registry["grpc_asyncio"] = GDCHardwareManagementGrpcAsyncIOTransport _transport_registry["rest"] = GDCHardwareManagementRestTransport @@ -797,11 +795,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GDCHardwareManagementClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GDCHardwareManagementClient._read_environment_variables() + ) self._client_cert_source = GDCHardwareManagementClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -836,8 +832,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GDCHardwareManagementTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/pagers.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/pagers.py index 223ad333591e..a97395f4062b 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/pagers.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1159,7 +1159,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1235,7 +1235,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/__init__.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/__init__.py index 2eb7be7de59a..717ff6deab8c 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/__init__.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GDCHardwareManagementTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GDCHardwareManagementTransport]] _transport_registry["grpc"] = GDCHardwareManagementGrpcTransport _transport_registry["grpc_asyncio"] = GDCHardwareManagementGrpcAsyncIOTransport _transport_registry["rest"] = GDCHardwareManagementRestTransport diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/base.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/base.py index 61f8cd604149..3de3bc85c133 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/base.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gdchardwaremanagement_v1alpha import gapic_version as package_version from google.cloud.gdchardwaremanagement_v1alpha.types import resources, service @@ -980,13 +980,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc.py index f18c3a4cda45..1f99b5a2eec1 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.gdchardwaremanagement_v1alpha.types import resources, service diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc_asyncio.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc_asyncio.py index 9845e3230cb7..fb971f8aad19 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc_asyncio.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gdchardwaremanagement_v1alpha.types import resources, service diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/rest.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/rest.py index f75f1460b8a6..6bab872ba9d7 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/rest.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2433,9 +2433,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCancelOrder._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCancelOrder._get_http_options() request, metadata = self._interceptor.pre_cancel_order(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseCancelOrder._get_transcoded_request( @@ -2585,9 +2583,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCreateComment._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCreateComment._get_http_options() request, metadata = self._interceptor.pre_create_comment(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseCreateComment._get_transcoded_request( @@ -2737,9 +2733,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCreateHardware._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCreateHardware._get_http_options() request, metadata = self._interceptor.pre_create_hardware(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseCreateHardware._get_transcoded_request( @@ -2889,9 +2883,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCreateHardwareGroup._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCreateHardwareGroup._get_http_options() request, metadata = self._interceptor.pre_create_hardware_group( request, metadata @@ -3045,9 +3037,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCreateOrder._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCreateOrder._get_http_options() request, metadata = self._interceptor.pre_create_order(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseCreateOrder._get_transcoded_request( @@ -3197,9 +3187,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCreateSite._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCreateSite._get_http_options() request, metadata = self._interceptor.pre_create_site(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseCreateSite._get_transcoded_request( @@ -3349,9 +3337,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCreateZone._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCreateZone._get_http_options() request, metadata = self._interceptor.pre_create_zone(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseCreateZone._get_transcoded_request( @@ -3500,9 +3486,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseDeleteHardware._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseDeleteHardware._get_http_options() request, metadata = self._interceptor.pre_delete_hardware(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseDeleteHardware._get_transcoded_request( @@ -3646,9 +3630,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseDeleteHardwareGroup._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseDeleteHardwareGroup._get_http_options() request, metadata = self._interceptor.pre_delete_hardware_group( request, metadata @@ -3796,9 +3778,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseDeleteOrder._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseDeleteOrder._get_http_options() request, metadata = self._interceptor.pre_delete_order(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseDeleteOrder._get_transcoded_request( @@ -3942,9 +3922,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseDeleteSite._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseDeleteSite._get_http_options() request, metadata = self._interceptor.pre_delete_site(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseDeleteSite._get_transcoded_request( @@ -4088,9 +4066,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseDeleteZone._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseDeleteZone._get_http_options() request, metadata = self._interceptor.pre_delete_zone(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseDeleteZone._get_transcoded_request( @@ -4233,9 +4209,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseGetChangeLogEntry._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseGetChangeLogEntry._get_http_options() request, metadata = self._interceptor.pre_get_change_log_entry( request, metadata @@ -4382,9 +4356,7 @@ def __call__( A comment on an order. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseGetComment._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseGetComment._get_http_options() request, metadata = self._interceptor.pre_get_comment(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseGetComment._get_transcoded_request( @@ -4529,9 +4501,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseGetHardware._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseGetHardware._get_http_options() request, metadata = self._interceptor.pre_get_hardware(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseGetHardware._get_transcoded_request( @@ -4677,9 +4647,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseGetHardwareGroup._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseGetHardwareGroup._get_http_options() request, metadata = self._interceptor.pre_get_hardware_group( request, metadata @@ -4826,9 +4794,7 @@ def __call__( An order for GDC hardware. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseGetOrder._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseGetOrder._get_http_options() request, metadata = self._interceptor.pre_get_order(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseGetOrder._get_transcoded_request( @@ -5410,9 +5376,7 @@ def __call__( A list of change log entries. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListChangeLogEntries._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListChangeLogEntries._get_http_options() request, metadata = self._interceptor.pre_list_change_log_entries( request, metadata @@ -5561,9 +5525,7 @@ def __call__( A request to list comments. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListComments._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListComments._get_http_options() request, metadata = self._interceptor.pre_list_comments(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListComments._get_transcoded_request( @@ -5706,9 +5668,7 @@ def __call__( A list of hardware. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListHardware._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListHardware._get_http_options() request, metadata = self._interceptor.pre_list_hardware(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListHardware._get_transcoded_request( @@ -5851,9 +5811,7 @@ def __call__( A list of hardware groups. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListHardwareGroups._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListHardwareGroups._get_http_options() request, metadata = self._interceptor.pre_list_hardware_groups( request, metadata @@ -6002,9 +5960,7 @@ def __call__( A list of orders. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListOrders._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListOrders._get_http_options() request, metadata = self._interceptor.pre_list_orders(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListOrders._get_transcoded_request( @@ -6147,9 +6103,7 @@ def __call__( A list of sites. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListSites._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListSites._get_http_options() request, metadata = self._interceptor.pre_list_sites(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListSites._get_transcoded_request( @@ -6292,9 +6246,7 @@ def __call__( A list of SKUs. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListSkus._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListSkus._get_http_options() request, metadata = self._interceptor.pre_list_skus(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListSkus._get_transcoded_request( @@ -6437,9 +6389,7 @@ def __call__( A list of zones. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListZones._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListZones._get_http_options() request, metadata = self._interceptor.pre_list_zones(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListZones._get_transcoded_request( @@ -6584,9 +6534,7 @@ def __call__( A comment on an order. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseRecordActionOnComment._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseRecordActionOnComment._get_http_options() request, metadata = self._interceptor.pre_record_action_on_comment( request, metadata @@ -6743,9 +6691,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseRequestOrderDateChange._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseRequestOrderDateChange._get_http_options() request, metadata = self._interceptor.pre_request_order_date_change( request, metadata @@ -6898,9 +6844,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseSignalZoneState._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseSignalZoneState._get_http_options() request, metadata = self._interceptor.pre_signal_zone_state( request, metadata @@ -7054,9 +6998,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseSubmitOrder._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseSubmitOrder._get_http_options() request, metadata = self._interceptor.pre_submit_order(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseSubmitOrder._get_transcoded_request( @@ -7206,9 +7148,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseUpdateHardware._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseUpdateHardware._get_http_options() request, metadata = self._interceptor.pre_update_hardware(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseUpdateHardware._get_transcoded_request( @@ -7358,9 +7298,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseUpdateHardwareGroup._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseUpdateHardwareGroup._get_http_options() request, metadata = self._interceptor.pre_update_hardware_group( request, metadata @@ -7514,9 +7452,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseUpdateOrder._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseUpdateOrder._get_http_options() request, metadata = self._interceptor.pre_update_order(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseUpdateOrder._get_transcoded_request( @@ -7666,9 +7602,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseUpdateSite._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseUpdateSite._get_http_options() request, metadata = self._interceptor.pre_update_site(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseUpdateSite._get_transcoded_request( @@ -7818,9 +7752,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseUpdateZone._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseUpdateZone._get_http_options() request, metadata = self._interceptor.pre_update_zone(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseUpdateZone._get_transcoded_request( @@ -8143,7 +8075,9 @@ def request_order_date_change( ) -> Callable[[service.RequestOrderDateChangeRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RequestOrderDateChange(self._session, self._host, self._interceptor) # type: ignore + return self._RequestOrderDateChange( + self._session, self._host, self._interceptor + ) # type: ignore @property def signal_zone_state( @@ -8259,9 +8193,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseGetLocation._get_transcoded_request( @@ -8400,9 +8332,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListLocations._get_transcoded_request( @@ -8539,9 +8469,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -8661,9 +8589,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -8781,9 +8707,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseGetOperation._get_transcoded_request( @@ -8922,9 +8846,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/resources.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/resources.py index 72ad3b66c6e4..0be9025fe9e3 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/resources.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/resources.py @@ -67,6 +67,7 @@ class PowerSupply(proto.Enum): POWER_SUPPLY_DC (2): DC power supply. """ + POWER_SUPPLY_UNSPECIFIED = 0 POWER_SUPPLY_AC = 1 POWER_SUPPLY_DC = 2 @@ -85,6 +86,7 @@ class Entity(proto.Enum): VENDOR (3): Vendor. """ + ENTITY_UNSPECIFIED = 0 GOOGLE = 1 CUSTOMER = 2 @@ -219,6 +221,7 @@ class State(proto.Enum): CANCELLED (11): Order has been cancelled. """ + STATE_UNSPECIFIED = 0 DRAFT = 1 SUBMITTED = 2 @@ -246,6 +249,7 @@ class Type(proto.Enum): UNPAID (2): Not billed. """ + _pb_options = {"allow_alias": True} TYPE_UNSPECIFIED = 0 PAID = 1 @@ -270,6 +274,7 @@ class DeploymentType(proto.Enum): Customer lab deployment that we support as though it's prod. """ + DEPLOYMENT_TYPE_UNSPECIFIED = 0 FULL_PRODUCTION = 1 PROOF_OF_CONCEPT = 2 @@ -576,6 +581,7 @@ class State(proto.Enum): An error occurred and customer intervention is required. """ + STATE_UNSPECIFIED = 0 ADDITIONAL_INFO_NEEDED = 1 BUILDING = 2 @@ -724,6 +730,7 @@ class State(proto.Enum): An error occurred and customer intervention is required. """ + STATE_UNSPECIFIED = 0 ADDITIONAL_INFO_NEEDED = 1 BUILDING = 2 @@ -760,6 +767,7 @@ class AddressType(proto.Enum): VIRTUAL (3): Address of a virtual interface. """ + ADDRESS_TYPE_UNSPECIFIED = 0 NIC = 1 BMC = 2 @@ -1105,6 +1113,7 @@ class Type(proto.Enum): SERVER (2): Server SKU. """ + TYPE_UNSPECIFIED = 0 RACK = 1 SERVER = 2 @@ -1268,6 +1277,7 @@ class State(proto.Enum): CANCELLED (4): The Zone has been cancelled. """ + STATE_UNSPECIFIED = 0 ADDITIONAL_INFO_NEEDED = 1 PREPARING = 2 @@ -1292,6 +1302,7 @@ class ProvisioningState(proto.Enum): PROVISIONING_COMPLETE (3): Provisioning is complete. Set by customer. """ + PROVISIONING_STATE_UNSPECIFIED = 0 PROVISIONING_REQUIRED = 1 PROVISIONING_IN_PROGRESS = 2 @@ -1598,6 +1609,7 @@ class PowerReceptacleType(proto.Enum): TYPE_F (7): Type F. """ + POWER_RECEPTACLE_TYPE_UNSPECIFIED = 0 NEMA_5_15 = 1 C_13 = 2 @@ -1616,6 +1628,7 @@ class NetworkUplinkType(proto.Enum): RJ_45 (1): RJ-45. """ + NETWORK_UPLINK_TYPE_UNSPECIFIED = 0 RJ_45 = 1 @@ -1630,6 +1643,7 @@ class Voltage(proto.Enum): VOLTAGE_220 (3): 220V. """ + VOLTAGE_UNSPECIFIED = 0 VOLTAGE_110 = 1 VOLTAGE_220 = 3 @@ -1643,6 +1657,7 @@ class Amperes(proto.Enum): AMPERES_15 (1): 15A. """ + AMPERES_UNSPECIFIED = 0 AMPERES_15 = 1 @@ -1701,6 +1716,7 @@ class RackType(proto.Enum): FOUR_POST (2): Four post rack. """ + RACK_TYPE_UNSPECIFIED = 0 TWO_POST = 1 FOUR_POST = 2 @@ -1979,6 +1995,7 @@ class SubscriptionState(proto.Enum): The subscription has been completed, because it has reached the end date. """ + SUBSCRIPTION_STATE_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/service.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/service.py index 1a60d80e7656..0353b454c7d2 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/service.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/service.py @@ -325,6 +325,7 @@ class Type(proto.Enum): hardware physical and installation information, etc. Further changes to any order information will no longer be allowed. """ + TYPE_UNSPECIFIED = 0 INFO_PENDING = 1 INFO_COMPLETE = 2 @@ -1094,6 +1095,7 @@ class ActionType(proto.Enum): UNREAD (2): Mark comment as unread. """ + ACTION_TYPE_UNSPECIFIED = 0 READ = 1 UNREAD = 2 @@ -1538,6 +1540,7 @@ class StateSignal(proto.Enum): Verify that a valid cluster intent is present. """ + _pb_options = {"allow_alias": True} STATE_SIGNAL_UNSPECIFIED = 0 FACTORY_TURNUP_CHECKS_STARTED = 3 @@ -1557,6 +1560,7 @@ class ProvisioningStateSignal(proto.Enum): PROVISIONING_COMPLETE (2): Provisioning is complete. """ + PROVISIONING_STATE_SIGNAL_UNSPECIFIED = 0 PROVISIONING_IN_PROGRESS = 1 PROVISIONING_COMPLETE = 2 diff --git a/packages/google-cloud-gdchardwaremanagement/mypy.ini b/packages/google-cloud-gdchardwaremanagement/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-gdchardwaremanagement/mypy.ini +++ b/packages/google-cloud-gdchardwaremanagement/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-gdchardwaremanagement/noxfile.py b/packages/google-cloud-gdchardwaremanagement/noxfile.py index 1505c9172bb7..ced60550965d 100644 --- a/packages/google-cloud-gdchardwaremanagement/noxfile.py +++ b/packages/google-cloud-gdchardwaremanagement/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-gdchardwaremanagement/tests/unit/gapic/gdchardwaremanagement_v1alpha/test_gdc_hardware_management.py b/packages/google-cloud-gdchardwaremanagement/tests/unit/gapic/gdchardwaremanagement_v1alpha/test_gdc_hardware_management.py index cba46d58ce5e..25290653cde4 100644 --- a/packages/google-cloud-gdchardwaremanagement/tests/unit/gapic/gdchardwaremanagement_v1alpha/test_gdc_hardware_management.py +++ b/packages/google-cloud-gdchardwaremanagement/tests/unit/gapic/gdchardwaremanagement_v1alpha/test_gdc_hardware_management.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +63,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore -import google.type.datetime_pb2 as datetime_pb2 # type: ignore -import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore -import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore -import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.cloud.gdchardwaremanagement_v1alpha.services.gdc_hardware_management import ( GDCHardwareManagementAsyncClient, @@ -1013,10 +1013,9 @@ def test_gdc_hardware_management_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1060,9 @@ def test_gdc_hardware_management_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1098,9 @@ def test_gdc_hardware_management_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1363,9 +1360,7 @@ def test_gdc_hardware_management_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5924,9 +5919,9 @@ def test_list_hardware_groups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_hardware_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_hardware_groups] = ( + mock_rpc + ) request = {} client.list_hardware_groups(request) @@ -6477,9 +6472,9 @@ def test_get_hardware_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_hardware_group] = ( + mock_rpc + ) request = {} client.get_hardware_group(request) @@ -6828,9 +6823,9 @@ def test_create_hardware_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_hardware_group] = ( + mock_rpc + ) request = {} client.create_hardware_group(request) @@ -7194,9 +7189,9 @@ def test_update_hardware_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_hardware_group] = ( + mock_rpc + ) request = {} client.update_hardware_group(request) @@ -7552,9 +7547,9 @@ def test_delete_hardware_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_hardware_group] = ( + mock_rpc + ) request = {} client.delete_hardware_group(request) @@ -11912,9 +11907,9 @@ def test_get_change_log_entry_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_change_log_entry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_change_log_entry] = ( + mock_rpc + ) request = {} client.get_change_log_entry(request) @@ -15009,9 +15004,9 @@ def test_signal_zone_state_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.signal_zone_state - ] = mock_rpc + client._transport._wrapped_methods[client._transport.signal_zone_state] = ( + mock_rpc + ) request = {} client.signal_zone_state(request) @@ -18028,9 +18023,9 @@ def test_list_hardware_groups_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_hardware_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_hardware_groups] = ( + mock_rpc + ) request = {} client.list_hardware_groups(request) @@ -18292,9 +18287,9 @@ def test_get_hardware_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_hardware_group] = ( + mock_rpc + ) request = {} client.get_hardware_group(request) @@ -18477,9 +18472,9 @@ def test_create_hardware_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_hardware_group] = ( + mock_rpc + ) request = {} client.create_hardware_group(request) @@ -18684,9 +18679,9 @@ def test_update_hardware_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_hardware_group] = ( + mock_rpc + ) request = {} client.update_hardware_group(request) @@ -18888,9 +18883,9 @@ def test_delete_hardware_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_hardware_group] = ( + mock_rpc + ) request = {} client.delete_hardware_group(request) @@ -21168,9 +21163,9 @@ def test_get_change_log_entry_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_change_log_entry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_change_log_entry] = ( + mock_rpc + ) request = {} client.get_change_log_entry(request) @@ -22780,9 +22775,9 @@ def test_signal_zone_state_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.signal_zone_state - ] = mock_rpc + client._transport._wrapped_methods[client._transport.signal_zone_state] = ( + mock_rpc + ) request = {} client.signal_zone_state(request) diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/__init__.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/__init__.py index 18b37c784013..465bc09007b1 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/__init__.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_agent_service import ( DataAgentServiceAsyncClient, DataAgentServiceClient, diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/async_client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/async_client.py index d8a1f5391b0b..9ad0a4f0dec3 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/async_client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1alpha import gapic_version as package_version @@ -46,21 +46,21 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha.services.data_agent_service import pagers from google.cloud.geminidataanalytics_v1alpha.types import ( + data_agent, data_agent_service, data_analytics_agent, ) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent from .client import DataAgentServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport @@ -128,7 +128,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataAgentServiceAsyncClient: The constructed client. """ - return DataAgentServiceClient.from_service_account_info.__func__(DataAgentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataAgentServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataAgentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +147,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataAgentServiceAsyncClient: The constructed client. """ - return DataAgentServiceClient.from_service_account_file.__func__(DataAgentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataAgentServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataAgentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/client.py index 480b72226944..2b1805c4642c 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1alpha import gapic_version as package_version @@ -63,21 +63,21 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha.services.data_agent_service import pagers from google.cloud.geminidataanalytics_v1alpha.types import ( + data_agent, data_agent_service, data_analytics_agent, ) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent from .transports.base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport from .transports.grpc import DataAgentServiceGrpcTransport @@ -93,9 +93,7 @@ class DataAgentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataAgentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataAgentServiceTransport]] _transport_registry["grpc"] = DataAgentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataAgentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataAgentServiceRestTransport @@ -637,11 +635,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataAgentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataAgentServiceClient._read_environment_variables() + ) self._client_cert_source = DataAgentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -676,8 +672,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataAgentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/pagers.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/pagers.py index d14a3f395fb9..10da92dce562 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/pagers.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -226,7 +226,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -304,7 +304,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/base.py index 685d2709400c..1bf10b8b6d8f 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha import gapic_version as package_version +from google.cloud.geminidataanalytics_v1alpha.types import ( + data_agent, + data_agent_service, +) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -373,13 +375,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc.py index 73b6eda384bf..bf83e1233c7b 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from google.cloud.geminidataanalytics_v1alpha.types import ( + data_agent, + data_agent_service, +) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent_service from .base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport @@ -397,12 +399,12 @@ def list_accessible_data_agents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_accessible_data_agents" not in self._stubs: - self._stubs[ - "list_accessible_data_agents" - ] = self._logged_channel.unary_unary( - "/google.cloud.geminidataanalytics.v1alpha.DataAgentService/ListAccessibleDataAgents", - request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, - response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + self._stubs["list_accessible_data_agents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.geminidataanalytics.v1alpha.DataAgentService/ListAccessibleDataAgents", + request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, + response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + ) ) return self._stubs["list_accessible_data_agents"] diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc_asyncio.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc_asyncio.py index 26d4dd23cdf9..4e1418cf90b1 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc_asyncio.py @@ -17,28 +17,30 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.geminidataanalytics_v1alpha.types import ( + data_agent, + data_agent_service, +) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent_service from .base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport from .grpc import DataAgentServiceGrpcTransport @@ -405,12 +407,12 @@ def list_accessible_data_agents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_accessible_data_agents" not in self._stubs: - self._stubs[ - "list_accessible_data_agents" - ] = self._logged_channel.unary_unary( - "/google.cloud.geminidataanalytics.v1alpha.DataAgentService/ListAccessibleDataAgents", - request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, - response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + self._stubs["list_accessible_data_agents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.geminidataanalytics.v1alpha.DataAgentService/ListAccessibleDataAgents", + request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, + response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + ) ) return self._stubs["list_accessible_data_agents"] diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest.py index 2566068876d3..3506c939e563 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest.py @@ -16,26 +16,28 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.geminidataanalytics_v1alpha.types import ( + data_agent, + data_agent_service, +) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataAgentServiceRestTransport @@ -1020,9 +1022,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseCreateDataAgent._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseCreateDataAgent._get_http_options() request, metadata = self._interceptor.pre_create_data_agent( request, metadata @@ -1173,9 +1173,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseCreateDataAgentSync._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseCreateDataAgentSync._get_http_options() request, metadata = self._interceptor.pre_create_data_agent_sync( request, metadata @@ -1328,9 +1326,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseDeleteDataAgent._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseDeleteDataAgent._get_http_options() request, metadata = self._interceptor.pre_delete_data_agent( request, metadata @@ -1469,9 +1465,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseDeleteDataAgentSync._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseDeleteDataAgentSync._get_http_options() request, metadata = self._interceptor.pre_delete_data_agent_sync( request, metadata @@ -1957,9 +1951,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListAccessibleDataAgents._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListAccessibleDataAgents._get_http_options() request, metadata = self._interceptor.pre_list_accessible_data_agents( request, metadata @@ -2112,9 +2104,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListDataAgents._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListDataAgents._get_http_options() request, metadata = self._interceptor.pre_list_data_agents( request, metadata @@ -2490,9 +2480,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseUpdateDataAgent._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseUpdateDataAgent._get_http_options() request, metadata = self._interceptor.pre_update_data_agent( request, metadata @@ -2643,9 +2631,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseUpdateDataAgentSync._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseUpdateDataAgentSync._get_http_options() request, metadata = self._interceptor.pre_update_data_agent_sync( request, metadata @@ -2803,7 +2789,9 @@ def list_accessible_data_agents( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListAccessibleDataAgents(self._session, self._host, self._interceptor) # type: ignore + return self._ListAccessibleDataAgents( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_data_agents( @@ -3041,9 +3029,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataAgentServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -3180,9 +3166,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3300,9 +3284,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -3557,9 +3539,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataAgentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest_base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest_base.py index b2f7ab54b68d..7adea4c33fff 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest_base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import gapic_v1, path_template +from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.geminidataanalytics_v1alpha.types import ( + data_agent, + data_agent_service, +) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent_service from .base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/async_client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/async_client.py index 18e805c545a3..fbbc7e00e4a7 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/async_client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, Awaitable, @@ -31,13 +31,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1alpha import gapic_version as package_version @@ -46,16 +46,18 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha.services.data_chat_service import pagers +from google.cloud.geminidataanalytics_v1alpha.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation -from google.cloud.geminidataanalytics_v1alpha.types import data_chat_service from .client import DataChatServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataChatServiceTransport @@ -130,7 +132,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataChatServiceAsyncClient: The constructed client. """ - return DataChatServiceClient.from_service_account_info.__func__(DataChatServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataChatServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataChatServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +151,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataChatServiceAsyncClient: The constructed client. """ - return DataChatServiceClient.from_service_account_file.__func__(DataChatServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataChatServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataChatServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/client.py index e9d7667c2783..436996facaf8 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1alpha import gapic_version as package_version @@ -62,16 +62,18 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha.services.data_chat_service import pagers +from google.cloud.geminidataanalytics_v1alpha.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation -from google.cloud.geminidataanalytics_v1alpha.types import data_chat_service from .transports.base import DEFAULT_CLIENT_INFO, DataChatServiceTransport from .transports.grpc import DataChatServiceGrpcTransport @@ -87,9 +89,7 @@ class DataChatServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataChatServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataChatServiceTransport]] _transport_registry["grpc"] = DataChatServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataChatServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataChatServiceRestTransport @@ -656,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataChatServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataChatServiceClient._read_environment_variables() + ) self._client_cert_source = DataChatServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -695,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataChatServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/pagers.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/pagers.py index e6eb14b32733..0a408ac51470 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/pagers.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -226,7 +226,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -302,7 +302,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/base.py index f2aca3f3622c..f805c1214b57 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha import gapic_version as package_version +from google.cloud.geminidataanalytics_v1alpha.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation -from google.cloud.geminidataanalytics_v1alpha.types import data_chat_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -315,13 +317,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc.py index 7536d27792b8..fc4592e93703 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.geminidataanalytics_v1alpha.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation -from google.cloud.geminidataanalytics_v1alpha.types import data_chat_service from .base import DEFAULT_CLIENT_INFO, DataChatServiceTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc_asyncio.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc_asyncio.py index 52def98bc847..42f54d79accf 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,18 +31,16 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.geminidataanalytics_v1alpha.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation -from google.cloud.geminidataanalytics_v1alpha.types import data_chat_service from .base import DEFAULT_CLIENT_INFO, DataChatServiceTransport from .grpc import DataChatServiceGrpcTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest.py index 9ae89869429f..9ab4154c447d 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,16 +28,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.geminidataanalytics_v1alpha.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation -from google.cloud.geminidataanalytics_v1alpha.types import data_chat_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataChatServiceRestTransport @@ -883,9 +885,7 @@ def __call__( Message for a conversation. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1032,9 +1032,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -1145,9 +1143,7 @@ def __call__( Message for a conversation. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -1295,9 +1291,7 @@ def __call__( """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2094,9 +2088,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2213,9 +2205,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2470,9 +2460,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataChatServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest_base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest_base.py index 8ad9fc7f7571..d3a64303a495 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest_base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.geminidataanalytics_v1alpha.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation -from google.cloud.geminidataanalytics_v1alpha.types import data_chat_service from .base import DEFAULT_CLIENT_INFO, DataChatServiceTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/__init__.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/__init__.py index 6ded4613aa6c..58c10b4a7da5 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/__init__.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .agent_context import AgentContextReference +from .agent_context import ( + AgentContextReference, +) from .context import ( AnalysisOptions, ChartOptions, @@ -33,8 +35,13 @@ ListConversationsRequest, ListConversationsResponse, ) -from .credentials import Credentials, OAuthCredentials -from .data_agent import DataAgent +from .credentials import ( + Credentials, + OAuthCredentials, +) +from .data_agent import ( + DataAgent, +) from .data_agent_service import ( CreateDataAgentRequest, DeleteDataAgentRequest, @@ -46,7 +53,9 @@ OperationMetadata, UpdateDataAgentRequest, ) -from .data_analytics_agent import DataAnalyticsAgent +from .data_analytics_agent import ( + DataAnalyticsAgent, +) from .data_chat_service import ( AnalysisEvent, AnalysisMessage, diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/context.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/context.py index 2e084e89e397..b266ed8a45e5 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/context.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/context.py @@ -120,6 +120,7 @@ class Source(proto.Enum): The source of the schema relationship is BigQuery table constraints. """ + SOURCE_UNSPECIFIED = 0 BIGQUERY_JOB_HISTORY = 1 LLM_SUGGESTED = 2 @@ -156,12 +157,12 @@ class SchemaPaths(proto.Message): number=2, message="Context.SchemaRelationship.SchemaPaths", ) - sources: MutableSequence[ - "Context.SchemaRelationship.Source" - ] = proto.RepeatedField( - proto.ENUM, - number=3, - enum="Context.SchemaRelationship.Source", + sources: MutableSequence["Context.SchemaRelationship.Source"] = ( + proto.RepeatedField( + proto.ENUM, + number=3, + enum="Context.SchemaRelationship.Source", + ) ) confidence_score: float = proto.Field( proto.FLOAT, diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_agent_service.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_agent_service.py index 5499b89bc97a..2795059cd583 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_agent_service.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_agent_service.py @@ -179,6 +179,7 @@ class CreatorFilter(proto.Enum): Only agents not created by the user calling the API will be returned. """ + CREATOR_FILTER_UNSPECIFIED = 0 NONE = 1 CREATOR_ONLY = 2 diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_chat_service.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_chat_service.py index 797662eeabf1..9f8d73f5f422 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_chat_service.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_chat_service.py @@ -533,6 +533,7 @@ class ContextVersion(proto.Enum): Using this version, DCS will use the latest published context for the data agent. """ + CONTEXT_VERSION_UNSPECIFIED = 0 STAGING = 1 PUBLISHED = 2 @@ -826,6 +827,7 @@ class TextType(proto.Enum): the final answer to the user (``FINAL_RESPONSE``). These messages provide insight into the agent's actions. """ + TEXT_TYPE_UNSPECIFIED = 0 FINAL_RESPONSE = 1 THOUGHT = 2 @@ -1436,6 +1438,7 @@ class SelectionMode(proto.Enum): MULTI_SELECT (2): The user can select multiple options. """ + SELECTION_MODE_UNSPECIFIED = 0 SINGLE_SELECT = 1 MULTI_SELECT = 2 @@ -1456,6 +1459,7 @@ class ClarificationQuestionType(proto.Enum): columns, Looker fields (dimensions/measures), or nested data structure properties. """ + CLARIFICATION_QUESTION_TYPE_UNSPECIFIED = 0 FILTER_VALUES = 1 FIELDS = 2 diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/datasource.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/datasource.py index 0091351cdf5a..bb76cc6131f9 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/datasource.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/datasource.py @@ -20,10 +20,10 @@ import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore +from google.cloud.geminidataanalytics_v1alpha.types import agent_context from google.cloud.geminidataanalytics_v1alpha.types import ( credentials as gcg_credentials, ) -from google.cloud.geminidataanalytics_v1alpha.types import agent_context __protobuf__ = proto.module( package="google.cloud.geminidataanalytics.v1alpha", @@ -63,6 +63,7 @@ class DataFilterType(proto.Enum): filter by default. Currently only used for Looker data sources. """ + DATA_FILTER_TYPE_UNSPECIFIED = 0 ALWAYS_FILTER = 1 @@ -205,12 +206,12 @@ class StudioDatasourceReferences(proto.Message): The references to the studio datasources. """ - studio_references: MutableSequence[ - "StudioDatasourceReference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="StudioDatasourceReference", + studio_references: MutableSequence["StudioDatasourceReference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="StudioDatasourceReference", + ) ) @@ -358,6 +359,7 @@ class Engine(proto.Enum): POSTGRESQL (2): PostgreSQL """ + ENGINE_UNSPECIFIED = 0 GOOGLE_SQL = 1 POSTGRESQL = 2 @@ -447,6 +449,7 @@ class Engine(proto.Enum): MYSQL (2): MySQL """ + ENGINE_UNSPECIFIED = 0 POSTGRESQL = 1 MYSQL = 2 diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/__init__.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/__init__.py index edf8de0c452d..6f318e7d3592 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/__init__.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_agent_service import ( DataAgentServiceAsyncClient, DataAgentServiceClient, diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/async_client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/async_client.py index 42cfe377731c..282a0373aa2f 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/async_client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1beta import gapic_version as package_version @@ -46,21 +46,21 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta.services.data_agent_service import pagers from google.cloud.geminidataanalytics_v1beta.types import ( + data_agent, data_agent_service, data_analytics_agent, ) from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent from .client import DataAgentServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport @@ -128,7 +128,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataAgentServiceAsyncClient: The constructed client. """ - return DataAgentServiceClient.from_service_account_info.__func__(DataAgentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataAgentServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataAgentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +147,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataAgentServiceAsyncClient: The constructed client. """ - return DataAgentServiceClient.from_service_account_file.__func__(DataAgentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataAgentServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataAgentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/client.py index d46c20f3b278..c473386e883e 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1beta import gapic_version as package_version @@ -63,21 +63,21 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta.services.data_agent_service import pagers from google.cloud.geminidataanalytics_v1beta.types import ( + data_agent, data_agent_service, data_analytics_agent, ) from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent from .transports.base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport from .transports.grpc import DataAgentServiceGrpcTransport @@ -93,9 +93,7 @@ class DataAgentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataAgentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataAgentServiceTransport]] _transport_registry["grpc"] = DataAgentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataAgentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataAgentServiceRestTransport @@ -637,11 +635,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataAgentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataAgentServiceClient._read_environment_variables() + ) self._client_cert_source = DataAgentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -676,8 +672,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataAgentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/pagers.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/pagers.py index 0d3251f97334..1ba82a89622d 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/pagers.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/base.py index 76f6de7c2853..8bd2d14cb878 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/base.py @@ -17,23 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta import gapic_version as package_version +from google.cloud.geminidataanalytics_v1beta.types import data_agent, data_agent_service from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -373,13 +372,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc.py index 8889c749ee4b..271c27a5a487 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc.py @@ -16,26 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 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.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.longrunning import operations_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf.json_format import MessageToJson +from google.cloud.geminidataanalytics_v1beta.types import data_agent, data_agent_service from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent_service from .base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport @@ -397,12 +396,12 @@ def list_accessible_data_agents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_accessible_data_agents" not in self._stubs: - self._stubs[ - "list_accessible_data_agents" - ] = self._logged_channel.unary_unary( - "/google.cloud.geminidataanalytics.v1beta.DataAgentService/ListAccessibleDataAgents", - request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, - response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + self._stubs["list_accessible_data_agents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.geminidataanalytics.v1beta.DataAgentService/ListAccessibleDataAgents", + request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, + response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + ) ) return self._stubs["list_accessible_data_agents"] diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc_asyncio.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc_asyncio.py index b78de27888b7..3b6a45a5349f 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc_asyncio.py @@ -17,28 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.geminidataanalytics_v1beta.types import data_agent, data_agent_service from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent_service from .base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport from .grpc import DataAgentServiceGrpcTransport @@ -405,12 +404,12 @@ def list_accessible_data_agents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_accessible_data_agents" not in self._stubs: - self._stubs[ - "list_accessible_data_agents" - ] = self._logged_channel.unary_unary( - "/google.cloud.geminidataanalytics.v1beta.DataAgentService/ListAccessibleDataAgents", - request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, - response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + self._stubs["list_accessible_data_agents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.geminidataanalytics.v1beta.DataAgentService/ListAccessibleDataAgents", + request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, + response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + ) ) return self._stubs["list_accessible_data_agents"] diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest.py index fbad7ebdf5cc..e9284fbb0062 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest.py @@ -16,26 +16,25 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.geminidataanalytics_v1beta.types import data_agent, data_agent_service from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataAgentServiceRestTransport @@ -1020,9 +1019,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseCreateDataAgent._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseCreateDataAgent._get_http_options() request, metadata = self._interceptor.pre_create_data_agent( request, metadata @@ -1173,9 +1170,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseCreateDataAgentSync._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseCreateDataAgentSync._get_http_options() request, metadata = self._interceptor.pre_create_data_agent_sync( request, metadata @@ -1328,9 +1323,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseDeleteDataAgent._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseDeleteDataAgent._get_http_options() request, metadata = self._interceptor.pre_delete_data_agent( request, metadata @@ -1469,9 +1462,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseDeleteDataAgentSync._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseDeleteDataAgentSync._get_http_options() request, metadata = self._interceptor.pre_delete_data_agent_sync( request, metadata @@ -1957,9 +1948,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListAccessibleDataAgents._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListAccessibleDataAgents._get_http_options() request, metadata = self._interceptor.pre_list_accessible_data_agents( request, metadata @@ -2112,9 +2101,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListDataAgents._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListDataAgents._get_http_options() request, metadata = self._interceptor.pre_list_data_agents( request, metadata @@ -2490,9 +2477,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseUpdateDataAgent._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseUpdateDataAgent._get_http_options() request, metadata = self._interceptor.pre_update_data_agent( request, metadata @@ -2643,9 +2628,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseUpdateDataAgentSync._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseUpdateDataAgentSync._get_http_options() request, metadata = self._interceptor.pre_update_data_agent_sync( request, metadata @@ -2803,7 +2786,9 @@ def list_accessible_data_agents( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListAccessibleDataAgents(self._session, self._host, self._interceptor) # type: ignore + return self._ListAccessibleDataAgents( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_data_agents( @@ -3041,9 +3026,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataAgentServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -3180,9 +3163,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3300,9 +3281,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -3557,9 +3536,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataAgentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest_base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest_base.py index 22c1477ac43a..6a55c1ea430b 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest_base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest_base.py @@ -17,17 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import gapic_v1, path_template +from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.geminidataanalytics_v1beta.types import data_agent, data_agent_service from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent_service from .base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/async_client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/async_client.py index 45db2079a251..a3c5c76b276a 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/async_client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, Awaitable, @@ -31,13 +31,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1beta import gapic_version as package_version @@ -46,16 +46,18 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta.services.data_chat_service import pagers +from google.cloud.geminidataanalytics_v1beta.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation -from google.cloud.geminidataanalytics_v1beta.types import data_chat_service from .client import DataChatServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataChatServiceTransport @@ -130,7 +132,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataChatServiceAsyncClient: The constructed client. """ - return DataChatServiceClient.from_service_account_info.__func__(DataChatServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataChatServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(DataChatServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +151,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataChatServiceAsyncClient: The constructed client. """ - return DataChatServiceClient.from_service_account_file.__func__(DataChatServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataChatServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(DataChatServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/client.py index 18785b9a5b0c..5ecfd88da76a 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1beta import gapic_version as package_version @@ -62,16 +62,18 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta.services.data_chat_service import pagers +from google.cloud.geminidataanalytics_v1beta.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation -from google.cloud.geminidataanalytics_v1beta.types import data_chat_service from .transports.base import DEFAULT_CLIENT_INFO, DataChatServiceTransport from .transports.grpc import DataChatServiceGrpcTransport @@ -87,9 +89,7 @@ class DataChatServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataChatServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataChatServiceTransport]] _transport_registry["grpc"] = DataChatServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataChatServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataChatServiceRestTransport @@ -656,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataChatServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataChatServiceClient._read_environment_variables() + ) self._client_cert_source = DataChatServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -695,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataChatServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/pagers.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/pagers.py index 9455a99a94cb..7c03072d1830 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/pagers.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -226,7 +226,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -302,7 +302,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/base.py index e68bab2dd4e1..10147c4db8f4 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta import gapic_version as package_version +from google.cloud.geminidataanalytics_v1beta.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation -from google.cloud.geminidataanalytics_v1beta.types import data_chat_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -315,13 +317,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc.py index 73a71f5e41cc..f0e10c6ad02a 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 -import proto # type: ignore +from google.cloud.geminidataanalytics_v1beta.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation -from google.cloud.geminidataanalytics_v1beta.types import data_chat_service from .base import DEFAULT_CLIENT_INFO, DataChatServiceTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc_asyncio.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc_asyncio.py index 6c0c5701d83d..0ca93a1bdfa3 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,18 +31,16 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.geminidataanalytics_v1beta.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation -from google.cloud.geminidataanalytics_v1beta.types import data_chat_service from .base import DEFAULT_CLIENT_INFO, DataChatServiceTransport from .grpc import DataChatServiceGrpcTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest.py index afab0114b4f1..8ecd080712d8 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,16 +28,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version +from google.cloud.geminidataanalytics_v1beta.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation -from google.cloud.geminidataanalytics_v1beta.types import data_chat_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataChatServiceRestTransport @@ -883,9 +885,7 @@ def __call__( Message for a conversation. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1032,9 +1032,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -1145,9 +1143,7 @@ def __call__( Message for a conversation. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -1295,9 +1291,7 @@ def __call__( """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2094,9 +2088,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2213,9 +2205,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2470,9 +2460,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataChatServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest_base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest_base.py index f9612f2cfcba..93e4830249c8 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest_base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.cloud.geminidataanalytics_v1beta.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation -from google.cloud.geminidataanalytics_v1beta.types import data_chat_service from .base import DEFAULT_CLIENT_INFO, DataChatServiceTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/__init__.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/__init__.py index 6ded4613aa6c..58c10b4a7da5 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/__init__.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .agent_context import AgentContextReference +from .agent_context import ( + AgentContextReference, +) from .context import ( AnalysisOptions, ChartOptions, @@ -33,8 +35,13 @@ ListConversationsRequest, ListConversationsResponse, ) -from .credentials import Credentials, OAuthCredentials -from .data_agent import DataAgent +from .credentials import ( + Credentials, + OAuthCredentials, +) +from .data_agent import ( + DataAgent, +) from .data_agent_service import ( CreateDataAgentRequest, DeleteDataAgentRequest, @@ -46,7 +53,9 @@ OperationMetadata, UpdateDataAgentRequest, ) -from .data_analytics_agent import DataAnalyticsAgent +from .data_analytics_agent import ( + DataAnalyticsAgent, +) from .data_chat_service import ( AnalysisEvent, AnalysisMessage, diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/context.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/context.py index f14515292b01..2909ba715eb9 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/context.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/context.py @@ -120,6 +120,7 @@ class Source(proto.Enum): The source of the schema relationship is BigQuery table constraints. """ + SOURCE_UNSPECIFIED = 0 BIGQUERY_JOB_HISTORY = 1 LLM_SUGGESTED = 2 @@ -156,12 +157,12 @@ class SchemaPaths(proto.Message): number=2, message="Context.SchemaRelationship.SchemaPaths", ) - sources: MutableSequence[ - "Context.SchemaRelationship.Source" - ] = proto.RepeatedField( - proto.ENUM, - number=3, - enum="Context.SchemaRelationship.Source", + sources: MutableSequence["Context.SchemaRelationship.Source"] = ( + proto.RepeatedField( + proto.ENUM, + number=3, + enum="Context.SchemaRelationship.Source", + ) ) confidence_score: float = proto.Field( proto.FLOAT, diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_agent_service.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_agent_service.py index d37f84d01168..101af3b9eeef 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_agent_service.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_agent_service.py @@ -179,6 +179,7 @@ class CreatorFilter(proto.Enum): Only agents not created by the user calling the API will be returned. """ + CREATOR_FILTER_UNSPECIFIED = 0 NONE = 1 CREATOR_ONLY = 2 diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_chat_service.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_chat_service.py index 53b1f93d053e..f7637d201639 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_chat_service.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_chat_service.py @@ -531,6 +531,7 @@ class ContextVersion(proto.Enum): Using this version, DCS will use the latest published context for the data agent. """ + CONTEXT_VERSION_UNSPECIFIED = 0 STAGING = 1 PUBLISHED = 2 @@ -824,6 +825,7 @@ class TextType(proto.Enum): the final answer to the user (``FINAL_RESPONSE``). These messages provide insight into the agent's actions. """ + TEXT_TYPE_UNSPECIFIED = 0 FINAL_RESPONSE = 1 THOUGHT = 2 @@ -1434,6 +1436,7 @@ class SelectionMode(proto.Enum): MULTI_SELECT (2): The user can select multiple options. """ + SELECTION_MODE_UNSPECIFIED = 0 SINGLE_SELECT = 1 MULTI_SELECT = 2 @@ -1454,6 +1457,7 @@ class ClarificationQuestionType(proto.Enum): columns, Looker fields (dimensions/measures), or nested data structure properties. """ + CLARIFICATION_QUESTION_TYPE_UNSPECIFIED = 0 FILTER_VALUES = 1 FIELDS = 2 diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/datasource.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/datasource.py index 1e1c2f58b280..94fda6abd6bc 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/datasource.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/datasource.py @@ -20,8 +20,8 @@ import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.geminidataanalytics_v1beta.types import credentials as gcg_credentials from google.cloud.geminidataanalytics_v1beta.types import agent_context +from google.cloud.geminidataanalytics_v1beta.types import credentials as gcg_credentials __protobuf__ = proto.module( package="google.cloud.geminidataanalytics.v1beta", @@ -61,6 +61,7 @@ class DataFilterType(proto.Enum): filter by default. Currently only used for Looker data sources. """ + DATA_FILTER_TYPE_UNSPECIFIED = 0 ALWAYS_FILTER = 1 @@ -203,12 +204,12 @@ class StudioDatasourceReferences(proto.Message): The references to the studio datasources. """ - studio_references: MutableSequence[ - "StudioDatasourceReference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="StudioDatasourceReference", + studio_references: MutableSequence["StudioDatasourceReference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="StudioDatasourceReference", + ) ) @@ -356,6 +357,7 @@ class Engine(proto.Enum): POSTGRESQL (2): PostgreSQL """ + ENGINE_UNSPECIFIED = 0 GOOGLE_SQL = 1 POSTGRESQL = 2 @@ -445,6 +447,7 @@ class Engine(proto.Enum): MYSQL (2): MySQL """ + ENGINE_UNSPECIFIED = 0 POSTGRESQL = 1 MYSQL = 2 diff --git a/packages/google-cloud-geminidataanalytics/mypy.ini b/packages/google-cloud-geminidataanalytics/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-geminidataanalytics/mypy.ini +++ b/packages/google-cloud-geminidataanalytics/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-geminidataanalytics/noxfile.py b/packages/google-cloud-geminidataanalytics/noxfile.py index 13deeed25422..3778e8b89e0d 100644 --- a/packages/google-cloud-geminidataanalytics/noxfile.py +++ b/packages/google-cloud-geminidataanalytics/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_async.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_async.py index 6abf618f5d83..edd4affc4a30 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_async.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1alpha_generated_DataAgentService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1alpha diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_sync.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_sync.py index 393f8b5289b3..599712186a8b 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_sync.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1alpha_generated_DataAgentService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1alpha diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_async.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_async.py index 8d9586439054..d3aca518cd78 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_async.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1alpha_generated_DataAgentService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1alpha diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_sync.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_sync.py index 20919b3ec850..5fc102177a8a 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_sync.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1alpha_generated_DataAgentService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1alpha diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_async.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_async.py index ade94c599654..662c1920dd0c 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_async.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1beta_generated_DataAgentService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1beta diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_sync.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_sync.py index 24854414edc4..77d8b4aeed29 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_sync.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1beta_generated_DataAgentService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1beta diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_async.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_async.py index e87bc7d12ffa..1c0f9b3e1ef6 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_async.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1beta_generated_DataAgentService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1beta diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_sync.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_sync.py index 4abd01415dc6..946901741651 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_sync.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1beta_generated_DataAgentService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1beta diff --git a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_agent_service.py b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_agent_service.py index fec84b91bcd9..283608ef3f0d 100644 --- a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_agent_service.py +++ b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_agent_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +63,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.options_pb2 as options_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore -import google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha.services.data_agent_service import ( DataAgentServiceAsyncClient, @@ -77,18 +77,16 @@ pagers, transports, ) -from google.cloud.geminidataanalytics_v1alpha.types import ( - data_agent_service, - data_analytics_agent, - datasource, -) from google.cloud.geminidataanalytics_v1alpha.types import ( agent_context, context, credentials, + data_agent, + data_agent_service, + data_analytics_agent, + datasource, ) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1000,10 +998,9 @@ def test_data_agent_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1048,10 +1045,9 @@ def test_data_agent_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1087,10 +1083,9 @@ def test_data_agent_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1342,9 +1337,7 @@ def test_data_agent_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1459,9 +1452,9 @@ def test_list_data_agents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_agents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_agents] = ( + mock_rpc + ) request = {} client.list_data_agents(request) @@ -2872,9 +2865,9 @@ def test_create_data_agent_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent] = ( + mock_rpc + ) request = {} client.create_data_agent(request) @@ -3284,9 +3277,9 @@ def test_create_data_agent_sync_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent_sync] = ( + mock_rpc + ) request = {} client.create_data_agent_sync(request) @@ -3677,9 +3670,9 @@ def test_update_data_agent_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent] = ( + mock_rpc + ) request = {} client.update_data_agent(request) @@ -4073,9 +4066,9 @@ def test_update_data_agent_sync_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent_sync] = ( + mock_rpc + ) request = {} client.update_data_agent_sync(request) @@ -4460,9 +4453,9 @@ def test_delete_data_agent_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent] = ( + mock_rpc + ) request = {} client.delete_data_agent(request) @@ -4807,9 +4800,9 @@ def test_delete_data_agent_sync_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent_sync] = ( + mock_rpc + ) request = {} client.delete_data_agent_sync(request) @@ -5751,9 +5744,9 @@ def test_list_data_agents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_agents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_agents] = ( + mock_rpc + ) request = {} client.list_data_agents(request) @@ -6469,9 +6462,9 @@ def test_create_data_agent_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent] = ( + mock_rpc + ) request = {} client.create_data_agent(request) @@ -6688,9 +6681,9 @@ def test_create_data_agent_sync_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent_sync] = ( + mock_rpc + ) request = {} client.create_data_agent_sync(request) @@ -6905,9 +6898,9 @@ def test_update_data_agent_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent] = ( + mock_rpc + ) request = {} client.update_data_agent(request) @@ -7116,9 +7109,9 @@ def test_update_data_agent_sync_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent_sync] = ( + mock_rpc + ) request = {} client.update_data_agent_sync(request) @@ -7325,9 +7318,9 @@ def test_delete_data_agent_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent] = ( + mock_rpc + ) request = {} client.delete_data_agent(request) @@ -7511,9 +7504,9 @@ def test_delete_data_agent_sync_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent_sync] = ( + mock_rpc + ) request = {} client.delete_data_agent_sync(request) diff --git a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_chat_service.py b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_chat_service.py index 9ed75896e109..b57f7633598f 100644 --- a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_chat_service.py +++ b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_chat_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha.services.data_chat_service import ( DataChatServiceAsyncClient, @@ -63,8 +68,10 @@ pagers, transports, ) -from google.cloud.geminidataanalytics_v1alpha.types import agent_context, context from google.cloud.geminidataanalytics_v1alpha.types import ( + agent_context, + context, + conversation, credentials, data_chat_service, datasource, @@ -72,7 +79,6 @@ from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -983,10 +989,9 @@ def test_data_chat_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1036,9 @@ def test_data_chat_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1070,10 +1074,9 @@ def test_data_chat_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1320,9 +1323,7 @@ def test_data_chat_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1465,9 +1466,9 @@ async def test_chat_async_use_cached_wrapped_rpc(transport: str = "grpc_asyncio" # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.chat - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.chat] = ( + mock_rpc + ) request = {} await client.chat(request) @@ -1677,9 +1678,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -2038,9 +2039,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -2366,9 +2367,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -2703,9 +2704,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -4082,9 +4083,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -4289,9 +4290,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -4466,9 +4467,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -4650,9 +4651,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) diff --git a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_agent_service.py b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_agent_service.py index 63bfecdb85bc..9ae58f4eecb5 100644 --- a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_agent_service.py +++ b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_agent_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +63,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.options_pb2 as options_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore -import google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta.services.data_agent_service import ( DataAgentServiceAsyncClient, @@ -77,18 +77,16 @@ pagers, transports, ) -from google.cloud.geminidataanalytics_v1beta.types import ( - data_agent_service, - data_analytics_agent, - datasource, -) from google.cloud.geminidataanalytics_v1beta.types import ( agent_context, context, credentials, + data_agent, + data_agent_service, + data_analytics_agent, + datasource, ) from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1000,10 +998,9 @@ def test_data_agent_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1048,10 +1045,9 @@ def test_data_agent_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1087,10 +1083,9 @@ def test_data_agent_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1342,9 +1337,7 @@ def test_data_agent_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1459,9 +1452,9 @@ def test_list_data_agents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_agents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_agents] = ( + mock_rpc + ) request = {} client.list_data_agents(request) @@ -2872,9 +2865,9 @@ def test_create_data_agent_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent] = ( + mock_rpc + ) request = {} client.create_data_agent(request) @@ -3284,9 +3277,9 @@ def test_create_data_agent_sync_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent_sync] = ( + mock_rpc + ) request = {} client.create_data_agent_sync(request) @@ -3677,9 +3670,9 @@ def test_update_data_agent_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent] = ( + mock_rpc + ) request = {} client.update_data_agent(request) @@ -4073,9 +4066,9 @@ def test_update_data_agent_sync_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent_sync] = ( + mock_rpc + ) request = {} client.update_data_agent_sync(request) @@ -4460,9 +4453,9 @@ def test_delete_data_agent_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent] = ( + mock_rpc + ) request = {} client.delete_data_agent(request) @@ -4807,9 +4800,9 @@ def test_delete_data_agent_sync_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent_sync] = ( + mock_rpc + ) request = {} client.delete_data_agent_sync(request) @@ -5751,9 +5744,9 @@ def test_list_data_agents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_agents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_agents] = ( + mock_rpc + ) request = {} client.list_data_agents(request) @@ -6469,9 +6462,9 @@ def test_create_data_agent_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent] = ( + mock_rpc + ) request = {} client.create_data_agent(request) @@ -6688,9 +6681,9 @@ def test_create_data_agent_sync_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent_sync] = ( + mock_rpc + ) request = {} client.create_data_agent_sync(request) @@ -6905,9 +6898,9 @@ def test_update_data_agent_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent] = ( + mock_rpc + ) request = {} client.update_data_agent(request) @@ -7116,9 +7109,9 @@ def test_update_data_agent_sync_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent_sync] = ( + mock_rpc + ) request = {} client.update_data_agent_sync(request) @@ -7325,9 +7318,9 @@ def test_delete_data_agent_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent] = ( + mock_rpc + ) request = {} client.delete_data_agent(request) @@ -7511,9 +7504,9 @@ def test_delete_data_agent_sync_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent_sync] = ( + mock_rpc + ) request = {} client.delete_data_agent_sync(request) diff --git a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_chat_service.py b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_chat_service.py index 064517bcebc3..063af54c2f80 100644 --- a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_chat_service.py +++ b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_chat_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta.services.data_chat_service import ( DataChatServiceAsyncClient, @@ -63,8 +68,10 @@ pagers, transports, ) -from google.cloud.geminidataanalytics_v1beta.types import agent_context, context from google.cloud.geminidataanalytics_v1beta.types import ( + agent_context, + context, + conversation, credentials, data_chat_service, datasource, @@ -72,7 +79,6 @@ from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -983,10 +989,9 @@ def test_data_chat_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1036,9 @@ def test_data_chat_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1070,10 +1074,9 @@ def test_data_chat_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1320,9 +1323,7 @@ def test_data_chat_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1465,9 +1466,9 @@ async def test_chat_async_use_cached_wrapped_rpc(transport: str = "grpc_asyncio" # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.chat - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.chat] = ( + mock_rpc + ) request = {} await client.chat(request) @@ -1677,9 +1678,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -2038,9 +2039,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -2366,9 +2367,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -2703,9 +2704,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -4082,9 +4083,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -4289,9 +4290,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -4466,9 +4467,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -4650,9 +4651,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/__init__.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/__init__.py index 67197767587c..4b409f688453 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/__init__.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.backup_for_gke import BackupForGKEAsyncClient, BackupForGKEClient from .types.backup import Backup from .types.backup_channel import BackupChannel diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/async_client.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/async_client.py index efadd936780a..d262ffbffebf 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/async_client.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_backup_v1 import gapic_version as package_version @@ -46,29 +46,36 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.gke_backup_v1.services.backup_for_gke import pagers -from google.cloud.gke_backup_v1.types import backup_plan_binding, common, gkebackup -from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel -from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel -from google.cloud.gke_backup_v1.types import backup +from google.cloud.gke_backup_v1.types import ( + backup, + backup_channel, + backup_plan, + backup_plan_binding, + common, + gkebackup, + restore, + restore_channel, + restore_plan, + restore_plan_binding, + volume, +) from google.cloud.gke_backup_v1.types import backup as gcg_backup -from google.cloud.gke_backup_v1.types import backup_channel -from google.cloud.gke_backup_v1.types import backup_plan +from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel from google.cloud.gke_backup_v1.types import backup_plan as gcg_backup_plan -from google.cloud.gke_backup_v1.types import restore from google.cloud.gke_backup_v1.types import restore as gcg_restore -from google.cloud.gke_backup_v1.types import restore_channel -from google.cloud.gke_backup_v1.types import restore_plan +from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel from google.cloud.gke_backup_v1.types import restore_plan as gcg_restore_plan -from google.cloud.gke_backup_v1.types import restore_plan_binding, volume from .client import BackupForGKEClient from .transports.base import DEFAULT_CLIENT_INFO, BackupForGKETransport @@ -169,7 +176,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BackupForGKEAsyncClient: The constructed client. """ - return BackupForGKEClient.from_service_account_info.__func__(BackupForGKEAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BackupForGKEClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(BackupForGKEAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -185,7 +195,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BackupForGKEAsyncClient: The constructed client. """ - return BackupForGKEClient.from_service_account_file.__func__(BackupForGKEAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BackupForGKEClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(BackupForGKEAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/client.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/client.py index f8f80daa40cf..bbfb0f26f755 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/client.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_backup_v1 import gapic_version as package_version @@ -63,29 +63,36 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.gke_backup_v1.services.backup_for_gke import pagers -from google.cloud.gke_backup_v1.types import backup_plan_binding, common, gkebackup -from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel -from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel -from google.cloud.gke_backup_v1.types import backup +from google.cloud.gke_backup_v1.types import ( + backup, + backup_channel, + backup_plan, + backup_plan_binding, + common, + gkebackup, + restore, + restore_channel, + restore_plan, + restore_plan_binding, + volume, +) from google.cloud.gke_backup_v1.types import backup as gcg_backup -from google.cloud.gke_backup_v1.types import backup_channel -from google.cloud.gke_backup_v1.types import backup_plan +from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel from google.cloud.gke_backup_v1.types import backup_plan as gcg_backup_plan -from google.cloud.gke_backup_v1.types import restore from google.cloud.gke_backup_v1.types import restore as gcg_restore -from google.cloud.gke_backup_v1.types import restore_channel -from google.cloud.gke_backup_v1.types import restore_plan +from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel from google.cloud.gke_backup_v1.types import restore_plan as gcg_restore_plan -from google.cloud.gke_backup_v1.types import restore_plan_binding, volume from .transports.base import DEFAULT_CLIENT_INFO, BackupForGKETransport from .transports.grpc import BackupForGKEGrpcTransport @@ -906,11 +913,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BackupForGKEClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BackupForGKEClient._read_environment_variables() + ) self._client_cert_source = BackupForGKEClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -945,8 +950,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BackupForGKETransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/pagers.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/pagers.py index b78f078519c1..e3324be07135 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/pagers.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/pagers.py @@ -78,7 +78,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -154,7 +154,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -234,7 +234,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -310,7 +310,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -390,7 +390,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -466,7 +466,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -546,7 +546,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -622,7 +622,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -702,7 +702,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -778,7 +778,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -858,7 +858,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -934,7 +934,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1014,7 +1014,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1090,7 +1090,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1170,7 +1170,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1246,7 +1246,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1326,7 +1326,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1402,7 +1402,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1482,7 +1482,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1558,7 +1558,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/base.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/base.py index b6ef00fcfd1d..c04afa057b01 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/base.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_backup_v1 import gapic_version as package_version from google.cloud.gke_backup_v1.types import ( @@ -1007,13 +1009,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc.py index c43f2dd2603a..88e31bf7606b 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.gke_backup_v1.types import ( backup, @@ -1144,12 +1146,12 @@ def list_restore_plan_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_restore_plan_bindings" not in self._stubs: - self._stubs[ - "list_restore_plan_bindings" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkebackup.v1.BackupForGKE/ListRestorePlanBindings", - request_serializer=gkebackup.ListRestorePlanBindingsRequest.serialize, - response_deserializer=gkebackup.ListRestorePlanBindingsResponse.deserialize, + self._stubs["list_restore_plan_bindings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkebackup.v1.BackupForGKE/ListRestorePlanBindings", + request_serializer=gkebackup.ListRestorePlanBindingsRequest.serialize, + response_deserializer=gkebackup.ListRestorePlanBindingsResponse.deserialize, + ) ) return self._stubs["list_restore_plan_bindings"] @@ -1386,12 +1388,12 @@ def get_backup_index_download_url( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_backup_index_download_url" not in self._stubs: - self._stubs[ - "get_backup_index_download_url" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkebackup.v1.BackupForGKE/GetBackupIndexDownloadUrl", - request_serializer=gkebackup.GetBackupIndexDownloadUrlRequest.serialize, - response_deserializer=gkebackup.GetBackupIndexDownloadUrlResponse.deserialize, + self._stubs["get_backup_index_download_url"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkebackup.v1.BackupForGKE/GetBackupIndexDownloadUrl", + request_serializer=gkebackup.GetBackupIndexDownloadUrlRequest.serialize, + response_deserializer=gkebackup.GetBackupIndexDownloadUrlResponse.deserialize, + ) ) return self._stubs["get_backup_index_download_url"] diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc_asyncio.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc_asyncio.py index 3b77a27343b9..18a5da2ab93a 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc_asyncio.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gke_backup_v1.types import ( backup, @@ -1191,12 +1193,12 @@ def list_restore_plan_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_restore_plan_bindings" not in self._stubs: - self._stubs[ - "list_restore_plan_bindings" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkebackup.v1.BackupForGKE/ListRestorePlanBindings", - request_serializer=gkebackup.ListRestorePlanBindingsRequest.serialize, - response_deserializer=gkebackup.ListRestorePlanBindingsResponse.deserialize, + self._stubs["list_restore_plan_bindings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkebackup.v1.BackupForGKE/ListRestorePlanBindings", + request_serializer=gkebackup.ListRestorePlanBindingsRequest.serialize, + response_deserializer=gkebackup.ListRestorePlanBindingsResponse.deserialize, + ) ) return self._stubs["list_restore_plan_bindings"] @@ -1444,12 +1446,12 @@ def get_backup_index_download_url( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_backup_index_download_url" not in self._stubs: - self._stubs[ - "get_backup_index_download_url" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkebackup.v1.BackupForGKE/GetBackupIndexDownloadUrl", - request_serializer=gkebackup.GetBackupIndexDownloadUrlRequest.serialize, - response_deserializer=gkebackup.GetBackupIndexDownloadUrlResponse.deserialize, + self._stubs["get_backup_index_download_url"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkebackup.v1.BackupForGKE/GetBackupIndexDownloadUrl", + request_serializer=gkebackup.GetBackupIndexDownloadUrlRequest.serialize, + response_deserializer=gkebackup.GetBackupIndexDownloadUrlResponse.deserialize, + ) ) return self._stubs["get_backup_index_download_url"] diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest.py index 0d0a909d8276..ea1a4f2c2751 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2852,9 +2854,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseCreateBackupChannel._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseCreateBackupChannel._get_http_options() request, metadata = self._interceptor.pre_create_backup_channel( request, metadata @@ -3310,9 +3310,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseCreateRestoreChannel._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseCreateRestoreChannel._get_http_options() request, metadata = self._interceptor.pre_create_restore_channel( request, metadata @@ -3464,9 +3462,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseCreateRestorePlan._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseCreateRestorePlan._get_http_options() request, metadata = self._interceptor.pre_create_restore_plan( request, metadata @@ -3764,9 +3760,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseDeleteBackupChannel._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseDeleteBackupChannel._get_http_options() request, metadata = self._interceptor.pre_delete_backup_channel( request, metadata @@ -4204,9 +4198,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseDeleteRestoreChannel._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseDeleteRestoreChannel._get_http_options() request, metadata = self._interceptor.pre_delete_restore_channel( request, metadata @@ -4352,9 +4344,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseDeleteRestorePlan._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseDeleteRestorePlan._get_http_options() request, metadata = self._interceptor.pre_delete_restore_plan( request, metadata @@ -4806,9 +4796,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseGetBackupIndexDownloadUrl._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseGetBackupIndexDownloadUrl._get_http_options() request, metadata = self._interceptor.pre_get_backup_index_download_url( request, metadata @@ -4874,11 +4862,10 @@ def __call__( resp = self._interceptor.post_get_backup_index_download_url(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_backup_index_download_url_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_backup_index_download_url_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5114,9 +5101,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseGetBackupPlanBinding._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseGetBackupPlanBinding._get_http_options() request, metadata = self._interceptor.pre_get_backup_plan_binding( request, metadata @@ -5419,9 +5404,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseGetRestoreChannel._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseGetRestoreChannel._get_http_options() request, metadata = self._interceptor.pre_get_restore_channel( request, metadata @@ -5724,9 +5707,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseGetRestorePlanBinding._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseGetRestorePlanBinding._get_http_options() request, metadata = self._interceptor.pre_get_restore_plan_binding( request, metadata @@ -6174,9 +6155,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseListBackupChannels._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseListBackupChannels._get_http_options() request, metadata = self._interceptor.pre_list_backup_channels( request, metadata @@ -6325,9 +6304,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseListBackupPlanBindings._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseListBackupPlanBindings._get_http_options() request, metadata = self._interceptor.pre_list_backup_plan_bindings( request, metadata @@ -6772,9 +6749,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseListRestoreChannels._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseListRestoreChannels._get_http_options() request, metadata = self._interceptor.pre_list_restore_channels( request, metadata @@ -6925,9 +6900,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseListRestorePlanBindings._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseListRestorePlanBindings._get_http_options() request, metadata = self._interceptor.pre_list_restore_plan_bindings( request, metadata @@ -7372,9 +7345,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseListVolumeBackups._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseListVolumeBackups._get_http_options() request, metadata = self._interceptor.pre_list_volume_backups( request, metadata @@ -7523,9 +7494,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseListVolumeRestores._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseListVolumeRestores._get_http_options() request, metadata = self._interceptor.pre_list_volume_restores( request, metadata @@ -7831,9 +7800,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseUpdateBackupChannel._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseUpdateBackupChannel._get_http_options() request, metadata = self._interceptor.pre_update_backup_channel( request, metadata @@ -8289,9 +8256,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseUpdateRestoreChannel._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseUpdateRestoreChannel._get_http_options() request, metadata = self._interceptor.pre_update_restore_channel( request, metadata @@ -8443,9 +8408,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseUpdateRestorePlan._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseUpdateRestorePlan._get_http_options() request, metadata = self._interceptor.pre_update_restore_plan( request, metadata @@ -8657,7 +8620,9 @@ def get_backup_index_download_url( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetBackupIndexDownloadUrl(self._session, self._host, self._interceptor) # type: ignore + return self._GetBackupIndexDownloadUrl( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_backup_plan( @@ -8745,7 +8710,9 @@ def list_backup_plan_bindings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListBackupPlanBindings(self._session, self._host, self._interceptor) # type: ignore + return self._ListBackupPlanBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_backup_plans( @@ -8784,7 +8751,9 @@ def list_restore_plan_bindings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListRestorePlanBindings(self._session, self._host, self._interceptor) # type: ignore + return self._ListRestorePlanBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_restore_plans( @@ -9506,9 +9475,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseBackupForGKERestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest_base.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest_base.py index 42b064656915..1e004c8955fa 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest_base.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/__init__.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/__init__.py index 86969796c7da..56ffe8362b44 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/__init__.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/__init__.py @@ -13,10 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .backup import Backup -from .backup_channel import BackupChannel -from .backup_plan import BackupPlan, ExclusionWindow, RpoConfig -from .backup_plan_binding import BackupPlanBinding +from .backup import ( + Backup, +) +from .backup_channel import ( + BackupChannel, +) +from .backup_plan import ( + BackupPlan, + ExclusionWindow, + RpoConfig, +) +from .backup_plan_binding import ( + BackupPlanBinding, +) from .common import ( EncryptionKey, NamespacedName, @@ -83,10 +93,19 @@ RestoreConfig, VolumeDataRestorePolicyOverride, ) -from .restore_channel import RestoreChannel -from .restore_plan import RestorePlan -from .restore_plan_binding import RestorePlanBinding -from .volume import VolumeBackup, VolumeRestore +from .restore_channel import ( + RestoreChannel, +) +from .restore_plan import ( + RestorePlan, +) +from .restore_plan_binding import ( + RestorePlanBinding, +) +from .volume import ( + VolumeBackup, + VolumeRestore, +) __all__ = ( "Backup", diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup.py index 3ade37438d3d..af04fb66ff4f 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup.py @@ -210,6 +210,7 @@ class State(proto.Enum): This Backup resource (and its associated artifacts) is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 IN_PROGRESS = 2 diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan.py index f591c0449be9..7520e746c8ef 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan.py @@ -155,6 +155,7 @@ class State(proto.Enum): The BackupPlan is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CLUSTER_PENDING = 1 PROVISIONING = 2 diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan_binding.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan_binding.py index 2bc42fe8ec33..d428afb642f5 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan_binding.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan_binding.py @@ -137,6 +137,7 @@ class State(proto.Enum): The BackupPlan is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CLUSTER_PENDING = 1 PROVISIONING = 2 diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/common.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/common.py index 3303756836c9..2c82a5008c51 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/common.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/common.py @@ -111,6 +111,7 @@ class VolumeType(proto.Enum): GCE_PERSISTENT_DISK (1): Compute Engine Persistent Disk volume """ + VOLUME_TYPE_UNSPECIFIED = 0 GCE_PERSISTENT_DISK = 1 diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/gkebackup.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/gkebackup.py index f81b045dbdc2..a90e3c41f37d 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/gkebackup.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/gkebackup.py @@ -21,14 +21,17 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore -from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel -from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel from google.cloud.gke_backup_v1.types import backup as gcg_backup +from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel from google.cloud.gke_backup_v1.types import backup_plan as gcg_backup_plan -from google.cloud.gke_backup_v1.types import backup_plan_binding +from google.cloud.gke_backup_v1.types import ( + backup_plan_binding, + restore_plan_binding, + volume, +) from google.cloud.gke_backup_v1.types import restore as gcg_restore +from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel from google.cloud.gke_backup_v1.types import restore_plan as gcg_restore_plan -from google.cloud.gke_backup_v1.types import restore_plan_binding, volume __protobuf__ = proto.module( package="google.cloud.gkebackup.v1", @@ -463,12 +466,12 @@ class ListBackupChannelsResponse(proto.Message): def raw_page(self): return self - backup_channels: MutableSequence[ - gcg_backup_channel.BackupChannel - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcg_backup_channel.BackupChannel, + backup_channels: MutableSequence[gcg_backup_channel.BackupChannel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcg_backup_channel.BackupChannel, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -635,12 +638,12 @@ class ListBackupPlanBindingsResponse(proto.Message): def raw_page(self): return self - backup_plan_bindings: MutableSequence[ - backup_plan_binding.BackupPlanBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=backup_plan_binding.BackupPlanBinding, + backup_plan_bindings: MutableSequence[backup_plan_binding.BackupPlanBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=backup_plan_binding.BackupPlanBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1297,12 +1300,12 @@ class ListRestoreChannelsResponse(proto.Message): def raw_page(self): return self - restore_channels: MutableSequence[ - gcg_restore_channel.RestoreChannel - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcg_restore_channel.RestoreChannel, + restore_channels: MutableSequence[gcg_restore_channel.RestoreChannel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcg_restore_channel.RestoreChannel, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1461,12 +1464,12 @@ class ListRestorePlanBindingsResponse(proto.Message): def raw_page(self): return self - restore_plan_bindings: MutableSequence[ - restore_plan_binding.RestorePlanBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=restore_plan_binding.RestorePlanBinding, + restore_plan_bindings: MutableSequence[restore_plan_binding.RestorePlanBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=restore_plan_binding.RestorePlanBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore.py index 84ab4725dca3..50a5a5b16812 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore.py @@ -158,6 +158,7 @@ class State(proto.Enum): The Kubernetes resources created by this Restore are being validated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 IN_PROGRESS = 2 @@ -399,6 +400,7 @@ class VolumeDataRestorePolicy(proto.Enum): result in either dynamically provisioning blank PVs or binding to statically provisioned PVs. """ + VOLUME_DATA_RESTORE_POLICY_UNSPECIFIED = 0 RESTORE_VOLUME_DATA_FROM_BACKUP = 1 REUSE_VOLUME_HANDLE_FROM_BACKUP = 2 @@ -424,6 +426,7 @@ class ClusterResourceConflictPolicy(proto.Enum): deleting a CRD will cause Kubernetes to delete all CRs of that type. """ + CLUSTER_RESOURCE_CONFLICT_POLICY_UNSPECIFIED = 0 USE_EXISTING_VERSION = 1 USE_BACKUP_VERSION = 2 @@ -496,6 +499,7 @@ class NamespacedResourceRestoreMode(proto.Enum): cluster, and the original PV can be retained or deleted depending on its reclaim policy. """ + NAMESPACED_RESOURCE_RESTORE_MODE_UNSPECIFIED = 0 DELETE_AND_RESTORE = 1 FAIL_ON_CONFLICT = 2 @@ -580,19 +584,19 @@ class ClusterResourceRestoreScope(proto.Message): message. """ - selected_group_kinds: MutableSequence[ - "RestoreConfig.GroupKind" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="RestoreConfig.GroupKind", + selected_group_kinds: MutableSequence["RestoreConfig.GroupKind"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="RestoreConfig.GroupKind", + ) ) - excluded_group_kinds: MutableSequence[ - "RestoreConfig.GroupKind" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="RestoreConfig.GroupKind", + excluded_group_kinds: MutableSequence["RestoreConfig.GroupKind"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="RestoreConfig.GroupKind", + ) ) all_group_kinds: bool = proto.Field( proto.BOOL, @@ -663,12 +667,12 @@ class SubstitutionRule(proto.Message): proto.STRING, number=1, ) - target_group_kinds: MutableSequence[ - "RestoreConfig.GroupKind" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="RestoreConfig.GroupKind", + target_group_kinds: MutableSequence["RestoreConfig.GroupKind"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="RestoreConfig.GroupKind", + ) ) target_json_path: str = proto.Field( proto.STRING, @@ -748,6 +752,7 @@ class Op(proto.Enum): operation object MUST contain a "value" member whose content specifies the replacement value. """ + OP_UNSPECIFIED = 0 REMOVE = 1 MOVE = 2 @@ -847,12 +852,12 @@ class TransformationRule(proto.Message): string description of the transformation rule. """ - field_actions: MutableSequence[ - "RestoreConfig.TransformationRuleAction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="RestoreConfig.TransformationRuleAction", + field_actions: MutableSequence["RestoreConfig.TransformationRuleAction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="RestoreConfig.TransformationRuleAction", + ) ) resource_filter: "RestoreConfig.ResourceFilter" = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_plan.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_plan.py index 0b26d7ee724c..7cd1e0b547a7 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_plan.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_plan.py @@ -118,6 +118,7 @@ class State(proto.Enum): The RestorePlan is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CLUSTER_PENDING = 1 READY = 2 diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/volume.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/volume.py index cb4e8afc20d7..40d2bb6d7e2a 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/volume.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/volume.py @@ -110,6 +110,7 @@ class VolumeBackupFormat(proto.Enum): Compute Engine Persistent Disk snapshot based volume backup. """ + VOLUME_BACKUP_FORMAT_UNSPECIFIED = 0 GCE_PERSISTENT_DISK = 1 @@ -147,6 +148,7 @@ class State(proto.Enum): The underlying artifacts of a volume backup (eg: persistent disk snapshots) are deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 SNAPSHOTTING = 2 @@ -285,6 +287,7 @@ class VolumeType(proto.Enum): GCE_PERSISTENT_DISK (1): Compute Engine Persistent Disk volume """ + VOLUME_TYPE_UNSPECIFIED = 0 GCE_PERSISTENT_DISK = 1 @@ -308,6 +311,7 @@ class State(proto.Enum): This VolumeRestore resource is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 RESTORING = 2 diff --git a/packages/google-cloud-gke-backup/mypy.ini b/packages/google-cloud-gke-backup/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-gke-backup/mypy.ini +++ b/packages/google-cloud-gke-backup/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-gke-backup/noxfile.py b/packages/google-cloud-gke-backup/noxfile.py index e5312bb89f14..049d5d5df0b7 100644 --- a/packages/google-cloud-gke-backup/noxfile.py +++ b/packages/google-cloud-gke-backup/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-gke-backup/tests/unit/gapic/gke_backup_v1/test_backup_for_gke.py b/packages/google-cloud-gke-backup/tests/unit/gapic/gke_backup_v1/test_backup_for_gke.py index 9be78822f2ea..5ade1db7e3ee 100644 --- a/packages/google-cloud-gke-backup/tests/unit/gapic/gke_backup_v1/test_backup_for_gke.py +++ b/packages/google-cloud-gke-backup/tests/unit/gapic/gke_backup_v1/test_backup_for_gke.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,17 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,26 +62,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.type.date_pb2 as date_pb2 # type: ignore -import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore -import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.cloud.gke_backup_v1.services.backup_for_gke import ( BackupForGKEAsyncClient, @@ -79,20 +81,25 @@ pagers, transports, ) -from google.cloud.gke_backup_v1.types import backup_plan_binding, common, gkebackup -from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel -from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel -from google.cloud.gke_backup_v1.types import backup +from google.cloud.gke_backup_v1.types import ( + backup, + backup_channel, + backup_plan, + backup_plan_binding, + common, + gkebackup, + restore, + restore_channel, + restore_plan, + restore_plan_binding, + volume, +) from google.cloud.gke_backup_v1.types import backup as gcg_backup -from google.cloud.gke_backup_v1.types import backup_channel -from google.cloud.gke_backup_v1.types import backup_plan +from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel from google.cloud.gke_backup_v1.types import backup_plan as gcg_backup_plan -from google.cloud.gke_backup_v1.types import restore from google.cloud.gke_backup_v1.types import restore as gcg_restore -from google.cloud.gke_backup_v1.types import restore_channel -from google.cloud.gke_backup_v1.types import restore_plan +from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel from google.cloud.gke_backup_v1.types import restore_plan as gcg_restore_plan -from google.cloud.gke_backup_v1.types import restore_plan_binding, volume CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -960,10 +967,9 @@ def test_backup_for_gke_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1014,9 @@ def test_backup_for_gke_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1047,10 +1052,9 @@ def test_backup_for_gke_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1293,9 +1297,7 @@ def test_backup_for_gke_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1407,9 +1409,9 @@ def test_create_backup_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_plan] = ( + mock_rpc + ) request = {} client.create_backup_plan(request) @@ -1781,9 +1783,9 @@ def test_list_backup_plans_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_plans - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_plans] = ( + mock_rpc + ) request = {} client.list_backup_plans(request) @@ -2686,9 +2688,9 @@ def test_update_backup_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_plan] = ( + mock_rpc + ) request = {} client.update_backup_plan(request) @@ -3043,9 +3045,9 @@ def test_delete_backup_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_plan] = ( + mock_rpc + ) request = {} client.delete_backup_plan(request) @@ -3391,9 +3393,9 @@ def test_create_backup_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_channel] = ( + mock_rpc + ) request = {} client.create_backup_channel(request) @@ -3767,9 +3769,9 @@ def test_list_backup_channels_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_channels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_channels] = ( + mock_rpc + ) request = {} client.list_backup_channels(request) @@ -4322,9 +4324,9 @@ def test_get_backup_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backup_channel] = ( + mock_rpc + ) request = {} client.get_backup_channel(request) @@ -4667,9 +4669,9 @@ def test_update_backup_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_channel] = ( + mock_rpc + ) request = {} client.update_backup_channel(request) @@ -5025,9 +5027,9 @@ def test_delete_backup_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_channel] = ( + mock_rpc + ) request = {} client.delete_backup_channel(request) @@ -8226,9 +8228,9 @@ def test_list_volume_backups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_volume_backups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_volume_backups] = ( + mock_rpc + ) request = {} client.list_volume_backups(request) @@ -8789,9 +8791,9 @@ def test_get_volume_backup_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_volume_backup - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_volume_backup] = ( + mock_rpc + ) request = {} client.get_volume_backup(request) @@ -9147,9 +9149,9 @@ def test_create_restore_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_restore_plan] = ( + mock_rpc + ) request = {} client.create_restore_plan(request) @@ -9523,9 +9525,9 @@ def test_list_restore_plans_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_restore_plans - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_restore_plans] = ( + mock_rpc + ) request = {} client.list_restore_plans(request) @@ -10078,9 +10080,9 @@ def test_get_restore_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_restore_plan] = ( + mock_rpc + ) request = {} client.get_restore_plan(request) @@ -10418,9 +10420,9 @@ def test_update_restore_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_restore_plan] = ( + mock_rpc + ) request = {} client.update_restore_plan(request) @@ -10775,9 +10777,9 @@ def test_delete_restore_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_restore_plan] = ( + mock_rpc + ) request = {} client.delete_restore_plan(request) @@ -11123,9 +11125,9 @@ def test_create_restore_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_restore_channel] = ( + mock_rpc + ) request = {} client.create_restore_channel(request) @@ -11500,9 +11502,9 @@ def test_list_restore_channels_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_restore_channels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_restore_channels] = ( + mock_rpc + ) request = {} client.list_restore_channels(request) @@ -12055,9 +12057,9 @@ def test_get_restore_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_restore_channel] = ( + mock_rpc + ) request = {} client.get_restore_channel(request) @@ -12400,9 +12402,9 @@ def test_update_restore_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_restore_channel] = ( + mock_rpc + ) request = {} client.update_restore_channel(request) @@ -12758,9 +12760,9 @@ def test_delete_restore_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_restore_channel] = ( + mock_rpc + ) request = {} client.delete_restore_channel(request) @@ -15932,9 +15934,9 @@ def test_list_volume_restores_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_volume_restores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_volume_restores] = ( + mock_rpc + ) request = {} client.list_volume_restores(request) @@ -16489,9 +16491,9 @@ def test_get_volume_restore_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_volume_restore - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_volume_restore] = ( + mock_rpc + ) request = {} client.get_volume_restore(request) @@ -17119,9 +17121,9 @@ def test_create_backup_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_plan] = ( + mock_rpc + ) request = {} client.create_backup_plan(request) @@ -17327,9 +17329,9 @@ def test_list_backup_plans_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_plans - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_plans] = ( + mock_rpc + ) request = {} client.list_backup_plans(request) @@ -17769,9 +17771,9 @@ def test_update_backup_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_plan] = ( + mock_rpc + ) request = {} client.update_backup_plan(request) @@ -17954,9 +17956,9 @@ def test_delete_backup_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_plan] = ( + mock_rpc + ) request = {} client.delete_backup_plan(request) @@ -18140,9 +18142,9 @@ def test_create_backup_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_channel] = ( + mock_rpc + ) request = {} client.create_backup_channel(request) @@ -18336,9 +18338,9 @@ def test_list_backup_channels_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_channels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_channels] = ( + mock_rpc + ) request = {} client.list_backup_channels(request) @@ -18600,9 +18602,9 @@ def test_get_backup_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backup_channel] = ( + mock_rpc + ) request = {} client.get_backup_channel(request) @@ -18785,9 +18787,9 @@ def test_update_backup_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_channel] = ( + mock_rpc + ) request = {} client.update_backup_channel(request) @@ -18971,9 +18973,9 @@ def test_delete_backup_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_channel] = ( + mock_rpc + ) request = {} client.delete_backup_channel(request) @@ -20620,9 +20622,9 @@ def test_list_volume_backups_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_volume_backups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_volume_backups] = ( + mock_rpc + ) request = {} client.list_volume_backups(request) @@ -20886,9 +20888,9 @@ def test_get_volume_backup_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_volume_backup - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_volume_backup] = ( + mock_rpc + ) request = {} client.get_volume_backup(request) @@ -21070,9 +21072,9 @@ def test_create_restore_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_restore_plan] = ( + mock_rpc + ) request = {} client.create_restore_plan(request) @@ -21280,9 +21282,9 @@ def test_list_restore_plans_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_restore_plans - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_restore_plans] = ( + mock_rpc + ) request = {} client.list_restore_plans(request) @@ -21542,9 +21544,9 @@ def test_get_restore_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_restore_plan] = ( + mock_rpc + ) request = {} client.get_restore_plan(request) @@ -21726,9 +21728,9 @@ def test_update_restore_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_restore_plan] = ( + mock_rpc + ) request = {} client.update_restore_plan(request) @@ -21911,9 +21913,9 @@ def test_delete_restore_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_restore_plan] = ( + mock_rpc + ) request = {} client.delete_restore_plan(request) @@ -22110,9 +22112,9 @@ def test_create_restore_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_restore_channel] = ( + mock_rpc + ) request = {} client.create_restore_channel(request) @@ -22307,9 +22309,9 @@ def test_list_restore_channels_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_restore_channels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_restore_channels] = ( + mock_rpc + ) request = {} client.list_restore_channels(request) @@ -22571,9 +22573,9 @@ def test_get_restore_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_restore_channel] = ( + mock_rpc + ) request = {} client.get_restore_channel(request) @@ -22756,9 +22758,9 @@ def test_update_restore_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_restore_channel] = ( + mock_rpc + ) request = {} client.update_restore_channel(request) @@ -22942,9 +22944,9 @@ def test_delete_restore_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_restore_channel] = ( + mock_rpc + ) request = {} client.delete_restore_channel(request) @@ -24604,9 +24606,9 @@ def test_list_volume_restores_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_volume_restores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_volume_restores] = ( + mock_rpc + ) request = {} client.list_volume_restores(request) @@ -24872,9 +24874,9 @@ def test_get_volume_restore_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_volume_restore - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_volume_restore] = ( + mock_rpc + ) request = {} client.get_volume_restore(request) diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/__init__.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/__init__.py index 567f847e33d1..b1b0f9473a3b 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/__init__.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.gateway_control import GatewayControlClient from .types.control import GenerateCredentialsRequest, GenerateCredentialsResponse diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/client.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/client.py index 12c62c4d76d1..6ba26b256281 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/client.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkeconnect.gateway_v1 import gapic_version as package_version @@ -75,9 +75,7 @@ class GatewayControlClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GatewayControlTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GatewayControlTransport]] _transport_registry["rest"] = GatewayControlRestTransport def get_transport_class( @@ -593,11 +591,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GatewayControlClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GatewayControlClient._read_environment_variables() + ) self._client_cert_source = GatewayControlClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -632,8 +628,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GatewayControlTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/base.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/base.py index 02b00444c486..c5dc6a333d11 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/base.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkeconnect.gateway_v1 import gapic_version as package_version from google.cloud.gkeconnect.gateway_v1.types import control diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/rest.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/rest.py index 4cd4e8d7a3f7..9bdcb7e0e6b5 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/rest.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -282,9 +282,7 @@ def __call__( """ - http_options = ( - _BaseGatewayControlRestTransport._BaseGenerateCredentials._get_http_options() - ) + http_options = _BaseGatewayControlRestTransport._BaseGenerateCredentials._get_http_options() request, metadata = self._interceptor.pre_generate_credentials( request, metadata diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/__init__.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/__init__.py index c61bb994430b..6085c2882eaa 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/__init__.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .control import GenerateCredentialsRequest, GenerateCredentialsResponse +from .control import ( + GenerateCredentialsRequest, + GenerateCredentialsResponse, +) __all__ = ( "GenerateCredentialsRequest", diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/control.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/control.py index 4622feaed6e2..2ce5cb673c6c 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/control.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/control.py @@ -73,6 +73,7 @@ class OperatingSystem(proto.Enum): Generates a kubeconfig that is specifically designed to work with Windows. """ + OPERATING_SYSTEM_UNSPECIFIED = 0 OPERATING_SYSTEM_WINDOWS = 1 diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/__init__.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/__init__.py index 4123485e3a47..8a6650500817 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/__init__.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.gateway_control import GatewayControlClient from .types.control import GenerateCredentialsRequest, GenerateCredentialsResponse diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/client.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/client.py index 462491552278..a972711d3963 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/client.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkeconnect.gateway_v1beta1 import gapic_version as package_version @@ -75,9 +75,7 @@ class GatewayControlClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GatewayControlTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GatewayControlTransport]] _transport_registry["rest"] = GatewayControlRestTransport def get_transport_class( @@ -596,11 +594,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GatewayControlClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GatewayControlClient._read_environment_variables() + ) self._client_cert_source = GatewayControlClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -635,8 +631,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GatewayControlTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/base.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/base.py index 03171a671028..a892d6e35504 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/base.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkeconnect.gateway_v1beta1 import gapic_version as package_version from google.cloud.gkeconnect.gateway_v1beta1.types import control diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/rest.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/rest.py index 960ffd3cca38..8faac542bfef 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/rest.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -286,9 +286,7 @@ def __call__( """ - http_options = ( - _BaseGatewayControlRestTransport._BaseGenerateCredentials._get_http_options() - ) + http_options = _BaseGatewayControlRestTransport._BaseGenerateCredentials._get_http_options() request, metadata = self._interceptor.pre_generate_credentials( request, metadata diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/__init__.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/__init__.py index c61bb994430b..6085c2882eaa 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/__init__.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .control import GenerateCredentialsRequest, GenerateCredentialsResponse +from .control import ( + GenerateCredentialsRequest, + GenerateCredentialsResponse, +) __all__ = ( "GenerateCredentialsRequest", diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/control.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/control.py index 65c6dd082e3c..805b7e4e6cd9 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/control.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/control.py @@ -73,6 +73,7 @@ class OperatingSystem(proto.Enum): Generates a kubeconfig that is specifically designed to work with Windows. """ + OPERATING_SYSTEM_UNSPECIFIED = 0 OPERATING_SYSTEM_WINDOWS = 1 diff --git a/packages/google-cloud-gke-connect-gateway/mypy.ini b/packages/google-cloud-gke-connect-gateway/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-gke-connect-gateway/mypy.ini +++ b/packages/google-cloud-gke-connect-gateway/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-gke-connect-gateway/noxfile.py b/packages/google-cloud-gke-connect-gateway/noxfile.py index b385f461767d..90a8e562cd5d 100644 --- a/packages/google-cloud-gke-connect-gateway/noxfile.py +++ b/packages/google-cloud-gke-connect-gateway/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1/test_gateway_control.py b/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1/test_gateway_control.py index 93c9afe4e6fd..e91c21611187 100644 --- a/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1/test_gateway_control.py +++ b/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1/test_gateway_control.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -894,10 +899,9 @@ def test_gateway_control_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -942,10 +946,9 @@ def test_gateway_control_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -981,10 +984,9 @@ def test_gateway_control_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1163,9 +1165,9 @@ def test_generate_credentials_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_credentials - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_credentials] = ( + mock_rpc + ) request = {} client.generate_credentials(request) diff --git a/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1beta1/test_gateway_control.py b/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1beta1/test_gateway_control.py index cdd13eb689ed..e900b5900ae6 100644 --- a/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1beta1/test_gateway_control.py +++ b/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1beta1/test_gateway_control.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -894,10 +899,9 @@ def test_gateway_control_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -942,10 +946,9 @@ def test_gateway_control_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -981,10 +984,9 @@ def test_gateway_control_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1163,9 +1165,9 @@ def test_generate_credentials_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_credentials - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_credentials] = ( + mock_rpc + ) request = {} client.generate_credentials(request) diff --git a/packages/google-cloud-gke-hub/CHANGELOG.md b/packages/google-cloud-gke-hub/CHANGELOG.md index 1f23865d9cf8..f4ed8b0ff8a8 100644 --- a/packages/google-cloud-gke-hub/CHANGELOG.md +++ b/packages/google-cloud-gke-hub/CHANGELOG.md @@ -4,6 +4,32 @@ [1]: https://pypi.org/project/google-cloud-gke-hub/#history +## [1.21.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-gke-hub-v1.20.0...google-cloud-gke-hub-v1.21.0) (2026-02-12) + + +### Documentation + +* A comment for field `request_id` in message `.google.cloud.gkehub.v1.CreateFeatureRequest` is changed ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) +* A comment for field `cancel_requested` in message `.google.cloud.gkehub.v1.OperationMetadata` is changed ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) +* A comment for message `Feature` is changed ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) +* A comment for field `state` in message `.google.cloud.gkehub.v1.Feature` is changed ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) +* A comment for enum value `ACTIVE` in enum `State` is changed ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) +* A comment for enum value `DISABLING` in enum `State` is changed ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) +* A comment for field `labels` in message `.google.cloud.gkehub.v1.Feature` is changed ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) +* A comment for field `state` in message `.google.cloud.gkehub.v1.CommonFeatureState` is changed ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) +* A comment for enum value `ENABLING` in enum `State` is changed ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) +* A comment for message `CommonFeatureState` is changed ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) +* A comment for field `request_id` in message `.google.cloud.gkehub.v1.UpdateFeatureRequest` is changed ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) +* A comment for field `spec` in message `.google.cloud.gkehub.v1.Feature` is changed ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) +* A comment for field `membership_specs` in message `.google.cloud.gkehub.v1.Feature` is changed ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) +* A comment for field `membership_states` in message `.google.cloud.gkehub.v1.Feature` is changed ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) +* A comment for message `FeatureResourceState` is changed ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) + + +### Features + +* Add GKE Hub teams scope and RBAC GAPIC ([99a1284fe05e38e313d6504409574536674a32b5](https://github.com/googleapis/google-cloud-python/commit/99a1284fe05e38e313d6504409574536674a32b5)) + ## [1.20.0](https://github.com/googleapis/google-cloud-python/compare/google-cloud-gke-hub-v1.19.0...google-cloud-gke-hub-v1.20.0) (2026-01-08) diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub/gapic_version.py b/packages/google-cloud-gke-hub/google/cloud/gkehub/gapic_version.py index adaa11ae7120..7f068b9e257d 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub/gapic_version.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "1.20.0" # {x-release-please-version} +__version__ = "1.21.0" # {x-release-please-version} diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/__init__.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/__init__.py index be91a5db41bb..9fce24107943 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/__init__.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.gke_hub import GkeHubAsyncClient, GkeHubClient from .types.feature import ( CommonFeatureSpec, diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/configmanagement_v1/gapic_version.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/configmanagement_v1/gapic_version.py index adaa11ae7120..7f068b9e257d 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/configmanagement_v1/gapic_version.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/configmanagement_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "1.20.0" # {x-release-please-version} +__version__ = "1.21.0" # {x-release-please-version} diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/configmanagement_v1/types/configmanagement.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/configmanagement_v1/types/configmanagement.py index bf8d76a4100a..58f108a645f1 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/configmanagement_v1/types/configmanagement.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/configmanagement_v1/types/configmanagement.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore __protobuf__ = proto.module( package="google.cloud.gkehub.configmanagement.v1", @@ -68,6 +68,7 @@ class DeploymentState(proto.Enum): PENDING (4): Deployment is installing or terminating """ + DEPLOYMENT_STATE_UNSPECIFIED = 0 NOT_INSTALLED = 1 INSTALLED = 2 @@ -174,6 +175,7 @@ class Management(proto.Enum): User will manually manage the Feature for the cluster. """ + MANAGEMENT_UNSPECIFIED = 0 MANAGEMENT_AUTOMATIC = 1 MANAGEMENT_MANUAL = 2 @@ -629,6 +631,7 @@ class CRDState(proto.Enum): INSTALLING (4): CRD is installing """ + CRD_STATE_UNSPECIFIED = 0 NOT_INSTALLED = 1 INSTALLED = 2 @@ -651,6 +654,7 @@ class State(proto.Enum): CONFIG_SYNC_PENDING (4): CS is installing or terminating. """ + STATE_UNSPECIFIED = 0 CONFIG_SYNC_NOT_INSTALLED = 1 CONFIG_SYNC_INSTALLED = 2 @@ -872,6 +876,7 @@ class SyncCode(proto.Enum): UNREACHABLE (7): Cluster could not be reached """ + SYNC_CODE_UNSPECIFIED = 0 SYNCED = 1 PENDING = 2 diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/gapic_version.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/gapic_version.py index adaa11ae7120..7f068b9e257d 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/gapic_version.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "1.20.0" # {x-release-please-version} +__version__ = "1.21.0" # {x-release-please-version} diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/multiclusteringress_v1/gapic_version.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/multiclusteringress_v1/gapic_version.py index adaa11ae7120..7f068b9e257d 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/multiclusteringress_v1/gapic_version.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/multiclusteringress_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "1.20.0" # {x-release-please-version} +__version__ = "1.21.0" # {x-release-please-version} diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/rbacrolebindingactuation_v1/__init__.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/rbacrolebindingactuation_v1/__init__.py index 56c3dcebafc5..a32bd1358a3a 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/rbacrolebindingactuation_v1/__init__.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/rbacrolebindingactuation_v1/__init__.py @@ -13,10 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from google.cloud.gkehub_v1 import gapic_version as package_version +import sys import google.api_core as api_core -import sys + +from google.cloud.gkehub_v1 import gapic_version as package_version __version__ = package_version.__version__ @@ -28,20 +29,21 @@ import importlib_metadata as metadata -from .types.rbacrolebindingactuation import FeatureSpec -from .types.rbacrolebindingactuation import FeatureState +from .types.rbacrolebindingactuation import FeatureSpec, FeatureState if hasattr(api_core, "check_python_version") and hasattr( api_core, "check_dependency_versions" ): # pragma: NO COVER api_core.check_python_version("google.cloud.gkehub.rbacrolebindingactuation_v1") # type: ignore - api_core.check_dependency_versions("google.cloud.gkehub.rbacrolebindingactuation_v1") # type: ignore + api_core.check_dependency_versions( + "google.cloud.gkehub.rbacrolebindingactuation_v1" + ) # type: ignore else: # pragma: NO COVER # An older version of api_core is installed which does not define the # functions above. We do equivalent checks manually. try: - import warnings import sys + import warnings _py_version_str = sys.version.split()[0] _package_label = "google.cloud.gkehub.rbacrolebindingactuation_v1" diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/rbacrolebindingactuation_v1/gapic_version.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/rbacrolebindingactuation_v1/gapic_version.py index 20a9cd975b02..7f068b9e257d 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/rbacrolebindingactuation_v1/gapic_version.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/rbacrolebindingactuation_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.0.0" # {x-release-please-version} +__version__ = "1.21.0" # {x-release-please-version} diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/rbacrolebindingactuation_v1/types/rbacrolebindingactuation.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/rbacrolebindingactuation_v1/types/rbacrolebindingactuation.py index aa36a394cc1d..894b699b739b 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/rbacrolebindingactuation_v1/types/rbacrolebindingactuation.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/rbacrolebindingactuation_v1/types/rbacrolebindingactuation.py @@ -19,7 +19,6 @@ import proto # type: ignore - __protobuf__ = proto.module( package="google.cloud.gkehub.rbacrolebindingactuation.v1", manifest={ diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/async_client.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/async_client.py index 05a9de718b2c..31b11edfcc5a 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/async_client.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkehub_v1 import gapic_version as package_version @@ -51,10 +51,8 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.gkehub_v1.services.gke_hub import pagers -from google.cloud.gkehub_v1.types import feature -from google.cloud.gkehub_v1.types import fleet +from google.cloud.gkehub_v1.types import feature, fleet, membership, service from google.cloud.gkehub_v1.types import fleet as gcg_fleet -from google.cloud.gkehub_v1.types import membership, service from .client import GkeHubClient from .transports.base import DEFAULT_CLIENT_INFO, GkeHubTransport @@ -145,7 +143,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GkeHubAsyncClient: The constructed client. """ - return GkeHubClient.from_service_account_info.__func__(GkeHubAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GkeHubClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GkeHubAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -161,7 +162,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GkeHubAsyncClient: The constructed client. """ - return GkeHubClient.from_service_account_file.__func__(GkeHubAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GkeHubClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(GkeHubAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/client.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/client.py index 003bad01ad05..37c08e4b0e18 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/client.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkehub_v1 import gapic_version as package_version @@ -68,10 +68,8 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.gkehub_v1.services.gke_hub import pagers -from google.cloud.gkehub_v1.types import feature -from google.cloud.gkehub_v1.types import fleet +from google.cloud.gkehub_v1.types import feature, fleet, membership, service from google.cloud.gkehub_v1.types import fleet as gcg_fleet -from google.cloud.gkehub_v1.types import membership, service from .transports.base import DEFAULT_CLIENT_INFO, GkeHubTransport from .transports.grpc import GkeHubGrpcTransport @@ -784,11 +782,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GkeHubClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GkeHubClient._read_environment_variables() + ) self._client_cert_source = GkeHubClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -823,8 +819,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GkeHubTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/pagers.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/pagers.py index 7151c981f692..e24c3e92964c 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/pagers.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1159,7 +1159,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1235,7 +1235,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1315,7 +1315,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1391,7 +1391,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1471,7 +1471,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1549,7 +1549,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/base.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/base.py index be99acde66ad..31af1198c854 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/base.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkehub_v1 import gapic_version as package_version from google.cloud.gkehub_v1.types import feature, fleet, membership, service diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc.py index 3183b0d94162..7bc6c3e5c2af 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.gkehub_v1.types import feature, fleet, membership, service @@ -964,12 +964,12 @@ def get_scope_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_scope_rbac_role_binding" not in self._stubs: - self._stubs[ - "get_scope_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/GetScopeRBACRoleBinding", - request_serializer=service.GetScopeRBACRoleBindingRequest.serialize, - response_deserializer=fleet.RBACRoleBinding.deserialize, + self._stubs["get_scope_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/GetScopeRBACRoleBinding", + request_serializer=service.GetScopeRBACRoleBindingRequest.serialize, + response_deserializer=fleet.RBACRoleBinding.deserialize, + ) ) return self._stubs["get_scope_rbac_role_binding"] @@ -994,12 +994,12 @@ def create_scope_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_scope_rbac_role_binding" not in self._stubs: - self._stubs[ - "create_scope_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/CreateScopeRBACRoleBinding", - request_serializer=service.CreateScopeRBACRoleBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_scope_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/CreateScopeRBACRoleBinding", + request_serializer=service.CreateScopeRBACRoleBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_scope_rbac_role_binding"] @@ -1024,12 +1024,12 @@ def update_scope_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_scope_rbac_role_binding" not in self._stubs: - self._stubs[ - "update_scope_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/UpdateScopeRBACRoleBinding", - request_serializer=service.UpdateScopeRBACRoleBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_scope_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/UpdateScopeRBACRoleBinding", + request_serializer=service.UpdateScopeRBACRoleBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_scope_rbac_role_binding"] @@ -1054,12 +1054,12 @@ def delete_scope_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_scope_rbac_role_binding" not in self._stubs: - self._stubs[ - "delete_scope_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/DeleteScopeRBACRoleBinding", - request_serializer=service.DeleteScopeRBACRoleBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_scope_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/DeleteScopeRBACRoleBinding", + request_serializer=service.DeleteScopeRBACRoleBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_scope_rbac_role_binding"] @@ -1085,12 +1085,12 @@ def list_scope_rbac_role_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_scope_rbac_role_bindings" not in self._stubs: - self._stubs[ - "list_scope_rbac_role_bindings" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/ListScopeRBACRoleBindings", - request_serializer=service.ListScopeRBACRoleBindingsRequest.serialize, - response_deserializer=service.ListScopeRBACRoleBindingsResponse.deserialize, + self._stubs["list_scope_rbac_role_bindings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/ListScopeRBACRoleBindings", + request_serializer=service.ListScopeRBACRoleBindingsRequest.serialize, + response_deserializer=service.ListScopeRBACRoleBindingsResponse.deserialize, + ) ) return self._stubs["list_scope_rbac_role_bindings"] @@ -1402,12 +1402,12 @@ def get_membership_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_membership_rbac_role_binding" not in self._stubs: - self._stubs[ - "get_membership_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/GetMembershipRBACRoleBinding", - request_serializer=service.GetMembershipRBACRoleBindingRequest.serialize, - response_deserializer=fleet.RBACRoleBinding.deserialize, + self._stubs["get_membership_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/GetMembershipRBACRoleBinding", + request_serializer=service.GetMembershipRBACRoleBindingRequest.serialize, + response_deserializer=fleet.RBACRoleBinding.deserialize, + ) ) return self._stubs["get_membership_rbac_role_binding"] @@ -1433,12 +1433,12 @@ def create_membership_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_membership_rbac_role_binding" not in self._stubs: - self._stubs[ - "create_membership_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/CreateMembershipRBACRoleBinding", - request_serializer=service.CreateMembershipRBACRoleBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_membership_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/CreateMembershipRBACRoleBinding", + request_serializer=service.CreateMembershipRBACRoleBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_membership_rbac_role_binding"] @@ -1464,12 +1464,12 @@ def update_membership_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_membership_rbac_role_binding" not in self._stubs: - self._stubs[ - "update_membership_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/UpdateMembershipRBACRoleBinding", - request_serializer=service.UpdateMembershipRBACRoleBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_membership_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/UpdateMembershipRBACRoleBinding", + request_serializer=service.UpdateMembershipRBACRoleBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_membership_rbac_role_binding"] @@ -1495,12 +1495,12 @@ def delete_membership_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_membership_rbac_role_binding" not in self._stubs: - self._stubs[ - "delete_membership_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/DeleteMembershipRBACRoleBinding", - request_serializer=service.DeleteMembershipRBACRoleBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_membership_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/DeleteMembershipRBACRoleBinding", + request_serializer=service.DeleteMembershipRBACRoleBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_membership_rbac_role_binding"] @@ -1527,12 +1527,12 @@ def list_membership_rbac_role_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_membership_rbac_role_bindings" not in self._stubs: - self._stubs[ - "list_membership_rbac_role_bindings" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/ListMembershipRBACRoleBindings", - request_serializer=service.ListMembershipRBACRoleBindingsRequest.serialize, - response_deserializer=service.ListMembershipRBACRoleBindingsResponse.deserialize, + self._stubs["list_membership_rbac_role_bindings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/ListMembershipRBACRoleBindings", + request_serializer=service.ListMembershipRBACRoleBindingsRequest.serialize, + response_deserializer=service.ListMembershipRBACRoleBindingsResponse.deserialize, + ) ) return self._stubs["list_membership_rbac_role_bindings"] @@ -1561,12 +1561,12 @@ def generate_membership_rbac_role_binding_yaml( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_membership_rbac_role_binding_yaml" not in self._stubs: - self._stubs[ - "generate_membership_rbac_role_binding_yaml" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/GenerateMembershipRBACRoleBindingYAML", - request_serializer=service.GenerateMembershipRBACRoleBindingYAMLRequest.serialize, - response_deserializer=service.GenerateMembershipRBACRoleBindingYAMLResponse.deserialize, + self._stubs["generate_membership_rbac_role_binding_yaml"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/GenerateMembershipRBACRoleBindingYAML", + request_serializer=service.GenerateMembershipRBACRoleBindingYAMLRequest.serialize, + response_deserializer=service.GenerateMembershipRBACRoleBindingYAMLResponse.deserialize, + ) ) return self._stubs["generate_membership_rbac_role_binding_yaml"] diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc_asyncio.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc_asyncio.py index 1c087a21d2db..e2259d42f3a7 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc_asyncio.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gkehub_v1.types import feature, fleet, membership, service @@ -994,12 +994,12 @@ def get_scope_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_scope_rbac_role_binding" not in self._stubs: - self._stubs[ - "get_scope_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/GetScopeRBACRoleBinding", - request_serializer=service.GetScopeRBACRoleBindingRequest.serialize, - response_deserializer=fleet.RBACRoleBinding.deserialize, + self._stubs["get_scope_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/GetScopeRBACRoleBinding", + request_serializer=service.GetScopeRBACRoleBindingRequest.serialize, + response_deserializer=fleet.RBACRoleBinding.deserialize, + ) ) return self._stubs["get_scope_rbac_role_binding"] @@ -1024,12 +1024,12 @@ def create_scope_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_scope_rbac_role_binding" not in self._stubs: - self._stubs[ - "create_scope_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/CreateScopeRBACRoleBinding", - request_serializer=service.CreateScopeRBACRoleBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_scope_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/CreateScopeRBACRoleBinding", + request_serializer=service.CreateScopeRBACRoleBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_scope_rbac_role_binding"] @@ -1054,12 +1054,12 @@ def update_scope_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_scope_rbac_role_binding" not in self._stubs: - self._stubs[ - "update_scope_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/UpdateScopeRBACRoleBinding", - request_serializer=service.UpdateScopeRBACRoleBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_scope_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/UpdateScopeRBACRoleBinding", + request_serializer=service.UpdateScopeRBACRoleBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_scope_rbac_role_binding"] @@ -1084,12 +1084,12 @@ def delete_scope_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_scope_rbac_role_binding" not in self._stubs: - self._stubs[ - "delete_scope_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/DeleteScopeRBACRoleBinding", - request_serializer=service.DeleteScopeRBACRoleBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_scope_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/DeleteScopeRBACRoleBinding", + request_serializer=service.DeleteScopeRBACRoleBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_scope_rbac_role_binding"] @@ -1115,12 +1115,12 @@ def list_scope_rbac_role_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_scope_rbac_role_bindings" not in self._stubs: - self._stubs[ - "list_scope_rbac_role_bindings" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/ListScopeRBACRoleBindings", - request_serializer=service.ListScopeRBACRoleBindingsRequest.serialize, - response_deserializer=service.ListScopeRBACRoleBindingsResponse.deserialize, + self._stubs["list_scope_rbac_role_bindings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/ListScopeRBACRoleBindings", + request_serializer=service.ListScopeRBACRoleBindingsRequest.serialize, + response_deserializer=service.ListScopeRBACRoleBindingsResponse.deserialize, + ) ) return self._stubs["list_scope_rbac_role_bindings"] @@ -1444,12 +1444,12 @@ def get_membership_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_membership_rbac_role_binding" not in self._stubs: - self._stubs[ - "get_membership_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/GetMembershipRBACRoleBinding", - request_serializer=service.GetMembershipRBACRoleBindingRequest.serialize, - response_deserializer=fleet.RBACRoleBinding.deserialize, + self._stubs["get_membership_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/GetMembershipRBACRoleBinding", + request_serializer=service.GetMembershipRBACRoleBindingRequest.serialize, + response_deserializer=fleet.RBACRoleBinding.deserialize, + ) ) return self._stubs["get_membership_rbac_role_binding"] @@ -1476,12 +1476,12 @@ def create_membership_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_membership_rbac_role_binding" not in self._stubs: - self._stubs[ - "create_membership_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/CreateMembershipRBACRoleBinding", - request_serializer=service.CreateMembershipRBACRoleBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_membership_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/CreateMembershipRBACRoleBinding", + request_serializer=service.CreateMembershipRBACRoleBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_membership_rbac_role_binding"] @@ -1508,12 +1508,12 @@ def update_membership_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_membership_rbac_role_binding" not in self._stubs: - self._stubs[ - "update_membership_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/UpdateMembershipRBACRoleBinding", - request_serializer=service.UpdateMembershipRBACRoleBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_membership_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/UpdateMembershipRBACRoleBinding", + request_serializer=service.UpdateMembershipRBACRoleBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_membership_rbac_role_binding"] @@ -1540,12 +1540,12 @@ def delete_membership_rbac_role_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_membership_rbac_role_binding" not in self._stubs: - self._stubs[ - "delete_membership_rbac_role_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/DeleteMembershipRBACRoleBinding", - request_serializer=service.DeleteMembershipRBACRoleBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_membership_rbac_role_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/DeleteMembershipRBACRoleBinding", + request_serializer=service.DeleteMembershipRBACRoleBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_membership_rbac_role_binding"] @@ -1572,12 +1572,12 @@ def list_membership_rbac_role_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_membership_rbac_role_bindings" not in self._stubs: - self._stubs[ - "list_membership_rbac_role_bindings" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/ListMembershipRBACRoleBindings", - request_serializer=service.ListMembershipRBACRoleBindingsRequest.serialize, - response_deserializer=service.ListMembershipRBACRoleBindingsResponse.deserialize, + self._stubs["list_membership_rbac_role_bindings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/ListMembershipRBACRoleBindings", + request_serializer=service.ListMembershipRBACRoleBindingsRequest.serialize, + response_deserializer=service.ListMembershipRBACRoleBindingsResponse.deserialize, + ) ) return self._stubs["list_membership_rbac_role_bindings"] @@ -1606,12 +1606,12 @@ def generate_membership_rbac_role_binding_yaml( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_membership_rbac_role_binding_yaml" not in self._stubs: - self._stubs[ - "generate_membership_rbac_role_binding_yaml" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1.GkeHub/GenerateMembershipRBACRoleBindingYAML", - request_serializer=service.GenerateMembershipRBACRoleBindingYAMLRequest.serialize, - response_deserializer=service.GenerateMembershipRBACRoleBindingYAMLResponse.deserialize, + self._stubs["generate_membership_rbac_role_binding_yaml"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1.GkeHub/GenerateMembershipRBACRoleBindingYAML", + request_serializer=service.GenerateMembershipRBACRoleBindingYAMLRequest.serialize, + response_deserializer=service.GenerateMembershipRBACRoleBindingYAMLResponse.deserialize, + ) ) return self._stubs["generate_membership_rbac_role_binding_yaml"] diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/rest.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/rest.py index 27bde04407ae..ac21fa0b4244 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/rest.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -3209,9 +3209,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubRestTransport._BaseCreateMembershipBinding._get_http_options() - ) + http_options = _BaseGkeHubRestTransport._BaseCreateMembershipBinding._get_http_options() request, metadata = self._interceptor.pre_create_membership_binding( request, metadata @@ -3363,15 +3361,12 @@ def __call__( """ - http_options = ( - _BaseGkeHubRestTransport._BaseCreateMembershipRBACRoleBinding._get_http_options() - ) + http_options = _BaseGkeHubRestTransport._BaseCreateMembershipRBACRoleBinding._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_membership_rbac_role_binding( - request, metadata + request, metadata = ( + self._interceptor.pre_create_membership_rbac_role_binding( + request, metadata + ) ) transcoded_request = _BaseGkeHubRestTransport._BaseCreateMembershipRBACRoleBinding._get_transcoded_request( http_options, request @@ -3437,11 +3432,10 @@ def __call__( resp = self._interceptor.post_create_membership_rbac_role_binding(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_membership_rbac_role_binding_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_membership_rbac_role_binding_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3829,9 +3823,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubRestTransport._BaseCreateScopeRBACRoleBinding._get_http_options() - ) + http_options = _BaseGkeHubRestTransport._BaseCreateScopeRBACRoleBinding._get_http_options() request, metadata = self._interceptor.pre_create_scope_rbac_role_binding( request, metadata @@ -3898,11 +3890,10 @@ def __call__( resp = self._interceptor.post_create_scope_rbac_role_binding(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_scope_rbac_role_binding_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_scope_rbac_role_binding_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4427,9 +4418,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubRestTransport._BaseDeleteMembershipBinding._get_http_options() - ) + http_options = _BaseGkeHubRestTransport._BaseDeleteMembershipBinding._get_http_options() request, metadata = self._interceptor.pre_delete_membership_binding( request, metadata @@ -4576,15 +4565,12 @@ def __call__( """ - http_options = ( - _BaseGkeHubRestTransport._BaseDeleteMembershipRBACRoleBinding._get_http_options() - ) + http_options = _BaseGkeHubRestTransport._BaseDeleteMembershipRBACRoleBinding._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_membership_rbac_role_binding( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_membership_rbac_role_binding( + request, metadata + ) ) transcoded_request = _BaseGkeHubRestTransport._BaseDeleteMembershipRBACRoleBinding._get_transcoded_request( http_options, request @@ -4645,11 +4631,10 @@ def __call__( resp = self._interceptor.post_delete_membership_rbac_role_binding(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_membership_rbac_role_binding_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_membership_rbac_role_binding_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5025,9 +5010,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubRestTransport._BaseDeleteScopeRBACRoleBinding._get_http_options() - ) + http_options = _BaseGkeHubRestTransport._BaseDeleteScopeRBACRoleBinding._get_http_options() request, metadata = self._interceptor.pre_delete_scope_rbac_role_binding( request, metadata @@ -5089,11 +5072,10 @@ def __call__( resp = self._interceptor.post_delete_scope_rbac_role_binding(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_scope_rbac_role_binding_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_scope_rbac_role_binding_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5176,9 +5158,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubRestTransport._BaseGenerateConnectManifest._get_http_options() - ) + http_options = _BaseGkeHubRestTransport._BaseGenerateConnectManifest._get_http_options() request, metadata = self._interceptor.pre_generate_connect_manifest( request, metadata @@ -5332,15 +5312,12 @@ def __call__( """ - http_options = ( - _BaseGkeHubRestTransport._BaseGenerateMembershipRBACRoleBindingYAML._get_http_options() - ) + http_options = _BaseGkeHubRestTransport._BaseGenerateMembershipRBACRoleBindingYAML._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_generate_membership_rbac_role_binding_yaml( - request, metadata + request, metadata = ( + self._interceptor.pre_generate_membership_rbac_role_binding_yaml( + request, metadata + ) ) transcoded_request = _BaseGkeHubRestTransport._BaseGenerateMembershipRBACRoleBindingYAML._get_transcoded_request( http_options, request @@ -5408,11 +5385,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_membership_rbac_role_binding_yaml_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_membership_rbac_role_binding_yaml_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6090,9 +6066,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubRestTransport._BaseGetMembershipRBACRoleBinding._get_http_options() - ) + http_options = _BaseGkeHubRestTransport._BaseGetMembershipRBACRoleBinding._get_http_options() request, metadata = self._interceptor.pre_get_membership_rbac_role_binding( request, metadata @@ -6156,11 +6130,10 @@ def __call__( resp = self._interceptor.post_get_membership_rbac_role_binding(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_membership_rbac_role_binding_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_membership_rbac_role_binding_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6539,9 +6512,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubRestTransport._BaseGetScopeRBACRoleBinding._get_http_options() - ) + http_options = _BaseGkeHubRestTransport._BaseGetScopeRBACRoleBinding._get_http_options() request, metadata = self._interceptor.pre_get_scope_rbac_role_binding( request, metadata @@ -7276,15 +7247,12 @@ def __call__( List of Membership RBACRoleBindings. """ - http_options = ( - _BaseGkeHubRestTransport._BaseListMembershipRBACRoleBindings._get_http_options() - ) + http_options = _BaseGkeHubRestTransport._BaseListMembershipRBACRoleBindings._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_membership_rbac_role_bindings( - request, metadata + request, metadata = ( + self._interceptor.pre_list_membership_rbac_role_bindings( + request, metadata + ) ) transcoded_request = _BaseGkeHubRestTransport._BaseListMembershipRBACRoleBindings._get_transcoded_request( http_options, request @@ -7347,11 +7315,10 @@ def __call__( resp = self._interceptor.post_list_membership_rbac_role_bindings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_membership_rbac_role_bindings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_membership_rbac_role_bindings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -7882,9 +7849,7 @@ def __call__( List of Scope RBACRoleBindings. """ - http_options = ( - _BaseGkeHubRestTransport._BaseListScopeRBACRoleBindings._get_http_options() - ) + http_options = _BaseGkeHubRestTransport._BaseListScopeRBACRoleBindings._get_http_options() request, metadata = self._interceptor.pre_list_scope_rbac_role_bindings( request, metadata @@ -7948,11 +7913,10 @@ def __call__( resp = self._interceptor.post_list_scope_rbac_role_bindings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_scope_rbac_role_bindings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_scope_rbac_role_bindings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8645,9 +8609,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubRestTransport._BaseUpdateMembershipBinding._get_http_options() - ) + http_options = _BaseGkeHubRestTransport._BaseUpdateMembershipBinding._get_http_options() request, metadata = self._interceptor.pre_update_membership_binding( request, metadata @@ -8800,15 +8762,12 @@ def __call__( """ - http_options = ( - _BaseGkeHubRestTransport._BaseUpdateMembershipRBACRoleBinding._get_http_options() - ) + http_options = _BaseGkeHubRestTransport._BaseUpdateMembershipRBACRoleBinding._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_membership_rbac_role_binding( - request, metadata + request, metadata = ( + self._interceptor.pre_update_membership_rbac_role_binding( + request, metadata + ) ) transcoded_request = _BaseGkeHubRestTransport._BaseUpdateMembershipRBACRoleBinding._get_transcoded_request( http_options, request @@ -8874,11 +8833,10 @@ def __call__( resp = self._interceptor.post_update_membership_rbac_role_binding(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_membership_rbac_role_binding_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_membership_rbac_role_binding_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -9267,9 +9225,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubRestTransport._BaseUpdateScopeRBACRoleBinding._get_http_options() - ) + http_options = _BaseGkeHubRestTransport._BaseUpdateScopeRBACRoleBinding._get_http_options() request, metadata = self._interceptor.pre_update_scope_rbac_role_binding( request, metadata @@ -9336,11 +9292,10 @@ def __call__( resp = self._interceptor.post_update_scope_rbac_role_binding(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_scope_rbac_role_binding_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_scope_rbac_role_binding_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -9395,7 +9350,9 @@ def create_membership_binding( ) -> Callable[[service.CreateMembershipBindingRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateMembershipBinding(self._session, self._host, self._interceptor) # type: ignore + return self._CreateMembershipBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_membership_rbac_role_binding( @@ -9405,7 +9362,9 @@ def create_membership_rbac_role_binding( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateMembershipRBACRoleBinding(self._session, self._host, self._interceptor) # type: ignore + return self._CreateMembershipRBACRoleBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_scope( @@ -9431,7 +9390,9 @@ def create_scope_rbac_role_binding( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateScopeRBACRoleBinding(self._session, self._host, self._interceptor) # type: ignore + return self._CreateScopeRBACRoleBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_feature( @@ -9463,7 +9424,9 @@ def delete_membership_binding( ) -> Callable[[service.DeleteMembershipBindingRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteMembershipBinding(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteMembershipBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_membership_rbac_role_binding( @@ -9473,7 +9436,9 @@ def delete_membership_rbac_role_binding( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteMembershipRBACRoleBinding(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteMembershipRBACRoleBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_scope( @@ -9499,7 +9464,9 @@ def delete_scope_rbac_role_binding( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteScopeRBACRoleBinding(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteScopeRBACRoleBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_connect_manifest( @@ -9510,7 +9477,9 @@ def generate_connect_manifest( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateConnectManifest(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateConnectManifest( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_membership_rbac_role_binding_yaml( @@ -9521,7 +9490,9 @@ def generate_membership_rbac_role_binding_yaml( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateMembershipRBACRoleBindingYAML(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateMembershipRBACRoleBindingYAML( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_feature(self) -> Callable[[service.GetFeatureRequest], feature.Feature]: @@ -9557,7 +9528,9 @@ def get_membership_rbac_role_binding( ) -> Callable[[service.GetMembershipRBACRoleBindingRequest], fleet.RBACRoleBinding]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetMembershipRBACRoleBinding(self._session, self._host, self._interceptor) # type: ignore + return self._GetMembershipRBACRoleBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_scope(self) -> Callable[[service.GetScopeRequest], fleet.Scope]: @@ -9579,7 +9552,9 @@ def get_scope_rbac_role_binding( ) -> Callable[[service.GetScopeRBACRoleBindingRequest], fleet.RBACRoleBinding]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetScopeRBACRoleBinding(self._session, self._host, self._interceptor) # type: ignore + return self._GetScopeRBACRoleBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_bound_memberships( @@ -9615,7 +9590,9 @@ def list_membership_bindings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListMembershipBindings(self._session, self._host, self._interceptor) # type: ignore + return self._ListMembershipBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_membership_rbac_role_bindings( @@ -9626,7 +9603,9 @@ def list_membership_rbac_role_bindings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListMembershipRBACRoleBindings(self._session, self._host, self._interceptor) # type: ignore + return self._ListMembershipRBACRoleBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_memberships( @@ -9665,7 +9644,9 @@ def list_scope_rbac_role_bindings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListScopeRBACRoleBindings(self._session, self._host, self._interceptor) # type: ignore + return self._ListScopeRBACRoleBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_scopes( @@ -9705,7 +9686,9 @@ def update_membership_binding( ) -> Callable[[service.UpdateMembershipBindingRequest], operations_pb2.Operation]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateMembershipBinding(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateMembershipBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_membership_rbac_role_binding( @@ -9715,7 +9698,9 @@ def update_membership_rbac_role_binding( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateMembershipRBACRoleBinding(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateMembershipRBACRoleBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_scope( @@ -9741,7 +9726,9 @@ def update_scope_rbac_role_binding( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateScopeRBACRoleBinding(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateScopeRBACRoleBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/feature.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/feature.py index 29fac5f51a6b..6a750557b96f 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/feature.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/feature.py @@ -20,9 +20,11 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore -from google.cloud.gkehub_v1 import configmanagement_v1 # type: ignore -from google.cloud.gkehub_v1 import multiclusteringress_v1 # type: ignore -from google.cloud.gkehub_v1 import rbacrolebindingactuation_v1 # type: ignore +from google.cloud.gkehub_v1 import ( + configmanagement_v1, # type: ignore + multiclusteringress_v1, # type: ignore + rbacrolebindingactuation_v1, # type: ignore +) __protobuf__ = proto.module( package="google.cloud.gkehub.v1", @@ -240,6 +242,7 @@ class State(proto.Enum): The Feature resource is being updated by the Hub Service. """ + STATE_UNSPECIFIED = 0 ENABLING = 1 ACTIVE = 2 @@ -293,6 +296,7 @@ class Code(proto.Enum): the description and any associated Feature-specific details for more information. """ + CODE_UNSPECIFIED = 0 OK = 1 WARNING = 2 diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/fleet.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/fleet.py index aad55d2628f7..3656643ec1ed 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/fleet.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/fleet.py @@ -191,6 +191,7 @@ class Mode(proto.Enum): Applies the Security Posture off cluster Enterprise level features. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 BASIC = 2 @@ -213,6 +214,7 @@ class VulnerabilityMode(proto.Enum): Applies the Security Posture's vulnerability on cluster Enterprise level features. """ + VULNERABILITY_MODE_UNSPECIFIED = 0 VULNERABILITY_DISABLED = 1 VULNERABILITY_BASIC = 2 @@ -255,6 +257,7 @@ class EvaluationMode(proto.Enum): Use Binary Authorization with the policies specified in policy_bindings. """ + EVALUATION_MODE_UNSPECIFIED = 0 DISABLED = 1 POLICY_BINDINGS = 2 @@ -311,6 +314,7 @@ class Mode(proto.Enum): Enables Compliance Posture features on the cluster. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -364,6 +368,7 @@ class Code(proto.Enum): UPDATING (4): The fleet is being updated. """ + CODE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -481,6 +486,7 @@ class Code(proto.Enum): UPDATING (4): The namespace is being updated. """ + CODE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -574,6 +580,7 @@ class PredefinedRoles(proto.Enum): ANTHOS_SUPPORT gives Google Support read-only access to a number of cluster resources. """ + UNKNOWN = 0 ADMIN = 1 EDIT = 2 @@ -665,6 +672,7 @@ class Code(proto.Enum): UPDATING (4): The rbacrolebinding is being updated. """ + CODE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -774,6 +782,7 @@ class Code(proto.Enum): UPDATING (4): The scope is being updated. """ + CODE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -892,6 +901,7 @@ class Code(proto.Enum): UPDATING (4): The membershipbinding is being updated. """ + CODE_UNSPECIFIED = 0 CREATING = 1 READY = 2 diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/membership.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/membership.py index cafa7b9f9029..4b6cdfe40fbd 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/membership.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/membership.py @@ -535,6 +535,7 @@ class Code(proto.Enum): The Membership is being updated by the Hub Service. """ + CODE_UNSPECIFIED = 0 CREATING = 1 READY = 2 diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/service.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/service.py index 86b57eb1242a..8a8b3c83fd98 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/service.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/service.py @@ -21,9 +21,8 @@ import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore -from google.cloud.gkehub_v1.types import feature +from google.cloud.gkehub_v1.types import feature, membership from google.cloud.gkehub_v1.types import fleet as gcg_fleet -from google.cloud.gkehub_v1.types import membership __protobuf__ = proto.module( package="google.cloud.gkehub.v1", @@ -743,12 +742,12 @@ class ListMembershipBindingsResponse(proto.Message): def raw_page(self): return self - membership_bindings: MutableSequence[ - gcg_fleet.MembershipBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcg_fleet.MembershipBinding, + membership_bindings: MutableSequence[gcg_fleet.MembershipBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcg_fleet.MembershipBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/__init__.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/__init__.py index b3e28d5a85c1..bc9a9869c507 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/__init__.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.gke_hub_membership_service import ( GkeHubMembershipServiceAsyncClient, GkeHubMembershipServiceClient, diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/gapic_version.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/gapic_version.py index adaa11ae7120..7f068b9e257d 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/gapic_version.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "1.20.0" # {x-release-please-version} +__version__ = "1.21.0" # {x-release-please-version} diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/async_client.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/async_client.py index e8fb4fa6c5b5..2ead1663a8d3 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/async_client.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkehub_v1beta1 import gapic_version as package_version @@ -46,14 +46,16 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.rpc.status_pb2 as status_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.gkehub_v1beta1.services.gke_hub_membership_service import pagers from google.cloud.gkehub_v1beta1.types import membership @@ -142,7 +144,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GkeHubMembershipServiceAsyncClient: The constructed client. """ - return GkeHubMembershipServiceClient.from_service_account_info.__func__(GkeHubMembershipServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GkeHubMembershipServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GkeHubMembershipServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +163,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GkeHubMembershipServiceAsyncClient: The constructed client. """ - return GkeHubMembershipServiceClient.from_service_account_file.__func__(GkeHubMembershipServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GkeHubMembershipServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + GkeHubMembershipServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -196,7 +206,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GkeHubMembershipServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GkeHubMembershipServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GkeHubMembershipServiceTransport: diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/client.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/client.py index e56060ba8348..2957ac297086 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/client.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkehub_v1beta1 import gapic_version as package_version @@ -63,14 +63,16 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.rpc.status_pb2 as status_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.gkehub_v1beta1.services.gke_hub_membership_service import pagers from google.cloud.gkehub_v1beta1.types import membership @@ -89,9 +91,7 @@ class GkeHubMembershipServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GkeHubMembershipServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GkeHubMembershipServiceTransport]] _transport_registry["grpc"] = GkeHubMembershipServiceGrpcTransport _transport_registry["grpc_asyncio"] = GkeHubMembershipServiceGrpcAsyncIOTransport _transport_registry["rest"] = GkeHubMembershipServiceRestTransport @@ -649,11 +649,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GkeHubMembershipServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GkeHubMembershipServiceClient._read_environment_variables() + ) self._client_cert_source = ( GkeHubMembershipServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -690,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GkeHubMembershipServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/pagers.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/pagers.py index 5c6781f67164..577d275c2756 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/pagers.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/__init__.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/__init__.py index 805ecfaffbfd..b215cd34a32a 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/__init__.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GkeHubMembershipServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GkeHubMembershipServiceTransport]] _transport_registry["grpc"] = GkeHubMembershipServiceGrpcTransport _transport_registry["grpc_asyncio"] = GkeHubMembershipServiceGrpcAsyncIOTransport _transport_registry["rest"] = GkeHubMembershipServiceRestTransport diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/base.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/base.py index 02faa4d522f2..1c1d68366b8a 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/base.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkehub_v1beta1 import gapic_version as package_version from google.cloud.gkehub_v1beta1.types import membership @@ -349,13 +351,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/grpc.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/grpc.py index 152353dc7611..d79d78a06333 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/grpc.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.gkehub_v1beta1.types import membership @@ -590,12 +592,12 @@ def generate_exclusivity_manifest( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_exclusivity_manifest" not in self._stubs: - self._stubs[ - "generate_exclusivity_manifest" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1beta1.GkeHubMembershipService/GenerateExclusivityManifest", - request_serializer=membership.GenerateExclusivityManifestRequest.serialize, - response_deserializer=membership.GenerateExclusivityManifestResponse.deserialize, + self._stubs["generate_exclusivity_manifest"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1beta1.GkeHubMembershipService/GenerateExclusivityManifest", + request_serializer=membership.GenerateExclusivityManifestRequest.serialize, + response_deserializer=membership.GenerateExclusivityManifestResponse.deserialize, + ) ) return self._stubs["generate_exclusivity_manifest"] diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/grpc_asyncio.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/grpc_asyncio.py index 38fdb5c20fef..eeaf45b8514d 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gkehub_v1beta1.types import membership @@ -606,12 +608,12 @@ def generate_exclusivity_manifest( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_exclusivity_manifest" not in self._stubs: - self._stubs[ - "generate_exclusivity_manifest" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkehub.v1beta1.GkeHubMembershipService/GenerateExclusivityManifest", - request_serializer=membership.GenerateExclusivityManifestRequest.serialize, - response_deserializer=membership.GenerateExclusivityManifestResponse.deserialize, + self._stubs["generate_exclusivity_manifest"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkehub.v1beta1.GkeHubMembershipService/GenerateExclusivityManifest", + request_serializer=membership.GenerateExclusivityManifestRequest.serialize, + response_deserializer=membership.GenerateExclusivityManifestResponse.deserialize, + ) ) return self._stubs["generate_exclusivity_manifest"] diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/rest.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/rest.py index 4807906a5411..592735e24846 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/rest.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -971,9 +973,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseCreateMembership._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseCreateMembership._get_http_options() request, metadata = self._interceptor.pre_create_membership( request, metadata @@ -1127,9 +1127,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseDeleteMembership._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseDeleteMembership._get_http_options() request, metadata = self._interceptor.pre_delete_membership( request, metadata @@ -1279,9 +1277,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseGenerateConnectManifest._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseGenerateConnectManifest._get_http_options() request, metadata = self._interceptor.pre_generate_connect_manifest( request, metadata @@ -1435,9 +1431,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseGenerateExclusivityManifest._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseGenerateExclusivityManifest._get_http_options() request, metadata = self._interceptor.pre_generate_exclusivity_manifest( request, metadata @@ -1501,11 +1495,10 @@ def __call__( resp = self._interceptor.post_generate_exclusivity_manifest(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_exclusivity_manifest_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_exclusivity_manifest_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1590,9 +1583,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseGetMembership._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseGetMembership._get_http_options() request, metadata = self._interceptor.pre_get_membership(request, metadata) transcoded_request = _BaseGkeHubMembershipServiceRestTransport._BaseGetMembership._get_transcoded_request( @@ -1740,9 +1731,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseListMemberships._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseListMemberships._get_http_options() request, metadata = self._interceptor.pre_list_memberships( request, metadata @@ -1896,9 +1885,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseUpdateMembership._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseUpdateMembership._get_http_options() request, metadata = self._interceptor.pre_update_membership( request, metadata @@ -2052,9 +2039,7 @@ def __call__( """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseValidateExclusivity._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseValidateExclusivity._get_http_options() request, metadata = self._interceptor.pre_validate_exclusivity( request, metadata @@ -2173,7 +2158,9 @@ def generate_connect_manifest( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateConnectManifest(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateConnectManifest( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_exclusivity_manifest( @@ -2184,7 +2171,9 @@ def generate_exclusivity_manifest( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateExclusivityManifest(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateExclusivityManifest( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_membership( @@ -2280,9 +2269,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseGkeHubMembershipServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -2421,9 +2408,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseGkeHubMembershipServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -2564,9 +2549,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseGkeHubMembershipServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2706,9 +2689,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseGkeHubMembershipServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2853,9 +2834,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -3001,9 +2980,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3123,9 +3100,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -3243,9 +3218,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGkeHubMembershipServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3384,9 +3357,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGkeHubMembershipServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGkeHubMembershipServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGkeHubMembershipServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/rest_base.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/rest_base.py index 651b6e30bc14..94742870327c 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/rest_base.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/services/gke_hub_membership_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/types/membership.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/types/membership.py index 50b2da2ccedb..c5a495185c41 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/types/membership.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/types/membership.py @@ -164,6 +164,7 @@ class InfrastructureType(proto.Enum): MULTI_CLOUD (2): Public cloud infrastructure. """ + INFRASTRUCTURE_TYPE_UNSPECIFIED = 0 ON_PREM = 1 MULTI_CLOUD = 2 @@ -536,6 +537,7 @@ class ClusterType(proto.Enum): USER (4): The ClusterType is user cluster. """ + CLUSTERTYPE_UNSPECIFIED = 0 BOOTSTRAP = 1 HYBRID = 2 @@ -829,6 +831,7 @@ class Code(proto.Enum): The Membership is being updated by the Hub Service. """ + CODE_UNSPECIFIED = 0 CREATING = 1 READY = 2 diff --git a/packages/google-cloud-gke-hub/mypy.ini b/packages/google-cloud-gke-hub/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-gke-hub/mypy.ini +++ b/packages/google-cloud-gke-hub/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-gke-hub/noxfile.py b/packages/google-cloud-gke-hub/noxfile.py index 3a8da565d794..52e918f537c2 100644 --- a/packages/google-cloud-gke-hub/noxfile.py +++ b/packages/google-cloud-gke-hub/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-gke-hub/samples/generated_samples/snippet_metadata_google.cloud.gkehub.v1.json b/packages/google-cloud-gke-hub/samples/generated_samples/snippet_metadata_google.cloud.gkehub.v1.json index 216207275904..13a14fe7e242 100644 --- a/packages/google-cloud-gke-hub/samples/generated_samples/snippet_metadata_google.cloud.gkehub.v1.json +++ b/packages/google-cloud-gke-hub/samples/generated_samples/snippet_metadata_google.cloud.gkehub.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-gke-hub", - "version": "1.20.0" + "version": "1.21.0" }, "snippets": [ { diff --git a/packages/google-cloud-gke-hub/samples/generated_samples/snippet_metadata_google.cloud.gkehub.v1beta1.json b/packages/google-cloud-gke-hub/samples/generated_samples/snippet_metadata_google.cloud.gkehub.v1beta1.json index 4e7695259203..105d9ddfc89d 100644 --- a/packages/google-cloud-gke-hub/samples/generated_samples/snippet_metadata_google.cloud.gkehub.v1beta1.json +++ b/packages/google-cloud-gke-hub/samples/generated_samples/snippet_metadata_google.cloud.gkehub.v1beta1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-gke-hub", - "version": "1.20.0" + "version": "1.21.0" }, "snippets": [ { diff --git a/packages/google-cloud-gke-hub/tests/unit/gapic/gkehub_v1/test_gke_hub.py b/packages/google-cloud-gke-hub/tests/unit/gapic/gkehub_v1/test_gke_hub.py index b1f4672f78f9..c927630880f8 100644 --- a/packages/google-cloud-gke-hub/tests/unit/gapic/gkehub_v1/test_gke_hub.py +++ b/packages/google-cloud-gke-hub/tests/unit/gapic/gkehub_v1/test_gke_hub.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.gkehub_v1.services.gke_hub import ( GkeHubAsyncClient, @@ -71,10 +71,8 @@ pagers, transports, ) -from google.cloud.gkehub_v1.types import feature -from google.cloud.gkehub_v1.types import fleet +from google.cloud.gkehub_v1.types import feature, fleet, membership, service from google.cloud.gkehub_v1.types import fleet as gcg_fleet -from google.cloud.gkehub_v1.types import membership, service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -911,10 +909,9 @@ def test_gke_hub_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +956,9 @@ def test_gke_hub_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +994,9 @@ def test_gke_hub_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1230,9 +1225,7 @@ def test_gke_hub_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1347,9 +1340,9 @@ def test_list_memberships_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_memberships - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_memberships] = ( + mock_rpc + ) request = {} client.list_memberships(request) @@ -1881,9 +1874,9 @@ def test_list_bound_memberships_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_bound_memberships - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_bound_memberships] = ( + mock_rpc + ) request = {} client.list_bound_memberships(request) @@ -3606,9 +3599,9 @@ def test_create_membership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_membership] = ( + mock_rpc + ) request = {} client.create_membership(request) @@ -4354,9 +4347,9 @@ def test_delete_membership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_membership] = ( + mock_rpc + ) request = {} client.delete_membership(request) @@ -5028,9 +5021,9 @@ def test_update_membership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_membership] = ( + mock_rpc + ) request = {} client.update_membership(request) @@ -7878,9 +7871,9 @@ def test_get_scope_namespace_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_scope_namespace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_scope_namespace] = ( + mock_rpc + ) request = {} client.get_scope_namespace(request) @@ -8219,9 +8212,9 @@ def test_create_scope_namespace_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_scope_namespace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_scope_namespace] = ( + mock_rpc + ) request = {} client.create_scope_namespace(request) @@ -8581,9 +8574,9 @@ def test_update_scope_namespace_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_scope_namespace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_scope_namespace] = ( + mock_rpc + ) request = {} client.update_scope_namespace(request) @@ -8937,9 +8930,9 @@ def test_delete_scope_namespace_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_scope_namespace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_scope_namespace] = ( + mock_rpc + ) request = {} client.delete_scope_namespace(request) @@ -9288,9 +9281,9 @@ def test_list_scope_namespaces_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_scope_namespaces - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_scope_namespaces] = ( + mock_rpc + ) request = {} client.list_scope_namespaces(request) @@ -13648,9 +13641,9 @@ def test_list_permitted_scopes_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_permitted_scopes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_permitted_scopes] = ( + mock_rpc + ) request = {} client.list_permitted_scopes(request) @@ -14195,9 +14188,9 @@ def test_get_membership_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_membership_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_membership_binding] = ( + mock_rpc + ) request = {} client.get_membership_binding(request) @@ -18319,9 +18312,9 @@ def test_list_memberships_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_memberships - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_memberships] = ( + mock_rpc + ) request = {} client.list_memberships(request) @@ -18582,9 +18575,9 @@ def test_list_bound_memberships_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_bound_memberships - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_bound_memberships] = ( + mock_rpc + ) request = {} client.list_bound_memberships(request) @@ -19271,9 +19264,9 @@ def test_create_membership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_membership] = ( + mock_rpc + ) request = {} client.create_membership(request) @@ -19600,9 +19593,9 @@ def test_delete_membership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_membership] = ( + mock_rpc + ) request = {} client.delete_membership(request) @@ -19891,9 +19884,9 @@ def test_update_membership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_membership] = ( + mock_rpc + ) request = {} client.update_membership(request) @@ -21329,9 +21322,9 @@ def test_get_scope_namespace_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_scope_namespace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_scope_namespace] = ( + mock_rpc + ) request = {} client.get_scope_namespace(request) @@ -21514,9 +21507,9 @@ def test_create_scope_namespace_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_scope_namespace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_scope_namespace] = ( + mock_rpc + ) request = {} client.create_scope_namespace(request) @@ -21725,9 +21718,9 @@ def test_update_scope_namespace_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_scope_namespace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_scope_namespace] = ( + mock_rpc + ) request = {} client.update_scope_namespace(request) @@ -21919,9 +21912,9 @@ def test_delete_scope_namespace_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_scope_namespace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_scope_namespace] = ( + mock_rpc + ) request = {} client.delete_scope_namespace(request) @@ -22103,9 +22096,9 @@ def test_list_scope_namespaces_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_scope_namespaces - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_scope_namespaces] = ( + mock_rpc + ) request = {} client.list_scope_namespaces(request) @@ -24395,9 +24388,9 @@ def test_list_permitted_scopes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_permitted_scopes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_permitted_scopes] = ( + mock_rpc + ) request = {} client.list_permitted_scopes(request) @@ -24656,9 +24649,9 @@ def test_get_membership_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_membership_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_membership_binding] = ( + mock_rpc + ) request = {} client.get_membership_binding(request) diff --git a/packages/google-cloud-gke-hub/tests/unit/gapic/gkehub_v1beta1/test_gke_hub_membership_service.py b/packages/google-cloud-gke-hub/tests/unit/gapic/gkehub_v1beta1/test_gke_hub_membership_service.py index 8bc0f7f03776..71d024883dab 100644 --- a/packages/google-cloud-gke-hub/tests/unit/gapic/gkehub_v1beta1/test_gke_hub_membership_service.py +++ b/packages/google-cloud-gke-hub/tests/unit/gapic/gkehub_v1beta1/test_gke_hub_membership_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,23 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.gkehub_v1beta1.services.gke_hub_membership_service import ( GkeHubMembershipServiceAsyncClient, @@ -1016,10 +1018,9 @@ def test_gke_hub_membership_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1064,10 +1065,9 @@ def test_gke_hub_membership_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1103,10 +1103,9 @@ def test_gke_hub_membership_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1366,9 +1365,7 @@ def test_gke_hub_membership_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1483,9 +1480,9 @@ def test_list_memberships_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_memberships - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_memberships] = ( + mock_rpc + ) request = {} client.list_memberships(request) @@ -2352,9 +2349,9 @@ def test_create_membership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_membership] = ( + mock_rpc + ) request = {} client.create_membership(request) @@ -2717,9 +2714,9 @@ def test_delete_membership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_membership] = ( + mock_rpc + ) request = {} client.delete_membership(request) @@ -3062,9 +3059,9 @@ def test_update_membership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_membership] = ( + mock_rpc + ) request = {} client.update_membership(request) @@ -3686,9 +3683,9 @@ def test_validate_exclusivity_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.validate_exclusivity - ] = mock_rpc + client._transport._wrapped_methods[client._transport.validate_exclusivity] = ( + mock_rpc + ) request = {} client.validate_exclusivity(request) @@ -4133,9 +4130,9 @@ def test_list_memberships_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_memberships - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_memberships] = ( + mock_rpc + ) request = {} client.list_memberships(request) @@ -4575,9 +4572,9 @@ def test_create_membership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_membership] = ( + mock_rpc + ) request = {} client.create_membership(request) @@ -4793,9 +4790,9 @@ def test_delete_membership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_membership] = ( + mock_rpc + ) request = {} client.delete_membership(request) @@ -4989,9 +4986,9 @@ def test_update_membership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_membership] = ( + mock_rpc + ) request = {} client.update_membership(request) @@ -5344,9 +5341,9 @@ def test_validate_exclusivity_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.validate_exclusivity - ] = mock_rpc + client._transport._wrapped_methods[client._transport.validate_exclusivity] = ( + mock_rpc + ) request = {} client.validate_exclusivity(request) diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/__init__.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/__init__.py index 29774dc88796..6b8a3fcdaf1c 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/__init__.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.attached_clusters import ( AttachedClustersAsyncClient, AttachedClustersClient, diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/async_client.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/async_client.py index 22a0f371c5a8..4fa515a1a708 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/async_client.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version @@ -46,10 +46,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.gke_multicloud_v1.services.attached_clusters import pagers from google.cloud.gke_multicloud_v1.types import ( @@ -135,7 +135,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AttachedClustersAsyncClient: The constructed client. """ - return AttachedClustersClient.from_service_account_info.__func__(AttachedClustersAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AttachedClustersClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AttachedClustersAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -151,7 +154,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AttachedClustersAsyncClient: The constructed client. """ - return AttachedClustersClient.from_service_account_file.__func__(AttachedClustersAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AttachedClustersClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AttachedClustersAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/client.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/client.py index b305e2c4285a..63293d859594 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/client.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version @@ -63,10 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.gke_multicloud_v1.services.attached_clusters import pagers from google.cloud.gke_multicloud_v1.types import ( @@ -89,9 +89,7 @@ class AttachedClustersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AttachedClustersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AttachedClustersTransport]] _transport_registry["grpc"] = AttachedClustersGrpcTransport _transport_registry["grpc_asyncio"] = AttachedClustersGrpcAsyncIOTransport _transport_registry["rest"] = AttachedClustersRestTransport @@ -659,11 +657,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AttachedClustersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AttachedClustersClient._read_environment_variables() + ) self._client_cert_source = AttachedClustersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -698,8 +694,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AttachedClustersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/pagers.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/pagers.py index b1e6477da8ea..c1160c255434 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/pagers.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/base.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/base.py index ca31eb7ad0f2..490ccaca9190 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/base.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version from google.cloud.gke_multicloud_v1.types import attached_resources, attached_service @@ -383,13 +383,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc.py index 11d4c859b8c2..67f201c89801 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.gke_multicloud_v1.types import attached_resources, attached_service @@ -559,12 +559,12 @@ def get_attached_server_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_attached_server_config" not in self._stubs: - self._stubs[ - "get_attached_server_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AttachedClusters/GetAttachedServerConfig", - request_serializer=attached_service.GetAttachedServerConfigRequest.serialize, - response_deserializer=attached_resources.AttachedServerConfig.deserialize, + self._stubs["get_attached_server_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AttachedClusters/GetAttachedServerConfig", + request_serializer=attached_service.GetAttachedServerConfigRequest.serialize, + response_deserializer=attached_resources.AttachedServerConfig.deserialize, + ) ) return self._stubs["get_attached_server_config"] @@ -592,12 +592,12 @@ def generate_attached_cluster_install_manifest( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_attached_cluster_install_manifest" not in self._stubs: - self._stubs[ - "generate_attached_cluster_install_manifest" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterInstallManifest", - request_serializer=attached_service.GenerateAttachedClusterInstallManifestRequest.serialize, - response_deserializer=attached_service.GenerateAttachedClusterInstallManifestResponse.deserialize, + self._stubs["generate_attached_cluster_install_manifest"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterInstallManifest", + request_serializer=attached_service.GenerateAttachedClusterInstallManifestRequest.serialize, + response_deserializer=attached_service.GenerateAttachedClusterInstallManifestResponse.deserialize, + ) ) return self._stubs["generate_attached_cluster_install_manifest"] @@ -624,12 +624,12 @@ def generate_attached_cluster_agent_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_attached_cluster_agent_token" not in self._stubs: - self._stubs[ - "generate_attached_cluster_agent_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterAgentToken", - request_serializer=attached_service.GenerateAttachedClusterAgentTokenRequest.serialize, - response_deserializer=attached_service.GenerateAttachedClusterAgentTokenResponse.deserialize, + self._stubs["generate_attached_cluster_agent_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterAgentToken", + request_serializer=attached_service.GenerateAttachedClusterAgentTokenRequest.serialize, + response_deserializer=attached_service.GenerateAttachedClusterAgentTokenResponse.deserialize, + ) ) return self._stubs["generate_attached_cluster_agent_token"] diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc_asyncio.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc_asyncio.py index ead7a05b4c86..673c0ac4d4fd 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc_asyncio.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gke_multicloud_v1.types import attached_resources, attached_service @@ -572,12 +572,12 @@ def get_attached_server_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_attached_server_config" not in self._stubs: - self._stubs[ - "get_attached_server_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AttachedClusters/GetAttachedServerConfig", - request_serializer=attached_service.GetAttachedServerConfigRequest.serialize, - response_deserializer=attached_resources.AttachedServerConfig.deserialize, + self._stubs["get_attached_server_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AttachedClusters/GetAttachedServerConfig", + request_serializer=attached_service.GetAttachedServerConfigRequest.serialize, + response_deserializer=attached_resources.AttachedServerConfig.deserialize, + ) ) return self._stubs["get_attached_server_config"] @@ -605,12 +605,12 @@ def generate_attached_cluster_install_manifest( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_attached_cluster_install_manifest" not in self._stubs: - self._stubs[ - "generate_attached_cluster_install_manifest" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterInstallManifest", - request_serializer=attached_service.GenerateAttachedClusterInstallManifestRequest.serialize, - response_deserializer=attached_service.GenerateAttachedClusterInstallManifestResponse.deserialize, + self._stubs["generate_attached_cluster_install_manifest"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterInstallManifest", + request_serializer=attached_service.GenerateAttachedClusterInstallManifestRequest.serialize, + response_deserializer=attached_service.GenerateAttachedClusterInstallManifestResponse.deserialize, + ) ) return self._stubs["generate_attached_cluster_install_manifest"] @@ -637,12 +637,12 @@ def generate_attached_cluster_agent_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_attached_cluster_agent_token" not in self._stubs: - self._stubs[ - "generate_attached_cluster_agent_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterAgentToken", - request_serializer=attached_service.GenerateAttachedClusterAgentTokenRequest.serialize, - response_deserializer=attached_service.GenerateAttachedClusterAgentTokenResponse.deserialize, + self._stubs["generate_attached_cluster_agent_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterAgentToken", + request_serializer=attached_service.GenerateAttachedClusterAgentTokenRequest.serialize, + response_deserializer=attached_service.GenerateAttachedClusterAgentTokenResponse.deserialize, + ) ) return self._stubs["generate_attached_cluster_agent_token"] diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/rest.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/rest.py index e58c0c64a438..9961a2cac298 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/rest.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -909,9 +909,7 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseCreateAttachedCluster._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseCreateAttachedCluster._get_http_options() request, metadata = self._interceptor.pre_create_attached_cluster( request, metadata @@ -1065,9 +1063,7 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseDeleteAttachedCluster._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseDeleteAttachedCluster._get_http_options() request, metadata = self._interceptor.pre_delete_attached_cluster( request, metadata @@ -1216,15 +1212,12 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseGenerateAttachedClusterAgentToken._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseGenerateAttachedClusterAgentToken._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_generate_attached_cluster_agent_token( - request, metadata + request, metadata = ( + self._interceptor.pre_generate_attached_cluster_agent_token( + request, metadata + ) ) transcoded_request = _BaseAttachedClustersRestTransport._BaseGenerateAttachedClusterAgentToken._get_transcoded_request( http_options, request @@ -1292,11 +1285,10 @@ def __call__( resp = self._interceptor.post_generate_attached_cluster_agent_token(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_attached_cluster_agent_token_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_attached_cluster_agent_token_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1386,15 +1378,12 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseGenerateAttachedClusterInstallManifest._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseGenerateAttachedClusterInstallManifest._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_generate_attached_cluster_install_manifest( - request, metadata + request, metadata = ( + self._interceptor.pre_generate_attached_cluster_install_manifest( + request, metadata + ) ) transcoded_request = _BaseAttachedClustersRestTransport._BaseGenerateAttachedClusterInstallManifest._get_transcoded_request( http_options, request @@ -1459,11 +1448,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_attached_cluster_install_manifest_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_attached_cluster_install_manifest_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1548,9 +1536,7 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseGetAttachedCluster._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseGetAttachedCluster._get_http_options() request, metadata = self._interceptor.pre_get_attached_cluster( request, metadata @@ -1702,9 +1688,7 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseGetAttachedServerConfig._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseGetAttachedServerConfig._get_http_options() request, metadata = self._interceptor.pre_get_attached_server_config( request, metadata @@ -1858,9 +1842,7 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseImportAttachedCluster._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseImportAttachedCluster._get_http_options() request, metadata = self._interceptor.pre_import_attached_cluster( request, metadata @@ -2013,9 +1995,7 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseListAttachedClusters._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseListAttachedClusters._get_http_options() request, metadata = self._interceptor.pre_list_attached_clusters( request, metadata @@ -2169,9 +2149,7 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseUpdateAttachedCluster._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseUpdateAttachedCluster._get_http_options() request, metadata = self._interceptor.pre_update_attached_cluster( request, metadata @@ -2295,7 +2273,9 @@ def generate_attached_cluster_agent_token( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateAttachedClusterAgentToken(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateAttachedClusterAgentToken( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_attached_cluster_install_manifest( @@ -2306,7 +2286,9 @@ def generate_attached_cluster_install_manifest( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateAttachedClusterInstallManifest(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateAttachedClusterInstallManifest( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_attached_cluster( @@ -2327,7 +2309,9 @@ def get_attached_server_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetAttachedServerConfig(self._session, self._host, self._interceptor) # type: ignore + return self._GetAttachedServerConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_attached_cluster( @@ -2416,9 +2400,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2536,9 +2518,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2793,9 +2773,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAttachedClustersRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/async_client.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/async_client.py index c69ff869f89d..2405304c8157 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/async_client.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version @@ -47,10 +47,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.gke_multicloud_v1.services.aws_clusters import pagers from google.cloud.gke_multicloud_v1.types import ( @@ -130,7 +130,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AwsClustersAsyncClient: The constructed client. """ - return AwsClustersClient.from_service_account_info.__func__(AwsClustersAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AwsClustersClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AwsClustersAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +149,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AwsClustersAsyncClient: The constructed client. """ - return AwsClustersClient.from_service_account_file.__func__(AwsClustersAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AwsClustersClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AwsClustersAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/client.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/client.py index f787293d1977..acfc6e66a89e 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/client.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version @@ -63,10 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.gke_multicloud_v1.services.aws_clusters import pagers from google.cloud.gke_multicloud_v1.types import ( @@ -681,11 +681,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AwsClustersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AwsClustersClient._read_environment_variables() + ) self._client_cert_source = AwsClustersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -720,8 +718,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AwsClustersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/pagers.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/pagers.py index 11ed0e06bf08..078a1abcf575 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/pagers.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/base.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/base.py index 93960e1c7a90..00b2bbf2aeb9 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/base.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version from google.cloud.gke_multicloud_v1.types import aws_resources, aws_service @@ -514,13 +514,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc.py index 02e32df515ea..8f078f0592dc 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.gke_multicloud_v1.types import aws_resources, aws_service @@ -514,12 +514,12 @@ def generate_aws_cluster_agent_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_aws_cluster_agent_token" not in self._stubs: - self._stubs[ - "generate_aws_cluster_agent_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AwsClusters/GenerateAwsClusterAgentToken", - request_serializer=aws_service.GenerateAwsClusterAgentTokenRequest.serialize, - response_deserializer=aws_service.GenerateAwsClusterAgentTokenResponse.deserialize, + self._stubs["generate_aws_cluster_agent_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AwsClusters/GenerateAwsClusterAgentToken", + request_serializer=aws_service.GenerateAwsClusterAgentTokenRequest.serialize, + response_deserializer=aws_service.GenerateAwsClusterAgentTokenResponse.deserialize, + ) ) return self._stubs["generate_aws_cluster_agent_token"] @@ -639,12 +639,12 @@ def rollback_aws_node_pool_update( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_aws_node_pool_update" not in self._stubs: - self._stubs[ - "rollback_aws_node_pool_update" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AwsClusters/RollbackAwsNodePoolUpdate", - request_serializer=aws_service.RollbackAwsNodePoolUpdateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["rollback_aws_node_pool_update"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AwsClusters/RollbackAwsNodePoolUpdate", + request_serializer=aws_service.RollbackAwsNodePoolUpdateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["rollback_aws_node_pool_update"] diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc_asyncio.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc_asyncio.py index 8abfe05f8131..c6ff70b05770 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc_asyncio.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gke_multicloud_v1.types import aws_resources, aws_service @@ -531,12 +531,12 @@ def generate_aws_cluster_agent_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_aws_cluster_agent_token" not in self._stubs: - self._stubs[ - "generate_aws_cluster_agent_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AwsClusters/GenerateAwsClusterAgentToken", - request_serializer=aws_service.GenerateAwsClusterAgentTokenRequest.serialize, - response_deserializer=aws_service.GenerateAwsClusterAgentTokenResponse.deserialize, + self._stubs["generate_aws_cluster_agent_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AwsClusters/GenerateAwsClusterAgentToken", + request_serializer=aws_service.GenerateAwsClusterAgentTokenRequest.serialize, + response_deserializer=aws_service.GenerateAwsClusterAgentTokenResponse.deserialize, + ) ) return self._stubs["generate_aws_cluster_agent_token"] @@ -661,12 +661,12 @@ def rollback_aws_node_pool_update( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_aws_node_pool_update" not in self._stubs: - self._stubs[ - "rollback_aws_node_pool_update" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AwsClusters/RollbackAwsNodePoolUpdate", - request_serializer=aws_service.RollbackAwsNodePoolUpdateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["rollback_aws_node_pool_update"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AwsClusters/RollbackAwsNodePoolUpdate", + request_serializer=aws_service.RollbackAwsNodePoolUpdateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["rollback_aws_node_pool_update"] diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/rest.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/rest.py index 2aab5e6511e6..ca38b0a8f2a3 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/rest.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1893,9 +1893,7 @@ def __call__( """ - http_options = ( - _BaseAwsClustersRestTransport._BaseGenerateAwsAccessToken._get_http_options() - ) + http_options = _BaseAwsClustersRestTransport._BaseGenerateAwsAccessToken._get_http_options() request, metadata = self._interceptor.pre_generate_aws_access_token( request, metadata @@ -2044,9 +2042,7 @@ def __call__( """ - http_options = ( - _BaseAwsClustersRestTransport._BaseGenerateAwsClusterAgentToken._get_http_options() - ) + http_options = _BaseAwsClustersRestTransport._BaseGenerateAwsClusterAgentToken._get_http_options() request, metadata = self._interceptor.pre_generate_aws_cluster_agent_token( request, metadata @@ -2117,11 +2113,10 @@ def __call__( resp = self._interceptor.post_generate_aws_cluster_agent_token(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_aws_cluster_agent_token_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_aws_cluster_agent_token_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2657,9 +2652,7 @@ def __call__( """ - http_options = ( - _BaseAwsClustersRestTransport._BaseGetAwsOpenIdConfig._get_http_options() - ) + http_options = _BaseAwsClustersRestTransport._BaseGetAwsOpenIdConfig._get_http_options() request, metadata = self._interceptor.pre_get_aws_open_id_config( request, metadata @@ -2806,9 +2799,7 @@ def __call__( """ - http_options = ( - _BaseAwsClustersRestTransport._BaseGetAwsServerConfig._get_http_options() - ) + http_options = _BaseAwsClustersRestTransport._BaseGetAwsServerConfig._get_http_options() request, metadata = self._interceptor.pre_get_aws_server_config( request, metadata @@ -3261,9 +3252,7 @@ def __call__( """ - http_options = ( - _BaseAwsClustersRestTransport._BaseRollbackAwsNodePoolUpdate._get_http_options() - ) + http_options = _BaseAwsClustersRestTransport._BaseRollbackAwsNodePoolUpdate._get_http_options() request, metadata = self._interceptor.pre_rollback_aws_node_pool_update( request, metadata @@ -3332,11 +3321,10 @@ def __call__( resp = self._interceptor.post_rollback_aws_node_pool_update(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_rollback_aws_node_pool_update_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_rollback_aws_node_pool_update_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3710,7 +3698,9 @@ def generate_aws_access_token( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateAwsAccessToken(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateAwsAccessToken( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_aws_cluster_agent_token( @@ -3721,7 +3711,9 @@ def generate_aws_cluster_agent_token( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateAwsClusterAgentToken(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateAwsClusterAgentToken( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_aws_cluster( @@ -3795,7 +3787,9 @@ def rollback_aws_node_pool_update( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RollbackAwsNodePoolUpdate(self._session, self._host, self._interceptor) # type: ignore + return self._RollbackAwsNodePoolUpdate( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_aws_cluster( diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/async_client.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/async_client.py index a543c73540fe..5421b66ce71d 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/async_client.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version @@ -47,10 +47,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.gke_multicloud_v1.services.azure_clusters import pagers from google.cloud.gke_multicloud_v1.types import ( @@ -142,7 +142,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AzureClustersAsyncClient: The constructed client. """ - return AzureClustersClient.from_service_account_info.__func__(AzureClustersAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AzureClustersClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AzureClustersAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +161,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AzureClustersAsyncClient: The constructed client. """ - return AzureClustersClient.from_service_account_file.__func__(AzureClustersAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AzureClustersClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AzureClustersAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/client.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/client.py index 6a1e71465af9..15987ba9e632 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/client.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version @@ -63,10 +63,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.longrunning import operations_pb2 # type: ignore from google.cloud.gke_multicloud_v1.services.azure_clusters import pagers from google.cloud.gke_multicloud_v1.types import ( @@ -701,11 +701,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AzureClustersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AzureClustersClient._read_environment_variables() + ) self._client_cert_source = AzureClustersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -740,8 +738,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AzureClustersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/pagers.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/pagers.py index d7866309d81c..72c7ce741cc4 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/pagers.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/base.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/base.py index 40ab9ea10283..c6fa966c8c1c 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/base.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version from google.cloud.gke_multicloud_v1.types import azure_resources, azure_service @@ -586,13 +586,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc.py index f82109ce9404..c1b7fc4b10f3 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.gke_multicloud_v1.types import azure_resources, azure_service @@ -647,12 +647,12 @@ def generate_azure_cluster_agent_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_azure_cluster_agent_token" not in self._stubs: - self._stubs[ - "generate_azure_cluster_agent_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureClusterAgentToken", - request_serializer=azure_service.GenerateAzureClusterAgentTokenRequest.serialize, - response_deserializer=azure_service.GenerateAzureClusterAgentTokenResponse.deserialize, + self._stubs["generate_azure_cluster_agent_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureClusterAgentToken", + request_serializer=azure_service.GenerateAzureClusterAgentTokenRequest.serialize, + response_deserializer=azure_service.GenerateAzureClusterAgentTokenResponse.deserialize, + ) ) return self._stubs["generate_azure_cluster_agent_token"] @@ -680,12 +680,12 @@ def generate_azure_access_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_azure_access_token" not in self._stubs: - self._stubs[ - "generate_azure_access_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureAccessToken", - request_serializer=azure_service.GenerateAzureAccessTokenRequest.serialize, - response_deserializer=azure_service.GenerateAzureAccessTokenResponse.deserialize, + self._stubs["generate_azure_access_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureAccessToken", + request_serializer=azure_service.GenerateAzureAccessTokenRequest.serialize, + response_deserializer=azure_service.GenerateAzureAccessTokenResponse.deserialize, + ) ) return self._stubs["generate_azure_access_token"] diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc_asyncio.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc_asyncio.py index ffee2dd1e0f5..741d771149dd 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc_asyncio.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gke_multicloud_v1.types import azure_resources, azure_service @@ -670,12 +670,12 @@ def generate_azure_cluster_agent_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_azure_cluster_agent_token" not in self._stubs: - self._stubs[ - "generate_azure_cluster_agent_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureClusterAgentToken", - request_serializer=azure_service.GenerateAzureClusterAgentTokenRequest.serialize, - response_deserializer=azure_service.GenerateAzureClusterAgentTokenResponse.deserialize, + self._stubs["generate_azure_cluster_agent_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureClusterAgentToken", + request_serializer=azure_service.GenerateAzureClusterAgentTokenRequest.serialize, + response_deserializer=azure_service.GenerateAzureClusterAgentTokenResponse.deserialize, + ) ) return self._stubs["generate_azure_cluster_agent_token"] @@ -703,12 +703,12 @@ def generate_azure_access_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_azure_access_token" not in self._stubs: - self._stubs[ - "generate_azure_access_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureAccessToken", - request_serializer=azure_service.GenerateAzureAccessTokenRequest.serialize, - response_deserializer=azure_service.GenerateAzureAccessTokenResponse.deserialize, + self._stubs["generate_azure_access_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureAccessToken", + request_serializer=azure_service.GenerateAzureAccessTokenRequest.serialize, + response_deserializer=azure_service.GenerateAzureAccessTokenResponse.deserialize, + ) ) return self._stubs["generate_azure_access_token"] diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/rest.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/rest.py index 93ec996600cc..60f393914d20 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/rest.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1473,9 +1473,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseCreateAzureClient._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseCreateAzureClient._get_http_options() request, metadata = self._interceptor.pre_create_azure_client( request, metadata @@ -1627,9 +1625,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseCreateAzureCluster._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseCreateAzureCluster._get_http_options() request, metadata = self._interceptor.pre_create_azure_cluster( request, metadata @@ -1781,9 +1777,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseCreateAzureNodePool._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseCreateAzureNodePool._get_http_options() request, metadata = self._interceptor.pre_create_azure_node_pool( request, metadata @@ -1934,9 +1928,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseDeleteAzureClient._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseDeleteAzureClient._get_http_options() request, metadata = self._interceptor.pre_delete_azure_client( request, metadata @@ -2082,9 +2074,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseDeleteAzureCluster._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseDeleteAzureCluster._get_http_options() request, metadata = self._interceptor.pre_delete_azure_cluster( request, metadata @@ -2230,9 +2220,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseDeleteAzureNodePool._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseDeleteAzureNodePool._get_http_options() request, metadata = self._interceptor.pre_delete_azure_node_pool( request, metadata @@ -2379,9 +2367,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseGenerateAzureAccessToken._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseGenerateAzureAccessToken._get_http_options() request, metadata = self._interceptor.pre_generate_azure_access_token( request, metadata @@ -2532,15 +2518,12 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseGenerateAzureClusterAgentToken._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseGenerateAzureClusterAgentToken._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_generate_azure_cluster_agent_token( - request, metadata + request, metadata = ( + self._interceptor.pre_generate_azure_cluster_agent_token( + request, metadata + ) ) transcoded_request = _BaseAzureClustersRestTransport._BaseGenerateAzureClusterAgentToken._get_transcoded_request( http_options, request @@ -2606,11 +2589,10 @@ def __call__( resp = self._interceptor.post_generate_azure_cluster_agent_token(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_azure_cluster_agent_token_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_azure_cluster_agent_token_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3009,9 +2991,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseGetAzureJsonWebKeys._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseGetAzureJsonWebKeys._get_http_options() request, metadata = self._interceptor.pre_get_azure_json_web_keys( request, metadata @@ -3158,9 +3138,7 @@ def __call__( An Anthos node pool running on Azure. """ - http_options = ( - _BaseAzureClustersRestTransport._BaseGetAzureNodePool._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseGetAzureNodePool._get_http_options() request, metadata = self._interceptor.pre_get_azure_node_pool( request, metadata @@ -3311,9 +3289,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseGetAzureOpenIdConfig._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseGetAzureOpenIdConfig._get_http_options() request, metadata = self._interceptor.pre_get_azure_open_id_config( request, metadata @@ -3464,9 +3440,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseGetAzureServerConfig._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseGetAzureServerConfig._get_http_options() request, metadata = self._interceptor.pre_get_azure_server_config( request, metadata @@ -3615,9 +3589,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseListAzureClients._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseListAzureClients._get_http_options() request, metadata = self._interceptor.pre_list_azure_clients( request, metadata @@ -3766,9 +3738,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseListAzureClusters._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseListAzureClusters._get_http_options() request, metadata = self._interceptor.pre_list_azure_clusters( request, metadata @@ -3917,9 +3887,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseListAzureNodePools._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseListAzureNodePools._get_http_options() request, metadata = self._interceptor.pre_list_azure_node_pools( request, metadata @@ -4070,9 +4038,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseUpdateAzureCluster._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseUpdateAzureCluster._get_http_options() request, metadata = self._interceptor.pre_update_azure_cluster( request, metadata @@ -4224,9 +4190,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseUpdateAzureNodePool._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseUpdateAzureNodePool._get_http_options() request, metadata = self._interceptor.pre_update_azure_node_pool( request, metadata @@ -4376,7 +4340,9 @@ def generate_azure_access_token( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateAzureAccessToken(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateAzureAccessToken( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_azure_cluster_agent_token( @@ -4387,7 +4353,9 @@ def generate_azure_cluster_agent_token( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateAzureClusterAgentToken(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateAzureClusterAgentToken( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_azure_client( diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_resources.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_resources.py index 4191d37a27a5..fb46777df2bd 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_resources.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_resources.py @@ -190,6 +190,7 @@ class State(proto.Enum): requires user action to restore full functionality. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -435,12 +436,12 @@ class AttachedServerConfig(proto.Message): proto.STRING, number=1, ) - valid_versions: MutableSequence[ - "AttachedPlatformVersionInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="AttachedPlatformVersionInfo", + valid_versions: MutableSequence["AttachedPlatformVersionInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="AttachedPlatformVersionInfo", + ) ) @@ -609,6 +610,7 @@ class KeyOperator(proto.Enum): KEY_OPERATOR_EXISTS (2): Operator maps to 'Exists'. """ + KEY_OPERATOR_UNSPECIFIED = 0 KEY_OPERATOR_EQUAL = 1 KEY_OPERATOR_EXISTS = 2 @@ -626,6 +628,7 @@ class Effect(proto.Enum): EFFECT_NO_EXECUTE (3): Effect maps to 'NoExecute'. """ + EFFECT_UNSPECIFIED = 0 EFFECT_NO_SCHEDULE = 1 EFFECT_PREFER_NO_SCHEDULE = 2 diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_service.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_service.py index c020e192e350..c7f118acc7bf 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_service.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_service.py @@ -380,12 +380,12 @@ class ListAttachedClustersResponse(proto.Message): def raw_page(self): return self - attached_clusters: MutableSequence[ - attached_resources.AttachedCluster - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=attached_resources.AttachedCluster, + attached_clusters: MutableSequence[attached_resources.AttachedCluster] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=attached_resources.AttachedCluster, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/aws_resources.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/aws_resources.py index 6ad7039a083c..2c94e4d4f739 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/aws_resources.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/aws_resources.py @@ -175,6 +175,7 @@ class State(proto.Enum): requires user action to restore full functionality. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -586,6 +587,7 @@ class VolumeType(proto.Enum): GP3 (2): GP3 (General Purpose SSD volume type). """ + VOLUME_TYPE_UNSPECIFIED = 0 GP2 = 1 GP3 = 2 @@ -768,6 +770,7 @@ class State(proto.Enum): requires user action to restore full functionality. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -1344,6 +1347,7 @@ class Tenancy(proto.Enum): HOST (3): Launch this instance to a dedicated host. """ + TENANCY_UNSPECIFIED = 0 DEFAULT = 1 DEDICATED = 2 diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_resources.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_resources.py index 81766fb3ca63..0b1aefa9a3f0 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_resources.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_resources.py @@ -201,6 +201,7 @@ class State(proto.Enum): requires user action to restore full functionality. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -937,6 +938,7 @@ class State(proto.Enum): requires user action to restore full functionality. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_service.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_service.py index bedbe26be82a..2d513aa17314 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_service.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_service.py @@ -506,12 +506,12 @@ class ListAzureNodePoolsResponse(proto.Message): def raw_page(self): return self - azure_node_pools: MutableSequence[ - azure_resources.AzureNodePool - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=azure_resources.AzureNodePool, + azure_node_pools: MutableSequence[azure_resources.AzureNodePool] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=azure_resources.AzureNodePool, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/common_resources.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/common_resources.py index b9989b3228b9..c88bb2dcf525 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/common_resources.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/common_resources.py @@ -248,6 +248,7 @@ class Effect(proto.Enum): tolerate the taint. Currently enforced by NodeController. """ + EFFECT_UNSPECIFIED = 0 NO_SCHEDULE = 1 PREFER_NO_SCHEDULE = 2 @@ -432,6 +433,7 @@ class Component(proto.Enum): This indicates that user workload logging component is enabled. """ + COMPONENT_UNSPECIFIED = 0 SYSTEM_COMPONENTS = 1 WORKLOADS = 2 @@ -529,6 +531,7 @@ class EvaluationMode(proto.Enum): BinaryAuthorization using the project's singleton policy. """ + EVALUATION_MODE_UNSPECIFIED = 0 DISABLED = 1 PROJECT_SINGLETON_POLICY_ENFORCE = 2 @@ -564,6 +567,7 @@ class VulnerabilityMode(proto.Enum): Applies the Security Posture's vulnerability on cluster Enterprise level features. """ + VULNERABILITY_MODE_UNSPECIFIED = 0 VULNERABILITY_DISABLED = 1 VULNERABILITY_ENTERPRISE = 2 diff --git a/packages/google-cloud-gke-multicloud/mypy.ini b/packages/google-cloud-gke-multicloud/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-gke-multicloud/mypy.ini +++ b/packages/google-cloud-gke-multicloud/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-gke-multicloud/noxfile.py b/packages/google-cloud-gke-multicloud/noxfile.py index 08020301ed4a..2bf327cbdf2b 100644 --- a/packages/google-cloud-gke-multicloud/noxfile.py +++ b/packages/google-cloud-gke-multicloud/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_attached_clusters.py b/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_attached_clusters.py index 52aa423f8743..209aeb6dfd78 100644 --- a/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_attached_clusters.py +++ b/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_attached_clusters.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.gke_multicloud_v1.services.attached_clusters import ( AttachedClustersAsyncClient, @@ -987,10 +987,9 @@ def test_attached_clusters_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1034,9 @@ def test_attached_clusters_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1074,10 +1072,9 @@ def test_attached_clusters_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1329,9 +1326,7 @@ def test_attached_clusters_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2547,9 +2542,9 @@ def test_get_attached_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_attached_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_attached_cluster] = ( + mock_rpc + ) request = {} client.get_attached_cluster(request) @@ -2910,9 +2905,9 @@ def test_list_attached_clusters_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_attached_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_attached_clusters] = ( + mock_rpc + ) request = {} client.list_attached_clusters(request) @@ -5367,9 +5362,9 @@ def test_get_attached_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_attached_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_attached_cluster] = ( + mock_rpc + ) request = {} client.get_attached_cluster(request) @@ -5552,9 +5547,9 @@ def test_list_attached_clusters_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_attached_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_attached_clusters] = ( + mock_rpc + ) request = {} client.list_attached_clusters(request) diff --git a/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_aws_clusters.py b/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_aws_clusters.py index 1d961a8518ad..19252ac05d7c 100644 --- a/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_aws_clusters.py +++ b/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_aws_clusters.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.gke_multicloud_v1.services.aws_clusters import ( AwsClustersAsyncClient, @@ -939,10 +939,9 @@ def test_aws_clusters_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -987,10 +986,9 @@ def test_aws_clusters_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1024,9 @@ def test_aws_clusters_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1262,9 +1259,7 @@ def test_aws_clusters_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1376,9 +1371,9 @@ def test_create_aws_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_aws_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_aws_cluster] = ( + mock_rpc + ) request = {} client.create_aws_cluster(request) @@ -1737,9 +1732,9 @@ def test_update_aws_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_aws_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_aws_cluster] = ( + mock_rpc + ) request = {} client.update_aws_cluster(request) @@ -2450,9 +2445,9 @@ def test_list_aws_clusters_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_aws_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_aws_clusters] = ( + mock_rpc + ) request = {} client.list_aws_clusters(request) @@ -2992,9 +2987,9 @@ def test_delete_aws_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_aws_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_aws_cluster] = ( + mock_rpc + ) request = {} client.delete_aws_cluster(request) @@ -3879,9 +3874,9 @@ def test_create_aws_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_aws_node_pool] = ( + mock_rpc + ) request = {} client.create_aws_node_pool(request) @@ -4240,9 +4235,9 @@ def test_update_aws_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_aws_node_pool] = ( + mock_rpc + ) request = {} client.update_aws_node_pool(request) @@ -4955,9 +4950,9 @@ def test_get_aws_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_node_pool] = ( + mock_rpc + ) request = {} client.get_aws_node_pool(request) @@ -5310,9 +5305,9 @@ def test_list_aws_node_pools_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_aws_node_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_aws_node_pools] = ( + mock_rpc + ) request = {} client.list_aws_node_pools(request) @@ -5852,9 +5847,9 @@ def test_delete_aws_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_aws_node_pool] = ( + mock_rpc + ) request = {} client.delete_aws_node_pool(request) @@ -6217,9 +6212,9 @@ def test_get_aws_open_id_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_open_id_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_open_id_config] = ( + mock_rpc + ) request = {} client.get_aws_open_id_config(request) @@ -6486,9 +6481,9 @@ def test_get_aws_json_web_keys_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_json_web_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_json_web_keys] = ( + mock_rpc + ) request = {} client.get_aws_json_web_keys(request) @@ -6741,9 +6736,9 @@ def test_get_aws_server_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_server_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_server_config] = ( + mock_rpc + ) request = {} client.get_aws_server_config(request) @@ -7016,9 +7011,9 @@ def test_create_aws_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_aws_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_aws_cluster] = ( + mock_rpc + ) request = {} client.create_aws_cluster(request) @@ -7235,9 +7230,9 @@ def test_update_aws_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_aws_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_aws_cluster] = ( + mock_rpc + ) request = {} client.update_aws_cluster(request) @@ -7616,9 +7611,9 @@ def test_list_aws_clusters_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_aws_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_aws_clusters] = ( + mock_rpc + ) request = {} client.list_aws_clusters(request) @@ -7876,9 +7871,9 @@ def test_delete_aws_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_aws_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_aws_cluster] = ( + mock_rpc + ) request = {} client.delete_aws_cluster(request) @@ -8355,9 +8350,9 @@ def test_create_aws_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_aws_node_pool] = ( + mock_rpc + ) request = {} client.create_aws_node_pool(request) @@ -8576,9 +8571,9 @@ def test_update_aws_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_aws_node_pool] = ( + mock_rpc + ) request = {} client.update_aws_node_pool(request) @@ -8964,9 +8959,9 @@ def test_get_aws_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_node_pool] = ( + mock_rpc + ) request = {} client.get_aws_node_pool(request) @@ -9148,9 +9143,9 @@ def test_list_aws_node_pools_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_aws_node_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_aws_node_pools] = ( + mock_rpc + ) request = {} client.list_aws_node_pools(request) @@ -9412,9 +9407,9 @@ def test_delete_aws_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_aws_node_pool] = ( + mock_rpc + ) request = {} client.delete_aws_node_pool(request) @@ -9615,9 +9610,9 @@ def test_get_aws_open_id_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_open_id_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_open_id_config] = ( + mock_rpc + ) request = {} client.get_aws_open_id_config(request) @@ -9740,9 +9735,9 @@ def test_get_aws_json_web_keys_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_json_web_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_json_web_keys] = ( + mock_rpc + ) request = {} client.get_aws_json_web_keys(request) @@ -9865,9 +9860,9 @@ def test_get_aws_server_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_server_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_server_config] = ( + mock_rpc + ) request = {} client.get_aws_server_config(request) diff --git a/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_azure_clusters.py b/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_azure_clusters.py index b3fc555b2b0f..a7fa8d393eb5 100644 --- a/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_azure_clusters.py +++ b/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_azure_clusters.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.gke_multicloud_v1.services.azure_clusters import ( AzureClustersAsyncClient, @@ -958,10 +958,9 @@ def test_azure_clusters_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1005,9 @@ def test_azure_clusters_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1043,9 @@ def test_azure_clusters_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1295,9 +1292,7 @@ def test_azure_clusters_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1409,9 +1404,9 @@ def test_create_azure_client_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_azure_client - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_azure_client] = ( + mock_rpc + ) request = {} client.create_azure_client(request) @@ -1781,9 +1776,9 @@ def test_get_azure_client_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_azure_client - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_azure_client] = ( + mock_rpc + ) request = {} client.get_azure_client(request) @@ -2124,9 +2119,9 @@ def test_list_azure_clients_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_azure_clients - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_azure_clients] = ( + mock_rpc + ) request = {} client.list_azure_clients(request) @@ -2664,9 +2659,9 @@ def test_delete_azure_client_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_azure_client - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_azure_client] = ( + mock_rpc + ) request = {} client.delete_azure_client(request) @@ -3011,9 +3006,9 @@ def test_create_azure_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_azure_cluster] = ( + mock_rpc + ) request = {} client.create_azure_cluster(request) @@ -3373,9 +3368,9 @@ def test_update_azure_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_azure_cluster] = ( + mock_rpc + ) request = {} client.update_azure_cluster(request) @@ -3750,9 +3745,9 @@ def test_get_azure_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_azure_cluster] = ( + mock_rpc + ) request = {} client.get_azure_cluster(request) @@ -4113,9 +4108,9 @@ def test_list_azure_clusters_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_azure_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_azure_clusters] = ( + mock_rpc + ) request = {} client.list_azure_clusters(request) @@ -4655,9 +4650,9 @@ def test_delete_azure_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_azure_cluster] = ( + mock_rpc + ) request = {} client.delete_azure_cluster(request) @@ -5544,9 +5539,9 @@ def test_create_azure_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_azure_node_pool] = ( + mock_rpc + ) request = {} client.create_azure_node_pool(request) @@ -5907,9 +5902,9 @@ def test_update_azure_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_azure_node_pool] = ( + mock_rpc + ) request = {} client.update_azure_node_pool(request) @@ -6280,9 +6275,9 @@ def test_get_azure_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_azure_node_pool] = ( + mock_rpc + ) request = {} client.get_azure_node_pool(request) @@ -6638,9 +6633,9 @@ def test_list_azure_node_pools_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_azure_node_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_azure_node_pools] = ( + mock_rpc + ) request = {} client.list_azure_node_pools(request) @@ -7182,9 +7177,9 @@ def test_delete_azure_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_azure_node_pool] = ( + mock_rpc + ) request = {} client.delete_azure_node_pool(request) @@ -8522,9 +8517,9 @@ def test_create_azure_client_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_azure_client - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_azure_client] = ( + mock_rpc + ) request = {} client.create_azure_client(request) @@ -8739,9 +8734,9 @@ def test_get_azure_client_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_azure_client - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_azure_client] = ( + mock_rpc + ) request = {} client.get_azure_client(request) @@ -8923,9 +8918,9 @@ def test_list_azure_clients_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_azure_clients - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_azure_clients] = ( + mock_rpc + ) request = {} client.list_azure_clients(request) @@ -9183,9 +9178,9 @@ def test_delete_azure_client_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_azure_client - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_azure_client] = ( + mock_rpc + ) request = {} client.delete_azure_client(request) @@ -9381,9 +9376,9 @@ def test_create_azure_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_azure_cluster] = ( + mock_rpc + ) request = {} client.create_azure_cluster(request) @@ -9600,9 +9595,9 @@ def test_update_azure_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_azure_cluster] = ( + mock_rpc + ) request = {} client.update_azure_cluster(request) @@ -9801,9 +9796,9 @@ def test_get_azure_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_azure_cluster] = ( + mock_rpc + ) request = {} client.get_azure_cluster(request) @@ -9985,9 +9980,9 @@ def test_list_azure_clusters_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_azure_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_azure_clusters] = ( + mock_rpc + ) request = {} client.list_azure_clusters(request) @@ -10245,9 +10240,9 @@ def test_delete_azure_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_azure_cluster] = ( + mock_rpc + ) request = {} client.delete_azure_cluster(request) @@ -10727,9 +10722,9 @@ def test_create_azure_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_azure_node_pool] = ( + mock_rpc + ) request = {} client.create_azure_node_pool(request) @@ -10949,9 +10944,9 @@ def test_update_azure_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_azure_node_pool] = ( + mock_rpc + ) request = {} client.update_azure_node_pool(request) @@ -11152,9 +11147,9 @@ def test_get_azure_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_azure_node_pool] = ( + mock_rpc + ) request = {} client.get_azure_node_pool(request) @@ -11337,9 +11332,9 @@ def test_list_azure_node_pools_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_azure_node_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_azure_node_pools] = ( + mock_rpc + ) request = {} client.list_azure_node_pools(request) @@ -11602,9 +11597,9 @@ def test_delete_azure_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_azure_node_pool] = ( + mock_rpc + ) request = {} client.delete_azure_node_pool(request) diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/__init__.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/__init__.py index c7a229c69ffb..3f9797621309 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/__init__.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.gke_inference_quickstart import ( GkeInferenceQuickstartAsyncClient, GkeInferenceQuickstartClient, diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/async_client.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/async_client.py index 19182edb0c6c..4be7e915d76a 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/async_client.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkerecommender_v1 import gapic_version as package_version @@ -117,7 +117,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GkeInferenceQuickstartAsyncClient: The constructed client. """ - return GkeInferenceQuickstartClient.from_service_account_info.__func__(GkeInferenceQuickstartAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GkeInferenceQuickstartClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GkeInferenceQuickstartAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -133,7 +136,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GkeInferenceQuickstartAsyncClient: The constructed client. """ - return GkeInferenceQuickstartClient.from_service_account_file.__func__(GkeInferenceQuickstartAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GkeInferenceQuickstartClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + GkeInferenceQuickstartAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -171,7 +179,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GkeInferenceQuickstartClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GkeInferenceQuickstartClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GkeInferenceQuickstartTransport: diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/client.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/client.py index 792c19e2b384..b45335526af0 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/client.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkerecommender_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class GkeInferenceQuickstartClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GkeInferenceQuickstartTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GkeInferenceQuickstartTransport]] _transport_registry["grpc"] = GkeInferenceQuickstartGrpcTransport _transport_registry["grpc_asyncio"] = GkeInferenceQuickstartGrpcAsyncIOTransport _transport_registry["rest"] = GkeInferenceQuickstartRestTransport @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GkeInferenceQuickstartClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GkeInferenceQuickstartClient._read_environment_variables() + ) self._client_cert_source = GkeInferenceQuickstartClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GkeInferenceQuickstartTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/pagers.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/pagers.py index 6a59cefc936c..219a75c319aa 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/pagers.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -457,7 +457,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -539,7 +539,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -615,7 +615,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/__init__.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/__init__.py index 4163ed5a0753..6629edb770d8 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/__init__.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GkeInferenceQuickstartTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GkeInferenceQuickstartTransport]] _transport_registry["grpc"] = GkeInferenceQuickstartGrpcTransport _transport_registry["grpc_asyncio"] = GkeInferenceQuickstartGrpcAsyncIOTransport _transport_registry["rest"] = GkeInferenceQuickstartRestTransport diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/base.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/base.py index 8fbe3b17984e..61d445d94263 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/base.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkerecommender_v1 import gapic_version as package_version from google.cloud.gkerecommender_v1.types import gkerecommender diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc.py index a7de081a7d1b..a7dafae89407 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.gkerecommender_v1.types import gkerecommender @@ -412,12 +412,12 @@ def fetch_model_server_versions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_model_server_versions" not in self._stubs: - self._stubs[ - "fetch_model_server_versions" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/FetchModelServerVersions", - request_serializer=gkerecommender.FetchModelServerVersionsRequest.serialize, - response_deserializer=gkerecommender.FetchModelServerVersionsResponse.deserialize, + self._stubs["fetch_model_server_versions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/FetchModelServerVersions", + request_serializer=gkerecommender.FetchModelServerVersionsRequest.serialize, + response_deserializer=gkerecommender.FetchModelServerVersionsResponse.deserialize, + ) ) return self._stubs["fetch_model_server_versions"] @@ -486,12 +486,12 @@ def generate_optimized_manifest( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_optimized_manifest" not in self._stubs: - self._stubs[ - "generate_optimized_manifest" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/GenerateOptimizedManifest", - request_serializer=gkerecommender.GenerateOptimizedManifestRequest.serialize, - response_deserializer=gkerecommender.GenerateOptimizedManifestResponse.deserialize, + self._stubs["generate_optimized_manifest"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/GenerateOptimizedManifest", + request_serializer=gkerecommender.GenerateOptimizedManifestRequest.serialize, + response_deserializer=gkerecommender.GenerateOptimizedManifestResponse.deserialize, + ) ) return self._stubs["generate_optimized_manifest"] diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc_asyncio.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc_asyncio.py index cfcb8a830400..4deac0db9bf6 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc_asyncio.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gkerecommender_v1.types import gkerecommender @@ -421,12 +421,12 @@ def fetch_model_server_versions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_model_server_versions" not in self._stubs: - self._stubs[ - "fetch_model_server_versions" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/FetchModelServerVersions", - request_serializer=gkerecommender.FetchModelServerVersionsRequest.serialize, - response_deserializer=gkerecommender.FetchModelServerVersionsResponse.deserialize, + self._stubs["fetch_model_server_versions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/FetchModelServerVersions", + request_serializer=gkerecommender.FetchModelServerVersionsRequest.serialize, + response_deserializer=gkerecommender.FetchModelServerVersionsResponse.deserialize, + ) ) return self._stubs["fetch_model_server_versions"] @@ -496,12 +496,12 @@ def generate_optimized_manifest( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_optimized_manifest" not in self._stubs: - self._stubs[ - "generate_optimized_manifest" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/GenerateOptimizedManifest", - request_serializer=gkerecommender.GenerateOptimizedManifestRequest.serialize, - response_deserializer=gkerecommender.GenerateOptimizedManifestResponse.deserialize, + self._stubs["generate_optimized_manifest"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/GenerateOptimizedManifest", + request_serializer=gkerecommender.GenerateOptimizedManifestRequest.serialize, + response_deserializer=gkerecommender.GenerateOptimizedManifestResponse.deserialize, + ) ) return self._stubs["generate_optimized_manifest"] diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/rest.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/rest.py index 179a7341a991..7034aaf3f34c 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/rest.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -583,9 +583,7 @@ def __call__( """ - http_options = ( - _BaseGkeInferenceQuickstartRestTransport._BaseFetchBenchmarkingData._get_http_options() - ) + http_options = _BaseGkeInferenceQuickstartRestTransport._BaseFetchBenchmarkingData._get_http_options() request, metadata = self._interceptor.pre_fetch_benchmarking_data( request, metadata @@ -740,9 +738,7 @@ def __call__( """ - http_options = ( - _BaseGkeInferenceQuickstartRestTransport._BaseFetchModels._get_http_options() - ) + http_options = _BaseGkeInferenceQuickstartRestTransport._BaseFetchModels._get_http_options() request, metadata = self._interceptor.pre_fetch_models(request, metadata) transcoded_request = _BaseGkeInferenceQuickstartRestTransport._BaseFetchModels._get_transcoded_request( @@ -890,9 +886,7 @@ def __call__( """ - http_options = ( - _BaseGkeInferenceQuickstartRestTransport._BaseFetchModelServers._get_http_options() - ) + http_options = _BaseGkeInferenceQuickstartRestTransport._BaseFetchModelServers._get_http_options() request, metadata = self._interceptor.pre_fetch_model_servers( request, metadata @@ -1045,9 +1039,7 @@ def __call__( """ - http_options = ( - _BaseGkeInferenceQuickstartRestTransport._BaseFetchModelServerVersions._get_http_options() - ) + http_options = _BaseGkeInferenceQuickstartRestTransport._BaseFetchModelServerVersions._get_http_options() request, metadata = self._interceptor.pre_fetch_model_server_versions( request, metadata @@ -1200,9 +1192,7 @@ def __call__( """ - http_options = ( - _BaseGkeInferenceQuickstartRestTransport._BaseFetchProfiles._get_http_options() - ) + http_options = _BaseGkeInferenceQuickstartRestTransport._BaseFetchProfiles._get_http_options() request, metadata = self._interceptor.pre_fetch_profiles(request, metadata) transcoded_request = _BaseGkeInferenceQuickstartRestTransport._BaseFetchProfiles._get_transcoded_request( @@ -1357,9 +1347,7 @@ def __call__( """ - http_options = ( - _BaseGkeInferenceQuickstartRestTransport._BaseGenerateOptimizedManifest._get_http_options() - ) + http_options = _BaseGkeInferenceQuickstartRestTransport._BaseGenerateOptimizedManifest._get_http_options() request, metadata = self._interceptor.pre_generate_optimized_manifest( request, metadata @@ -1499,7 +1487,9 @@ def fetch_model_server_versions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchModelServerVersions(self._session, self._host, self._interceptor) # type: ignore + return self._FetchModelServerVersions( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_profiles( @@ -1520,7 +1510,9 @@ def generate_optimized_manifest( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateOptimizedManifest(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateOptimizedManifest( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-gkerecommender/mypy.ini b/packages/google-cloud-gkerecommender/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-gkerecommender/mypy.ini +++ b/packages/google-cloud-gkerecommender/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-gkerecommender/noxfile.py b/packages/google-cloud-gkerecommender/noxfile.py index d6b8208e6fd9..6dd66badee3d 100644 --- a/packages/google-cloud-gkerecommender/noxfile.py +++ b/packages/google-cloud-gkerecommender/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-gkerecommender/tests/unit/gapic/gkerecommender_v1/test_gke_inference_quickstart.py b/packages/google-cloud-gkerecommender/tests/unit/gapic/gkerecommender_v1/test_gke_inference_quickstart.py index 3ef8ea194bfc..ebb9105db543 100644 --- a/packages/google-cloud-gkerecommender/tests/unit/gapic/gkerecommender_v1/test_gke_inference_quickstart.py +++ b/packages/google-cloud-gkerecommender/tests/unit/gapic/gkerecommender_v1/test_gke_inference_quickstart.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -998,10 +1003,9 @@ def test_gke_inference_quickstart_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1050,9 @@ def test_gke_inference_quickstart_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1088,9 @@ def test_gke_inference_quickstart_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1348,9 +1350,7 @@ def test_gke_inference_quickstart_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1842,9 +1842,9 @@ def test_fetch_model_servers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_model_servers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_model_servers] = ( + mock_rpc + ) request = {} client.fetch_model_servers(request) @@ -3433,9 +3433,9 @@ def test_fetch_model_servers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_model_servers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_model_servers] = ( + mock_rpc + ) request = {} client.fetch_model_servers(request) diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/__init__.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/__init__.py index e90740e2c6c0..74896d6dd80e 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/__init__.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.g_suite_add_ons import GSuiteAddOnsAsyncClient, GSuiteAddOnsClient from .types.gsuiteaddons import ( AddOns, diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/async_client.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/async_client.py index 1c4e7abfa771..5dfd67a0d294 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/async_client.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gsuiteaddons_v1 import gapic_version as package_version @@ -152,7 +152,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GSuiteAddOnsAsyncClient: The constructed client. """ - return GSuiteAddOnsClient.from_service_account_info.__func__(GSuiteAddOnsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GSuiteAddOnsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(GSuiteAddOnsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -168,7 +171,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GSuiteAddOnsAsyncClient: The constructed client. """ - return GSuiteAddOnsClient.from_service_account_file.__func__(GSuiteAddOnsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GSuiteAddOnsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(GSuiteAddOnsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/client.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/client.py index 349087fd997a..17893d449cef 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/client.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gsuiteaddons_v1 import gapic_version as package_version @@ -687,11 +687,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GSuiteAddOnsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GSuiteAddOnsClient._read_environment_variables() + ) self._client_cert_source = GSuiteAddOnsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -726,8 +724,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GSuiteAddOnsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/pagers.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/pagers.py index aa33b2daa13b..f8b453262436 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/pagers.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/base.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/base.py index e6caced07a9d..5aab5b8f99f7 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/base.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.gsuiteaddons_v1 import gapic_version as package_version from google.cloud.gsuiteaddons_v1.types import gsuiteaddons diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc.py index e8ffc33de185..60b937b7b5d2 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.gsuiteaddons_v1.types import gsuiteaddons diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc_asyncio.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc_asyncio.py index 301076170b84..a2bf53a09f88 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc_asyncio.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gsuiteaddons_v1.types import gsuiteaddons diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest.py index 4ae60789ab3d..3367d453a79e 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.gsuiteaddons_v1.types import gsuiteaddons @@ -1350,9 +1350,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGSuiteAddOnsRestTransport._BaseInstallDeployment._get_http_options() - ) + http_options = _BaseGSuiteAddOnsRestTransport._BaseInstallDeployment._get_http_options() request, metadata = self._interceptor.pre_install_deployment( request, metadata @@ -1618,9 +1616,7 @@ def __call__( A Google Workspace add-on deployment """ - http_options = ( - _BaseGSuiteAddOnsRestTransport._BaseReplaceDeployment._get_http_options() - ) + http_options = _BaseGSuiteAddOnsRestTransport._BaseReplaceDeployment._get_http_options() request, metadata = self._interceptor.pre_replace_deployment( request, metadata @@ -1767,9 +1763,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGSuiteAddOnsRestTransport._BaseUninstallDeployment._get_http_options() - ) + http_options = _BaseGSuiteAddOnsRestTransport._BaseUninstallDeployment._get_http_options() request, metadata = self._interceptor.pre_uninstall_deployment( request, metadata diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest_base.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest_base.py index c888fd052588..42020c231045 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest_base.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.gsuiteaddons_v1.types import gsuiteaddons diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/types/gsuiteaddons.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/types/gsuiteaddons.py index 9dd458471327..af528a40d40f 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/types/gsuiteaddons.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/types/gsuiteaddons.py @@ -17,6 +17,8 @@ from typing import MutableMapping, MutableSequence +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import proto # type: ignore from google.apps.script.type.calendar.types import calendar_addon_manifest from google.apps.script.type.docs.types import docs_addon_manifest from google.apps.script.type.drive.types import drive_addon_manifest @@ -24,8 +26,6 @@ from google.apps.script.type.sheets.types import sheets_addon_manifest from google.apps.script.type.slides.types import slides_addon_manifest from google.apps.script.type.types import script_manifest -import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore -import proto # type: ignore __protobuf__ = proto.module( package="google.cloud.gsuiteaddons.v1", diff --git a/packages/google-cloud-gsuiteaddons/mypy.ini b/packages/google-cloud-gsuiteaddons/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-gsuiteaddons/mypy.ini +++ b/packages/google-cloud-gsuiteaddons/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-gsuiteaddons/noxfile.py b/packages/google-cloud-gsuiteaddons/noxfile.py index 6c7f062dd778..349770e0cf25 100644 --- a/packages/google-cloud-gsuiteaddons/noxfile.py +++ b/packages/google-cloud-gsuiteaddons/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-gsuiteaddons/tests/unit/gapic/gsuiteaddons_v1/test_g_suite_add_ons.py b/packages/google-cloud-gsuiteaddons/tests/unit/gapic/gsuiteaddons_v1/test_g_suite_add_ons.py index 1b4f35cd9aa9..c7180a6bbba6 100644 --- a/packages/google-cloud-gsuiteaddons/tests/unit/gapic/gsuiteaddons_v1/test_g_suite_add_ons.py +++ b/packages/google-cloud-gsuiteaddons/tests/unit/gapic/gsuiteaddons_v1/test_g_suite_add_ons.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,8 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries from google.apps.script.type.calendar.types import calendar_addon_manifest @@ -58,12 +66,9 @@ extension_point, script_manifest, ) -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.struct_pb2 as struct_pb2 # type: ignore -import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.cloud.gsuiteaddons_v1.services.g_suite_add_ons import ( GSuiteAddOnsAsyncClient, @@ -939,10 +944,9 @@ def test_g_suite_add_ons_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -987,10 +991,9 @@ def test_g_suite_add_ons_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1029,9 @@ def test_g_suite_add_ons_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1272,9 +1274,7 @@ def test_g_suite_add_ons_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1389,9 +1389,9 @@ def test_get_authorization_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_authorization - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_authorization] = ( + mock_rpc + ) request = {} client.get_authorization(request) @@ -1738,9 +1738,9 @@ def test_create_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deployment] = ( + mock_rpc + ) request = {} client.create_deployment(request) @@ -2103,9 +2103,9 @@ def test_replace_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.replace_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.replace_deployment] = ( + mock_rpc + ) request = {} client.replace_deployment(request) @@ -2775,9 +2775,9 @@ def test_list_deployments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -3297,9 +3297,9 @@ def test_delete_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deployment] = ( + mock_rpc + ) request = {} client.delete_deployment(request) @@ -3626,9 +3626,9 @@ def test_install_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.install_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.install_deployment] = ( + mock_rpc + ) request = {} client.install_deployment(request) @@ -3955,9 +3955,9 @@ def test_uninstall_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.uninstall_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.uninstall_deployment] = ( + mock_rpc + ) request = {} client.uninstall_deployment(request) @@ -4288,9 +4288,9 @@ def test_get_install_status_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_install_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_install_status] = ( + mock_rpc + ) request = {} client.get_install_status(request) @@ -4559,9 +4559,9 @@ def test_get_authorization_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_authorization - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_authorization] = ( + mock_rpc + ) request = {} client.get_authorization(request) @@ -4737,9 +4737,9 @@ def test_create_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deployment] = ( + mock_rpc + ) request = {} client.create_deployment(request) @@ -4946,9 +4946,9 @@ def test_replace_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.replace_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.replace_deployment] = ( + mock_rpc + ) request = {} client.replace_deployment(request) @@ -5299,9 +5299,9 @@ def test_list_deployments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -5555,9 +5555,9 @@ def test_delete_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deployment] = ( + mock_rpc + ) request = {} client.delete_deployment(request) @@ -5732,9 +5732,9 @@ def test_install_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.install_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.install_deployment] = ( + mock_rpc + ) request = {} client.install_deployment(request) @@ -5909,9 +5909,9 @@ def test_uninstall_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.uninstall_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.uninstall_deployment] = ( + mock_rpc + ) request = {} client.uninstall_deployment(request) @@ -6086,9 +6086,9 @@ def test_get_install_status_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_install_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_install_status] = ( + mock_rpc + ) request = {} client.get_install_status(request) diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/__init__.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/__init__.py index f8799b13db32..1146c7e968b0 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/__init__.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.hypercompute_cluster import ( HypercomputeClusterAsyncClient, HypercomputeClusterClient, diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/async_client.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/async_client.py index 27f682eacaf8..3f43b04df27e 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/async_client.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.hypercomputecluster_v1beta import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.hypercomputecluster_v1beta.services.hypercompute_cluster import pagers from google.cloud.hypercomputecluster_v1beta.types import ( @@ -152,7 +152,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: HypercomputeClusterAsyncClient: The constructed client. """ - return HypercomputeClusterClient.from_service_account_info.__func__(HypercomputeClusterAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + HypercomputeClusterClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(HypercomputeClusterAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -168,7 +171,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: HypercomputeClusterAsyncClient: The constructed client. """ - return HypercomputeClusterClient.from_service_account_file.__func__(HypercomputeClusterAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + HypercomputeClusterClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(HypercomputeClusterAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -206,7 +212,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return HypercomputeClusterClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return HypercomputeClusterClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> HypercomputeClusterTransport: diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/client.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/client.py index 9a32a0d009a0..1208e3c0e0aa 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/client.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.hypercomputecluster_v1beta import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.hypercomputecluster_v1beta.services.hypercompute_cluster import pagers from google.cloud.hypercomputecluster_v1beta.types import ( @@ -89,9 +89,7 @@ class HypercomputeClusterClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[HypercomputeClusterTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[HypercomputeClusterTransport]] _transport_registry["grpc"] = HypercomputeClusterGrpcTransport _transport_registry["grpc_asyncio"] = HypercomputeClusterGrpcAsyncIOTransport _transport_registry["rest"] = HypercomputeClusterRestTransport @@ -803,11 +801,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = HypercomputeClusterClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + HypercomputeClusterClient._read_environment_variables() + ) self._client_cert_source = HypercomputeClusterClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -842,8 +838,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(HypercomputeClusterTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/pagers.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/pagers.py index de194ed12f13..7efecac38899 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/pagers.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/__init__.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/__init__.py index 4b149df54077..10f56f362bc3 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/__init__.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import HypercomputeClusterRestInterceptor, HypercomputeClusterRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[HypercomputeClusterTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[HypercomputeClusterTransport]] _transport_registry["grpc"] = HypercomputeClusterGrpcTransport _transport_registry["grpc_asyncio"] = HypercomputeClusterGrpcAsyncIOTransport _transport_registry["rest"] = HypercomputeClusterRestTransport diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/base.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/base.py index f44ace4d8e67..82d119d4dcff 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/base.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.hypercomputecluster_v1beta import gapic_version as package_version from google.cloud.hypercomputecluster_v1beta.types import hypercompute_cluster @@ -299,13 +299,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc.py index 243b0ac19aca..ef7e2588bd28 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.hypercomputecluster_v1beta.types import hypercompute_cluster diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc_asyncio.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc_asyncio.py index c1c4168c3425..dd358f58de24 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc_asyncio.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.hypercomputecluster_v1beta.types import hypercompute_cluster diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/rest.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/rest.py index 1dbeac116566..000598d31420 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/rest.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -715,9 +715,7 @@ def __call__( """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseCreateCluster._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseCreateCluster._get_http_options() request, metadata = self._interceptor.pre_create_cluster(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseCreateCluster._get_transcoded_request( @@ -867,9 +865,7 @@ def __call__( """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseDeleteCluster._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseDeleteCluster._get_http_options() request, metadata = self._interceptor.pre_delete_cluster(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseDeleteCluster._get_transcoded_request( @@ -1023,9 +1019,7 @@ def __call__( """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseGetCluster._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseGetCluster._get_http_options() request, metadata = self._interceptor.pre_get_cluster(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseGetCluster._get_transcoded_request( @@ -1171,9 +1165,7 @@ def __call__( """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseListClusters._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseListClusters._get_http_options() request, metadata = self._interceptor.pre_list_clusters(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseListClusters._get_transcoded_request( @@ -1323,9 +1315,7 @@ def __call__( """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseUpdateCluster._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseUpdateCluster._get_http_options() request, metadata = self._interceptor.pre_update_cluster(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseUpdateCluster._get_transcoded_request( @@ -1525,9 +1515,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseGetLocation._get_transcoded_request( @@ -1666,9 +1654,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseListLocations._get_transcoded_request( @@ -1805,9 +1791,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1925,9 +1909,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2043,9 +2025,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseGetOperation._get_transcoded_request( @@ -2184,9 +2164,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/__init__.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/__init__.py index 9678a03165f3..6a4ac8ffc639 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/__init__.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/__init__.py @@ -56,7 +56,9 @@ StorageResourceConfig, UpdateClusterRequest, ) -from .operation_metadata import OperationMetadata +from .operation_metadata import ( + OperationMetadata, +) __all__ = ( "BootDisk", diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/hypercompute_cluster.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/hypercompute_cluster.py index 12e832451a8e..5be1e7fab67d 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/hypercompute_cluster.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/hypercompute_cluster.py @@ -778,6 +778,7 @@ class Tier(proto.Enum): mission-critical, high-performance computing workloads. """ + TIER_UNSPECIFIED = 0 ZONAL = 4 REGIONAL = 6 @@ -793,6 +794,7 @@ class Protocol(proto.Enum): NFSV41 (2): NFS 4.1. """ + PROTOCOL_UNSPECIFIED = 0 NFSV3 = 1 NFSV41 = 2 @@ -921,6 +923,7 @@ class `__ for Lowest-cost storage for data archiving, online backup, and disaster recovery. """ + STORAGE_CLASS_UNSPECIFIED = 0 STANDARD = 1 NEARLINE = 2 @@ -969,6 +972,7 @@ class TerminalStorageClass(proto.Enum): TERMINAL_STORAGE_CLASS_UNSPECIFIED (0): Unspecified terminal storage class """ + TERMINAL_STORAGE_CLASS_UNSPECIFIED = 0 enabled: bool = proto.Field( diff --git a/packages/google-cloud-hypercomputecluster/mypy.ini b/packages/google-cloud-hypercomputecluster/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-hypercomputecluster/mypy.ini +++ b/packages/google-cloud-hypercomputecluster/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-hypercomputecluster/noxfile.py b/packages/google-cloud-hypercomputecluster/noxfile.py index c000e757b3c6..f28ebe34f3e3 100644 --- a/packages/google-cloud-hypercomputecluster/noxfile.py +++ b/packages/google-cloud-hypercomputecluster/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-hypercomputecluster/tests/unit/gapic/hypercomputecluster_v1beta/test_hypercompute_cluster.py b/packages/google-cloud-hypercomputecluster/tests/unit/gapic/hypercomputecluster_v1beta/test_hypercompute_cluster.py index b6676f9082fe..1afadc12f5eb 100644 --- a/packages/google-cloud-hypercomputecluster/tests/unit/gapic/hypercomputecluster_v1beta/test_hypercompute_cluster.py +++ b/packages/google-cloud-hypercomputecluster/tests/unit/gapic/hypercomputecluster_v1beta/test_hypercompute_cluster.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.empty_pb2 as empty_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 google.cloud.hypercomputecluster_v1beta.services.hypercompute_cluster import ( HypercomputeClusterAsyncClient, @@ -1010,10 +1010,9 @@ def test_hypercompute_cluster_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1057,9 @@ def test_hypercompute_cluster_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1097,10 +1095,9 @@ def test_hypercompute_cluster_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1360,9 +1357,7 @@ def test_hypercompute_cluster_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/__init__.py b/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/__init__.py index c0b55d857c66..55b5a79ed152 100644 --- a/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/__init__.py +++ b/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.audit_data import AuditData if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/types/__init__.py b/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/types/__init__.py index 4392ad6079da..5b55739307e2 100644 --- a/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/types/__init__.py +++ b/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/types/__init__.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .audit_data import AuditData +from .audit_data import ( + AuditData, +) __all__ = ("AuditData",) diff --git a/packages/google-cloud-iam-logging/mypy.ini b/packages/google-cloud-iam-logging/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-iam-logging/mypy.ini +++ b/packages/google-cloud-iam-logging/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-iam-logging/noxfile.py b/packages/google-cloud-iam-logging/noxfile.py index 8152b5ef7342..8413c5068d45 100644 --- a/packages/google-cloud-iam-logging/noxfile.py +++ b/packages/google-cloud-iam-logging/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/__init__.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/__init__.py index 1fe269ddafb4..894b005dd625 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.iam import IAMAsyncClient, IAMClient from .types.audit_data import AuditData from .types.iam import ( diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/async_client.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/async_client.py index ace4214c2e27..d4c79293b96c 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_admin_v1 import gapic_version as package_version @@ -140,7 +140,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IAMAsyncClient: The constructed client. """ - return IAMClient.from_service_account_info.__func__(IAMAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + IAMClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(IAMAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -156,7 +159,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IAMAsyncClient: The constructed client. """ - return IAMClient.from_service_account_file.__func__(IAMAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + IAMClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(IAMAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/client.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/client.py index c58bbe3e8368..5f0e25a4e1d3 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_admin_v1 import gapic_version as package_version @@ -670,11 +670,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IAMClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IAMClient._read_environment_variables() + ) self._client_cert_source = IAMClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -709,8 +707,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IAMTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/pagers.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/pagers.py index 7e0803d9bf67..3cd5d2791b71 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/pagers.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/base.py index 19900b937172..a10c812f43ea 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core -from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1 -from google.api_core import retry as retries import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore import google.protobuf import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials # type: ignore +from google.oauth2 import service_account # type: ignore from google.cloud.iam_admin_v1 import gapic_version as package_version from google.cloud.iam_admin_v1.types import iam diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc.py index 65cc22064d45..c2b79256b946 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.iam_admin_v1.types import iam @@ -727,12 +727,12 @@ def create_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_account_key" not in self._stubs: - self._stubs[ - "create_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/CreateServiceAccountKey", - request_serializer=iam.CreateServiceAccountKeyRequest.serialize, - response_deserializer=iam.ServiceAccountKey.deserialize, + self._stubs["create_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/CreateServiceAccountKey", + request_serializer=iam.CreateServiceAccountKeyRequest.serialize, + response_deserializer=iam.ServiceAccountKey.deserialize, + ) ) return self._stubs["create_service_account_key"] @@ -760,12 +760,12 @@ def upload_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "upload_service_account_key" not in self._stubs: - self._stubs[ - "upload_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/UploadServiceAccountKey", - request_serializer=iam.UploadServiceAccountKeyRequest.serialize, - response_deserializer=iam.ServiceAccountKey.deserialize, + self._stubs["upload_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/UploadServiceAccountKey", + request_serializer=iam.UploadServiceAccountKeyRequest.serialize, + response_deserializer=iam.ServiceAccountKey.deserialize, + ) ) return self._stubs["upload_service_account_key"] @@ -792,12 +792,12 @@ def delete_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_account_key" not in self._stubs: - self._stubs[ - "delete_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/DeleteServiceAccountKey", - request_serializer=iam.DeleteServiceAccountKeyRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/DeleteServiceAccountKey", + request_serializer=iam.DeleteServiceAccountKeyRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_service_account_key"] @@ -823,12 +823,12 @@ def disable_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_service_account_key" not in self._stubs: - self._stubs[ - "disable_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/DisableServiceAccountKey", - request_serializer=iam.DisableServiceAccountKeyRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["disable_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/DisableServiceAccountKey", + request_serializer=iam.DisableServiceAccountKeyRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["disable_service_account_key"] @@ -852,12 +852,12 @@ def enable_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_service_account_key" not in self._stubs: - self._stubs[ - "enable_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/EnableServiceAccountKey", - request_serializer=iam.EnableServiceAccountKeyRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["enable_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/EnableServiceAccountKey", + request_serializer=iam.EnableServiceAccountKeyRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["enable_service_account_key"] @@ -1257,12 +1257,12 @@ def query_testable_permissions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_testable_permissions" not in self._stubs: - self._stubs[ - "query_testable_permissions" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/QueryTestablePermissions", - request_serializer=iam.QueryTestablePermissionsRequest.serialize, - response_deserializer=iam.QueryTestablePermissionsResponse.deserialize, + self._stubs["query_testable_permissions"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/QueryTestablePermissions", + request_serializer=iam.QueryTestablePermissionsRequest.serialize, + response_deserializer=iam.QueryTestablePermissionsResponse.deserialize, + ) ) return self._stubs["query_testable_permissions"] diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc_asyncio.py index ea343614e77c..6345576ee1dc 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc_asyncio.py @@ -17,22 +17,22 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_admin_v1.types import iam @@ -741,12 +741,12 @@ def create_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_account_key" not in self._stubs: - self._stubs[ - "create_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/CreateServiceAccountKey", - request_serializer=iam.CreateServiceAccountKeyRequest.serialize, - response_deserializer=iam.ServiceAccountKey.deserialize, + self._stubs["create_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/CreateServiceAccountKey", + request_serializer=iam.CreateServiceAccountKeyRequest.serialize, + response_deserializer=iam.ServiceAccountKey.deserialize, + ) ) return self._stubs["create_service_account_key"] @@ -776,12 +776,12 @@ def upload_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "upload_service_account_key" not in self._stubs: - self._stubs[ - "upload_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/UploadServiceAccountKey", - request_serializer=iam.UploadServiceAccountKeyRequest.serialize, - response_deserializer=iam.ServiceAccountKey.deserialize, + self._stubs["upload_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/UploadServiceAccountKey", + request_serializer=iam.UploadServiceAccountKeyRequest.serialize, + response_deserializer=iam.ServiceAccountKey.deserialize, + ) ) return self._stubs["upload_service_account_key"] @@ -808,12 +808,12 @@ def delete_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_account_key" not in self._stubs: - self._stubs[ - "delete_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/DeleteServiceAccountKey", - request_serializer=iam.DeleteServiceAccountKeyRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/DeleteServiceAccountKey", + request_serializer=iam.DeleteServiceAccountKeyRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_service_account_key"] @@ -839,12 +839,12 @@ def disable_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_service_account_key" not in self._stubs: - self._stubs[ - "disable_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/DisableServiceAccountKey", - request_serializer=iam.DisableServiceAccountKeyRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["disable_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/DisableServiceAccountKey", + request_serializer=iam.DisableServiceAccountKeyRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["disable_service_account_key"] @@ -868,12 +868,12 @@ def enable_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_service_account_key" not in self._stubs: - self._stubs[ - "enable_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/EnableServiceAccountKey", - request_serializer=iam.EnableServiceAccountKeyRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["enable_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/EnableServiceAccountKey", + request_serializer=iam.EnableServiceAccountKeyRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["enable_service_account_key"] @@ -1282,12 +1282,12 @@ def query_testable_permissions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_testable_permissions" not in self._stubs: - self._stubs[ - "query_testable_permissions" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/QueryTestablePermissions", - request_serializer=iam.QueryTestablePermissionsRequest.serialize, - response_deserializer=iam.QueryTestablePermissionsResponse.deserialize, + self._stubs["query_testable_permissions"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/QueryTestablePermissions", + request_serializer=iam.QueryTestablePermissionsRequest.serialize, + response_deserializer=iam.QueryTestablePermissionsResponse.deserialize, + ) ) return self._stubs["query_testable_permissions"] diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/__init__.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/__init__.py index 381706689641..63688b8fba35 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .audit_data import AuditData +from .audit_data import ( + AuditData, +) from .iam import ( CreateRoleRequest, CreateServiceAccountKeyRequest, diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/iam.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/iam.py index 591dae3aa382..135de6166498 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/iam.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/iam.py @@ -87,6 +87,7 @@ class ServiceAccountKeyAlgorithm(proto.Enum): KEY_ALG_RSA_2048 (2): 2k RSA Key. """ + KEY_ALG_UNSPECIFIED = 0 KEY_ALG_RSA_1024 = 1 KEY_ALG_RSA_2048 = 2 @@ -105,6 +106,7 @@ class ServiceAccountPrivateKeyType(proto.Enum): TYPE_GOOGLE_CREDENTIALS_FILE (2): Google Credentials File format. """ + TYPE_UNSPECIFIED = 0 TYPE_PKCS12_FILE = 1 TYPE_GOOGLE_CREDENTIALS_FILE = 2 @@ -121,6 +123,7 @@ class ServiceAccountPublicKeyType(proto.Enum): TYPE_RAW_PUBLIC_KEY (2): Raw public key. """ + TYPE_NONE = 0 TYPE_X509_PEM_FILE = 1 TYPE_RAW_PUBLIC_KEY = 2 @@ -137,6 +140,7 @@ class ServiceAccountKeyOrigin(proto.Enum): GOOGLE_PROVIDED (2): Key is provided by Google. """ + ORIGIN_UNSPECIFIED = 0 USER_PROVIDED = 1 GOOGLE_PROVIDED = 2 @@ -152,6 +156,7 @@ class RoleView(proto.Enum): FULL (1): Returns all fields. """ + BASIC = 0 FULL = 1 @@ -532,6 +537,7 @@ class KeyType(proto.Enum): System-managed keys (managed and rotated by Google). """ + KEY_TYPE_UNSPECIFIED = 0 USER_MANAGED = 1 SYSTEM_MANAGED = 2 @@ -1046,6 +1052,7 @@ class RoleLaunchStage(proto.Enum): The user has indicated this role is currently in an EAP phase. """ + ALPHA = 0 BETA = 1 GA = 2 @@ -1543,6 +1550,7 @@ class PermissionLaunchStage(proto.Enum): DEPRECATED (3): The permission is being deprecated. """ + ALPHA = 0 BETA = 1 GA = 2 @@ -1562,6 +1570,7 @@ class CustomRolesSupportLevel(proto.Enum): Permission is not supported for custom role use. """ + SUPPORTED = 0 TESTING = 1 NOT_SUPPORTED = 2 @@ -1795,6 +1804,7 @@ class Level(proto.Enum): A validation unit which operates on an individual condition within a binding. """ + LEVEL_UNSPECIFIED = 0 CONDITION = 3 @@ -1835,6 +1845,7 @@ class Severity(proto.Enum): DEPRECATED (5): Deprecated severity level. """ + SEVERITY_UNSPECIFIED = 0 ERROR = 1 WARNING = 2 diff --git a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/__init__.py b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/__init__.py index 0e3d599a1571..0b8a079136b5 100644 --- a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.iam_credentials import IAMCredentialsAsyncClient, IAMCredentialsClient from .types.common import ( GenerateAccessTokenRequest, diff --git a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/async_client.py b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/async_client.py index 5cf2d0361e01..157a4c2fadc4 100644 --- a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_credentials_v1 import gapic_version as package_version @@ -127,7 +127,10 @@ 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): @@ -143,7 +146,10 @@ 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 diff --git a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/client.py b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/client.py index 60859ccf197f..d3d342308e38 100644 --- a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_credentials_v1 import gapic_version as package_version @@ -80,9 +80,7 @@ class IAMCredentialsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[IAMCredentialsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[IAMCredentialsTransport]] _transport_registry["grpc"] = IAMCredentialsGrpcTransport _transport_registry["grpc_asyncio"] = IAMCredentialsGrpcAsyncIOTransport _transport_registry["rest"] = IAMCredentialsRestTransport @@ -630,11 +628,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IAMCredentialsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IAMCredentialsClient._read_environment_variables() + ) self._client_cert_source = IAMCredentialsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -669,8 +665,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IAMCredentialsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/base.py index 047dd9b2ac98..3f110d50a81a 100644 --- a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_credentials_v1 import gapic_version as package_version from google.cloud.iam_credentials_v1.types import common diff --git a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc.py index c568c621265f..e3c505cdba44 100644 --- a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.iam_credentials_v1.types import common diff --git a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc_asyncio.py index ec99428d8341..c265affb206e 100644 --- a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_credentials_v1.types import common diff --git a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/rest.py b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/rest.py index d29607e7b521..923726aefacb 100644 --- a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/rest.py +++ b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -449,9 +449,7 @@ def __call__( """ - http_options = ( - _BaseIAMCredentialsRestTransport._BaseGenerateAccessToken._get_http_options() - ) + http_options = _BaseIAMCredentialsRestTransport._BaseGenerateAccessToken._get_http_options() request, metadata = self._interceptor.pre_generate_access_token( request, metadata @@ -603,9 +601,7 @@ def __call__( """ - http_options = ( - _BaseIAMCredentialsRestTransport._BaseGenerateIdToken._get_http_options() - ) + http_options = _BaseIAMCredentialsRestTransport._BaseGenerateIdToken._get_http_options() request, metadata = self._interceptor.pre_generate_id_token( request, metadata diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v2/__init__.py index 188188af59d2..7c2c753ecea2 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.policies import PoliciesAsyncClient, PoliciesClient from .types.deny import DenyRule from .types.policy import ( diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/async_client.py b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/async_client.py index 56fa7aedb7d0..6fa7fe2f7b3c 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v2 import gapic_version as package_version @@ -46,8 +46,8 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.iam_v2.services.policies import pagers from google.cloud.iam_v2.types import policy @@ -111,7 +111,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PoliciesAsyncClient: The constructed client. """ - return PoliciesClient.from_service_account_info.__func__(PoliciesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PoliciesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PoliciesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -127,7 +130,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PoliciesAsyncClient: The constructed client. """ - return PoliciesClient.from_service_account_file.__func__(PoliciesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PoliciesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PoliciesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/client.py b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/client.py index 40949f39dc5d..24532526e102 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v2 import gapic_version as package_version @@ -63,8 +63,8 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.iam_v2.services.policies import pagers from google.cloud.iam_v2.types import policy @@ -604,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PoliciesClient._read_environment_variables() + ) self._client_cert_source = PoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/pagers.py b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/pagers.py index 9fa46e7c5e83..7faccfbb9293 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/pagers.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/base.py index e6f2db3a7bcd..058a38866f4c 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v2 import gapic_version as package_version from google.cloud.iam_v2.types import policy diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc.py index e8db5583170f..3c5c312406b2 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.iam_v2.types import policy from google.cloud.iam_v2.types import policy as gi_policy diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc_asyncio.py index 16cffd0570dd..7074aeaa5624 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_v2.types import policy from google.cloud.iam_v2.types import policy as gi_policy diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/rest.py b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/rest.py index 3b8d04184362..b341cbecc3f9 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/rest.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/types/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v2/types/__init__.py index 962d7a696566..995b92b87cc9 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/types/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .deny import DenyRule +from .deny import ( + DenyRule, +) from .policy import ( CreatePolicyRequest, DeletePolicyRequest, diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/__init__.py index f3d09491ef2a..3776318f20c5 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.policies import PoliciesAsyncClient, PoliciesClient from .types.deny import DenyRule from .types.policy import ( diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/async_client.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/async_client.py index 121f1e2e5c76..f40a25ca5ff1 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v2beta import gapic_version as package_version @@ -46,8 +46,8 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.iam_v2beta.services.policies import pagers from google.cloud.iam_v2beta.types import policy @@ -111,7 +111,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PoliciesAsyncClient: The constructed client. """ - return PoliciesClient.from_service_account_info.__func__(PoliciesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PoliciesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PoliciesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -127,7 +130,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PoliciesAsyncClient: The constructed client. """ - return PoliciesClient.from_service_account_file.__func__(PoliciesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PoliciesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PoliciesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/client.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/client.py index 643673f77dad..f91d54658658 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v2beta import gapic_version as package_version @@ -63,8 +63,8 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.iam_v2beta.services.policies import pagers from google.cloud.iam_v2beta.types import policy @@ -602,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PoliciesClient._read_environment_variables() + ) self._client_cert_source = PoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/pagers.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/pagers.py index e75c2e525d26..0375f8c4fb42 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/pagers.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/base.py index bb0ba51d9cb4..5d6efea36657 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v2beta import gapic_version as package_version from google.cloud.iam_v2beta.types import policy diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc.py index d37d3d016821..f7e4c686964f 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.iam_v2beta.types import policy from google.cloud.iam_v2beta.types import policy as gi_policy diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc_asyncio.py index e16d9ebd5748..eb72ec35548d 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_v2beta.types import policy from google.cloud.iam_v2beta.types import policy as gi_policy diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/types/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/types/__init__.py index 962d7a696566..995b92b87cc9 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/types/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .deny import DenyRule +from .deny import ( + DenyRule, +) from .policy import ( CreatePolicyRequest, DeletePolicyRequest, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v3/__init__.py index 92ac785eba34..8ea1969e25a1 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.policy_bindings import PolicyBindingsAsyncClient, PolicyBindingsClient from .services.principal_access_boundary_policies import ( PrincipalAccessBoundaryPoliciesAsyncClient, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/async_client.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/async_client.py index 228decc32751..212aeaafd539 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3 import gapic_version as package_version @@ -46,12 +46,12 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.type.expr_pb2 as expr_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.iam_v3.services.policy_bindings import pagers from google.cloud.iam_v3.types import ( @@ -130,7 +130,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PolicyBindingsAsyncClient: The constructed client. """ - return PolicyBindingsClient.from_service_account_info.__func__(PolicyBindingsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PolicyBindingsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PolicyBindingsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +149,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PolicyBindingsAsyncClient: The constructed client. """ - return PolicyBindingsClient.from_service_account_file.__func__(PolicyBindingsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PolicyBindingsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PolicyBindingsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/client.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/client.py index 5e79060d0177..43868be62355 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3 import gapic_version as package_version @@ -63,12 +63,12 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.type.expr_pb2 as expr_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.iam_v3.services.policy_bindings import pagers from google.cloud.iam_v3.types import ( @@ -91,9 +91,7 @@ class PolicyBindingsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PolicyBindingsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PolicyBindingsTransport]] _transport_registry["grpc"] = PolicyBindingsGrpcTransport _transport_registry["grpc_asyncio"] = PolicyBindingsGrpcAsyncIOTransport _transport_registry["rest"] = PolicyBindingsRestTransport @@ -635,11 +633,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PolicyBindingsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PolicyBindingsClient._read_environment_variables() + ) self._client_cert_source = PolicyBindingsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -674,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PolicyBindingsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/pagers.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/pagers.py index 116100111687..7bcf1ad244a9 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/pagers.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/base.py index 40c70aa31639..adcfd2c81f5c 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3 import gapic_version as package_version from google.cloud.iam_v3.types import policy_binding_resources, policy_bindings_service diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc.py index 213b85c3c8c1..85c7ddeed506 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.iam_v3.types import policy_binding_resources, policy_bindings_service @@ -518,12 +518,12 @@ def search_target_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_target_policy_bindings" not in self._stubs: - self._stubs[ - "search_target_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PolicyBindings/SearchTargetPolicyBindings", - request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, - response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + self._stubs["search_target_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PolicyBindings/SearchTargetPolicyBindings", + request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, + response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_target_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc_asyncio.py index 5e09a4532702..66d20aa4a85f 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_v3.types import policy_binding_resources, policy_bindings_service @@ -529,12 +529,12 @@ def search_target_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_target_policy_bindings" not in self._stubs: - self._stubs[ - "search_target_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PolicyBindings/SearchTargetPolicyBindings", - request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, - response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + self._stubs["search_target_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PolicyBindings/SearchTargetPolicyBindings", + request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, + response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_target_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/rest.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/rest.py index 744fded99b0d..e98cedb36168 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/rest.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -647,9 +647,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseCreatePolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseCreatePolicyBinding._get_http_options() request, metadata = self._interceptor.pre_create_policy_binding( request, metadata @@ -801,9 +799,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseDeletePolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseDeletePolicyBinding._get_http_options() request, metadata = self._interceptor.pre_delete_policy_binding( request, metadata @@ -946,9 +942,7 @@ def __call__( IAM policy binding resource. """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseGetPolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseGetPolicyBinding._get_http_options() request, metadata = self._interceptor.pre_get_policy_binding( request, metadata @@ -1097,9 +1091,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseListPolicyBindings._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseListPolicyBindings._get_http_options() request, metadata = self._interceptor.pre_list_policy_bindings( request, metadata @@ -1252,9 +1244,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseSearchTargetPolicyBindings._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseSearchTargetPolicyBindings._get_http_options() request, metadata = self._interceptor.pre_search_target_policy_bindings( request, metadata @@ -1322,11 +1312,10 @@ def __call__( resp = self._interceptor.post_search_target_policy_bindings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_search_target_policy_bindings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_search_target_policy_bindings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1413,9 +1402,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseUpdatePolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseUpdatePolicyBinding._get_http_options() request, metadata = self._interceptor.pre_update_policy_binding( request, metadata @@ -1559,7 +1546,9 @@ def search_target_policy_bindings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SearchTargetPolicyBindings(self._session, self._host, self._interceptor) # type: ignore + return self._SearchTargetPolicyBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_policy_binding( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/async_client.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/async_client.py index 2aa80affd229..1f274821b6f0 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3 import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.iam_v3.services.principal_access_boundary_policies import pagers from google.cloud.iam_v3.types import ( @@ -149,7 +149,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PrincipalAccessBoundaryPoliciesAsyncClient: The constructed client. """ - return PrincipalAccessBoundaryPoliciesClient.from_service_account_info.__func__(PrincipalAccessBoundaryPoliciesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PrincipalAccessBoundaryPoliciesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + PrincipalAccessBoundaryPoliciesAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -165,7 +170,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PrincipalAccessBoundaryPoliciesAsyncClient: The constructed client. """ - return PrincipalAccessBoundaryPoliciesClient.from_service_account_file.__func__(PrincipalAccessBoundaryPoliciesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PrincipalAccessBoundaryPoliciesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + PrincipalAccessBoundaryPoliciesAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -203,7 +213,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return PrincipalAccessBoundaryPoliciesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return PrincipalAccessBoundaryPoliciesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> PrincipalAccessBoundaryPoliciesTransport: diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/client.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/client.py index ee475f0b20b5..e16af90c4b35 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3 import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.iam_v3.services.principal_access_boundary_policies import pagers from google.cloud.iam_v3.types import ( @@ -94,13 +94,11 @@ class PrincipalAccessBoundaryPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] _transport_registry["grpc"] = PrincipalAccessBoundaryPoliciesGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport + ) _transport_registry["rest"] = PrincipalAccessBoundaryPoliciesRestTransport def get_transport_class( @@ -674,11 +672,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PrincipalAccessBoundaryPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PrincipalAccessBoundaryPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( PrincipalAccessBoundaryPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -719,8 +715,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PrincipalAccessBoundaryPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/pagers.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/pagers.py index f0253da4d4de..90a6cf8b1ba5 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/pagers.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/pagers.py @@ -74,7 +74,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -165,7 +165,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -258,7 +258,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -345,7 +345,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/__init__.py index a61a05fb134f..572b487008f5 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/__init__.py @@ -25,13 +25,11 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] _transport_registry["grpc"] = PrincipalAccessBoundaryPoliciesGrpcTransport -_transport_registry[ - "grpc_asyncio" -] = PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport +_transport_registry["grpc_asyncio"] = ( + PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport +) _transport_registry["rest"] = PrincipalAccessBoundaryPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/base.py index bdb95b67b529..d44c8f935747 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3 import gapic_version as package_version from google.cloud.iam_v3.types import ( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc.py index bf68a5c96b22..b59bbff9a0d7 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.iam_v3.types import ( principal_access_boundary_policies_service, @@ -372,12 +372,12 @@ def create_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "create_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_principal_access_boundary_policy"] @@ -406,12 +406,12 @@ def get_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "get_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + self._stubs["get_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + ) ) return self._stubs["get_principal_access_boundary_policy"] @@ -440,12 +440,12 @@ def update_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "update_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_principal_access_boundary_policy"] @@ -474,12 +474,12 @@ def delete_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "delete_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_principal_access_boundary_policy"] @@ -508,12 +508,12 @@ def list_principal_access_boundary_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_principal_access_boundary_policies" not in self._stubs: - self._stubs[ - "list_principal_access_boundary_policies" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", - request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + self._stubs["list_principal_access_boundary_policies"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", + request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + ) ) return self._stubs["list_principal_access_boundary_policies"] @@ -544,12 +544,12 @@ def search_principal_access_boundary_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_principal_access_boundary_policy_bindings" not in self._stubs: - self._stubs[ - "search_principal_access_boundary_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", - request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + self._stubs["search_principal_access_boundary_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", + request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_principal_access_boundary_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc_asyncio.py index d16ff1021db8..d343d431a181 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_v3.types import ( principal_access_boundary_policies_service, @@ -380,12 +380,12 @@ def create_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "create_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_principal_access_boundary_policy"] @@ -416,12 +416,12 @@ def get_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "get_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + self._stubs["get_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + ) ) return self._stubs["get_principal_access_boundary_policy"] @@ -450,12 +450,12 @@ def update_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "update_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_principal_access_boundary_policy"] @@ -484,12 +484,12 @@ def delete_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "delete_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_principal_access_boundary_policy"] @@ -520,12 +520,12 @@ def list_principal_access_boundary_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_principal_access_boundary_policies" not in self._stubs: - self._stubs[ - "list_principal_access_boundary_policies" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", - request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + self._stubs["list_principal_access_boundary_policies"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", + request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + ) ) return self._stubs["list_principal_access_boundary_policies"] @@ -558,12 +558,12 @@ def search_principal_access_boundary_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_principal_access_boundary_policy_bindings" not in self._stubs: - self._stubs[ - "search_principal_access_boundary_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", - request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + self._stubs["search_principal_access_boundary_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", + request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_principal_access_boundary_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/rest.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/rest.py index a1261ded71d4..6fae4c7654a6 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/rest.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -300,9 +300,7 @@ def pre_list_principal_access_boundary_policies( def post_list_principal_access_boundary_policies( self, response: principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse, - ) -> ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse - ): + ) -> principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse: """Post-rpc interceptor for list_principal_access_boundary_policies DEPRECATED. Please use the `post_list_principal_access_boundary_policies_with_metadata` @@ -355,9 +353,7 @@ def pre_search_principal_access_boundary_policy_bindings( def post_search_principal_access_boundary_policy_bindings( self, response: principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse, - ) -> ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse - ): + ) -> principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse: """Post-rpc interceptor for search_principal_access_boundary_policy_bindings DEPRECATED. Please use the `post_search_principal_access_boundary_policy_bindings_with_metadata` @@ -666,15 +662,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseCreatePrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseCreatePrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_create_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseCreatePrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -738,11 +731,10 @@ def __call__( resp = self._interceptor.post_create_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -830,15 +822,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseDeletePrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseDeletePrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseDeletePrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -897,11 +886,10 @@ def __call__( resp = self._interceptor.post_delete_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -987,15 +975,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetPrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetPrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_get_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetPrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -1049,9 +1034,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy() - ) + resp = principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy() pb_resp = principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.pb( resp ) @@ -1060,11 +1043,10 @@ def __call__( resp = self._interceptor.post_get_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1129,9 +1111,7 @@ def __call__( retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Optional[float] = None, metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), - ) -> ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse - ): + ) -> principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse: r"""Call the list principal access boundary policies method over HTTP. @@ -1156,15 +1136,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseListPrincipalAccessBoundaryPolicies._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseListPrincipalAccessBoundaryPolicies._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_principal_access_boundary_policies( - request, metadata + request, metadata = ( + self._interceptor.pre_list_principal_access_boundary_policies( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseListPrincipalAccessBoundaryPolicies._get_transcoded_request( http_options, request @@ -1218,9 +1195,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + resp = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() pb_resp = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.pb( resp ) @@ -1229,11 +1204,10 @@ def __call__( resp = self._interceptor.post_list_principal_access_boundary_policies(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_principal_access_boundary_policies_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_principal_access_boundary_policies_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1298,9 +1272,7 @@ def __call__( retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Optional[float] = None, metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), - ) -> ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse - ): + ) -> principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse: r"""Call the search principal access boundary policy bindings method over HTTP. @@ -1325,15 +1297,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseSearchPrincipalAccessBoundaryPolicyBindings._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseSearchPrincipalAccessBoundaryPolicyBindings._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_search_principal_access_boundary_policy_bindings( - request, metadata + request, metadata = ( + self._interceptor.pre_search_principal_access_boundary_policy_bindings( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseSearchPrincipalAccessBoundaryPolicyBindings._get_transcoded_request( http_options, request @@ -1387,9 +1356,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + resp = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() pb_resp = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.pb( resp ) @@ -1402,11 +1369,10 @@ def __call__( ) ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_search_principal_access_boundary_policy_bindings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_search_principal_access_boundary_policy_bindings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1497,15 +1463,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseUpdatePrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseUpdatePrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_update_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseUpdatePrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -1569,11 +1532,10 @@ def __call__( resp = self._interceptor.post_update_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1609,7 +1571,9 @@ def create_principal_access_boundary_policy( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreatePrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._CreatePrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_principal_access_boundary_policy( @@ -1622,7 +1586,9 @@ def delete_principal_access_boundary_policy( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeletePrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_principal_access_boundary_policy( @@ -1635,7 +1601,9 @@ def get_principal_access_boundary_policy( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetPrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._GetPrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_principal_access_boundary_policies( @@ -1648,7 +1616,9 @@ def list_principal_access_boundary_policies( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListPrincipalAccessBoundaryPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._ListPrincipalAccessBoundaryPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def search_principal_access_boundary_policy_bindings( @@ -1661,7 +1631,9 @@ def search_principal_access_boundary_policy_bindings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SearchPrincipalAccessBoundaryPolicyBindings(self._session, self._host, self._interceptor) # type: ignore + return self._SearchPrincipalAccessBoundaryPolicyBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_principal_access_boundary_policy( @@ -1674,7 +1646,9 @@ def update_principal_access_boundary_policy( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdatePrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -1734,9 +1708,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/types/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v3/types/__init__.py index f4ebb2d7c755..bb0caa3a5e8d 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/types/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/types/__init__.py @@ -13,8 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .operation_metadata import OperationMetadata -from .policy_binding_resources import PolicyBinding +from .operation_metadata import ( + OperationMetadata, +) +from .policy_binding_resources import ( + PolicyBinding, +) from .policy_bindings_service import ( CreatePolicyBindingRequest, DeletePolicyBindingRequest, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_binding_resources.py b/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_binding_resources.py index d7448e1f7ea9..fe70ee5e4dc7 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_binding_resources.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_binding_resources.py @@ -136,6 +136,7 @@ class PolicyKind(proto.Enum): PRINCIPAL_ACCESS_BOUNDARY (1): Principal access boundary policy kind """ + POLICY_KIND_UNSPECIFIED = 0 PRINCIPAL_ACCESS_BOUNDARY = 1 diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_bindings_service.py b/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_bindings_service.py index c28b59f561ad..951f6421e850 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_bindings_service.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_bindings_service.py @@ -261,12 +261,12 @@ class ListPolicyBindingsResponse(proto.Message): def raw_page(self): return self - policy_bindings: MutableSequence[ - policy_binding_resources.PolicyBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=policy_binding_resources.PolicyBinding, + policy_bindings: MutableSequence[policy_binding_resources.PolicyBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=policy_binding_resources.PolicyBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -354,12 +354,12 @@ class SearchTargetPolicyBindingsResponse(proto.Message): def raw_page(self): return self - policy_bindings: MutableSequence[ - policy_binding_resources.PolicyBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=policy_binding_resources.PolicyBinding, + policy_bindings: MutableSequence[policy_binding_resources.PolicyBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=policy_binding_resources.PolicyBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policies_service.py b/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policies_service.py index 1a9458f75231..ac0552725826 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policies_service.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policies_service.py @@ -316,12 +316,12 @@ class SearchPrincipalAccessBoundaryPolicyBindingsResponse(proto.Message): def raw_page(self): return self - policy_bindings: MutableSequence[ - policy_binding_resources.PolicyBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=policy_binding_resources.PolicyBinding, + policy_bindings: MutableSequence[policy_binding_resources.PolicyBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=policy_binding_resources.PolicyBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policy_resources.py b/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policy_resources.py index 30f424dfdb10..a535f1f6e7d2 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policy_resources.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policy_resources.py @@ -171,6 +171,7 @@ class Effect(proto.Enum): ALLOW (1): Allows access to the resources in this rule. """ + EFFECT_UNSPECIFIED = 0 ALLOW = 1 diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/__init__.py index e8fd62d22033..20cbd036ab53 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.policy_bindings import PolicyBindingsAsyncClient, PolicyBindingsClient from .services.principal_access_boundary_policies import ( PrincipalAccessBoundaryPoliciesAsyncClient, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/async_client.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/async_client.py index 069e611f5712..01412e3d9e7d 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3beta import gapic_version as package_version @@ -46,12 +46,12 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.type.expr_pb2 as expr_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.iam_v3beta.services.policy_bindings import pagers from google.cloud.iam_v3beta.types import ( @@ -130,7 +130,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PolicyBindingsAsyncClient: The constructed client. """ - return PolicyBindingsClient.from_service_account_info.__func__(PolicyBindingsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PolicyBindingsClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(PolicyBindingsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +149,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PolicyBindingsAsyncClient: The constructed client. """ - return PolicyBindingsClient.from_service_account_file.__func__(PolicyBindingsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PolicyBindingsClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(PolicyBindingsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/client.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/client.py index f698f17abe71..000d387752cc 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3beta import gapic_version as package_version @@ -63,12 +63,12 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.type.expr_pb2 as expr_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.iam_v3beta.services.policy_bindings import pagers from google.cloud.iam_v3beta.types import ( @@ -91,9 +91,7 @@ class PolicyBindingsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PolicyBindingsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PolicyBindingsTransport]] _transport_registry["grpc"] = PolicyBindingsGrpcTransport _transport_registry["grpc_asyncio"] = PolicyBindingsGrpcAsyncIOTransport _transport_registry["rest"] = PolicyBindingsRestTransport @@ -635,11 +633,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PolicyBindingsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PolicyBindingsClient._read_environment_variables() + ) self._client_cert_source = PolicyBindingsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -674,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PolicyBindingsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/pagers.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/pagers.py index e2bd05272231..92935e339382 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/pagers.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -314,7 +314,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/base.py index bdff01ed38f0..5a9929c737b7 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3beta import gapic_version as package_version from google.cloud.iam_v3beta.types import ( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc.py index 244f4fc08ae8..6ac8496408a0 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.iam_v3beta.types import ( policy_binding_resources, @@ -521,12 +521,12 @@ def search_target_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_target_policy_bindings" not in self._stubs: - self._stubs[ - "search_target_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PolicyBindings/SearchTargetPolicyBindings", - request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, - response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + self._stubs["search_target_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PolicyBindings/SearchTargetPolicyBindings", + request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, + response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_target_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc_asyncio.py index 1bda4a8117f5..14a25d0e153e 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_v3beta.types import ( policy_binding_resources, @@ -532,12 +532,12 @@ def search_target_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_target_policy_bindings" not in self._stubs: - self._stubs[ - "search_target_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PolicyBindings/SearchTargetPolicyBindings", - request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, - response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + self._stubs["search_target_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PolicyBindings/SearchTargetPolicyBindings", + request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, + response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_target_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/rest.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/rest.py index a2bb818b369e..9137b276e850 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/rest.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -650,9 +650,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseCreatePolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseCreatePolicyBinding._get_http_options() request, metadata = self._interceptor.pre_create_policy_binding( request, metadata @@ -804,9 +802,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseDeletePolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseDeletePolicyBinding._get_http_options() request, metadata = self._interceptor.pre_delete_policy_binding( request, metadata @@ -949,9 +945,7 @@ def __call__( IAM policy binding resource. """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseGetPolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseGetPolicyBinding._get_http_options() request, metadata = self._interceptor.pre_get_policy_binding( request, metadata @@ -1100,9 +1094,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseListPolicyBindings._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseListPolicyBindings._get_http_options() request, metadata = self._interceptor.pre_list_policy_bindings( request, metadata @@ -1255,9 +1247,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseSearchTargetPolicyBindings._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseSearchTargetPolicyBindings._get_http_options() request, metadata = self._interceptor.pre_search_target_policy_bindings( request, metadata @@ -1325,11 +1315,10 @@ def __call__( resp = self._interceptor.post_search_target_policy_bindings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_search_target_policy_bindings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_search_target_policy_bindings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1416,9 +1405,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseUpdatePolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseUpdatePolicyBinding._get_http_options() request, metadata = self._interceptor.pre_update_policy_binding( request, metadata @@ -1562,7 +1549,9 @@ def search_target_policy_bindings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SearchTargetPolicyBindings(self._session, self._host, self._interceptor) # type: ignore + return self._SearchTargetPolicyBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_policy_binding( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/async_client.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/async_client.py index 4a3b370db17d..bd088f89081d 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3beta import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.iam_v3beta.services.principal_access_boundary_policies import pagers from google.cloud.iam_v3beta.types import ( @@ -149,7 +149,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PrincipalAccessBoundaryPoliciesAsyncClient: The constructed client. """ - return PrincipalAccessBoundaryPoliciesClient.from_service_account_info.__func__(PrincipalAccessBoundaryPoliciesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PrincipalAccessBoundaryPoliciesClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + PrincipalAccessBoundaryPoliciesAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -165,7 +170,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PrincipalAccessBoundaryPoliciesAsyncClient: The constructed client. """ - return PrincipalAccessBoundaryPoliciesClient.from_service_account_file.__func__(PrincipalAccessBoundaryPoliciesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PrincipalAccessBoundaryPoliciesClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + PrincipalAccessBoundaryPoliciesAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -203,7 +213,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return PrincipalAccessBoundaryPoliciesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return PrincipalAccessBoundaryPoliciesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> PrincipalAccessBoundaryPoliciesTransport: diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/client.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/client.py index 0c956f4041eb..d3c977b7502d 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3beta import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.iam_v3beta.services.principal_access_boundary_policies import pagers from google.cloud.iam_v3beta.types import ( @@ -94,13 +94,11 @@ class PrincipalAccessBoundaryPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] _transport_registry["grpc"] = PrincipalAccessBoundaryPoliciesGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport + ) _transport_registry["rest"] = PrincipalAccessBoundaryPoliciesRestTransport def get_transport_class( @@ -674,11 +672,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PrincipalAccessBoundaryPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PrincipalAccessBoundaryPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( PrincipalAccessBoundaryPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -719,8 +715,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PrincipalAccessBoundaryPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/pagers.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/pagers.py index 0b0975052920..5927f0680f1c 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/pagers.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/pagers.py @@ -74,7 +74,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -165,7 +165,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -258,7 +258,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -345,7 +345,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/__init__.py index a61a05fb134f..572b487008f5 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/__init__.py @@ -25,13 +25,11 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] _transport_registry["grpc"] = PrincipalAccessBoundaryPoliciesGrpcTransport -_transport_registry[ - "grpc_asyncio" -] = PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport +_transport_registry["grpc_asyncio"] = ( + PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport +) _transport_registry["rest"] = PrincipalAccessBoundaryPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/base.py index 11f29faab3b5..1859d733de0b 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3beta import gapic_version as package_version from google.cloud.iam_v3beta.types import ( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc.py index d30db8766e3e..4989312dcd8b 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.iam_v3beta.types import ( principal_access_boundary_policies_service, @@ -372,12 +372,12 @@ def create_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "create_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_principal_access_boundary_policy"] @@ -406,12 +406,12 @@ def get_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "get_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + self._stubs["get_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + ) ) return self._stubs["get_principal_access_boundary_policy"] @@ -440,12 +440,12 @@ def update_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "update_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_principal_access_boundary_policy"] @@ -474,12 +474,12 @@ def delete_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "delete_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_principal_access_boundary_policy"] @@ -508,12 +508,12 @@ def list_principal_access_boundary_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_principal_access_boundary_policies" not in self._stubs: - self._stubs[ - "list_principal_access_boundary_policies" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", - request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + self._stubs["list_principal_access_boundary_policies"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", + request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + ) ) return self._stubs["list_principal_access_boundary_policies"] @@ -544,12 +544,12 @@ def search_principal_access_boundary_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_principal_access_boundary_policy_bindings" not in self._stubs: - self._stubs[ - "search_principal_access_boundary_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", - request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + self._stubs["search_principal_access_boundary_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", + request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_principal_access_boundary_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc_asyncio.py index b9ef2ab3399c..7c79fde33a98 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_v3beta.types import ( principal_access_boundary_policies_service, @@ -380,12 +380,12 @@ def create_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "create_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_principal_access_boundary_policy"] @@ -416,12 +416,12 @@ def get_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "get_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + self._stubs["get_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + ) ) return self._stubs["get_principal_access_boundary_policy"] @@ -450,12 +450,12 @@ def update_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "update_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_principal_access_boundary_policy"] @@ -484,12 +484,12 @@ def delete_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "delete_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_principal_access_boundary_policy"] @@ -520,12 +520,12 @@ def list_principal_access_boundary_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_principal_access_boundary_policies" not in self._stubs: - self._stubs[ - "list_principal_access_boundary_policies" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", - request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + self._stubs["list_principal_access_boundary_policies"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", + request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + ) ) return self._stubs["list_principal_access_boundary_policies"] @@ -558,12 +558,12 @@ def search_principal_access_boundary_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_principal_access_boundary_policy_bindings" not in self._stubs: - self._stubs[ - "search_principal_access_boundary_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", - request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + self._stubs["search_principal_access_boundary_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", + request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_principal_access_boundary_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/rest.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/rest.py index e932dc881cdb..a3bb2a317ce4 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/rest.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -300,9 +300,7 @@ def pre_list_principal_access_boundary_policies( def post_list_principal_access_boundary_policies( self, response: principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse, - ) -> ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse - ): + ) -> principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse: """Post-rpc interceptor for list_principal_access_boundary_policies DEPRECATED. Please use the `post_list_principal_access_boundary_policies_with_metadata` @@ -355,9 +353,7 @@ def pre_search_principal_access_boundary_policy_bindings( def post_search_principal_access_boundary_policy_bindings( self, response: principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse, - ) -> ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse - ): + ) -> principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse: """Post-rpc interceptor for search_principal_access_boundary_policy_bindings DEPRECATED. Please use the `post_search_principal_access_boundary_policy_bindings_with_metadata` @@ -666,15 +662,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseCreatePrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseCreatePrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_create_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseCreatePrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -738,11 +731,10 @@ def __call__( resp = self._interceptor.post_create_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -830,15 +822,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseDeletePrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseDeletePrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseDeletePrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -897,11 +886,10 @@ def __call__( resp = self._interceptor.post_delete_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -987,15 +975,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetPrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetPrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_get_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetPrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -1049,9 +1034,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy() - ) + resp = principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy() pb_resp = principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.pb( resp ) @@ -1060,11 +1043,10 @@ def __call__( resp = self._interceptor.post_get_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1129,9 +1111,7 @@ def __call__( retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Optional[float] = None, metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), - ) -> ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse - ): + ) -> principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse: r"""Call the list principal access boundary policies method over HTTP. @@ -1156,15 +1136,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseListPrincipalAccessBoundaryPolicies._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseListPrincipalAccessBoundaryPolicies._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_principal_access_boundary_policies( - request, metadata + request, metadata = ( + self._interceptor.pre_list_principal_access_boundary_policies( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseListPrincipalAccessBoundaryPolicies._get_transcoded_request( http_options, request @@ -1218,9 +1195,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + resp = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() pb_resp = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.pb( resp ) @@ -1229,11 +1204,10 @@ def __call__( resp = self._interceptor.post_list_principal_access_boundary_policies(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_principal_access_boundary_policies_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_principal_access_boundary_policies_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1298,9 +1272,7 @@ def __call__( retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Optional[float] = None, metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), - ) -> ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse - ): + ) -> principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse: r"""Call the search principal access boundary policy bindings method over HTTP. @@ -1325,15 +1297,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseSearchPrincipalAccessBoundaryPolicyBindings._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseSearchPrincipalAccessBoundaryPolicyBindings._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_search_principal_access_boundary_policy_bindings( - request, metadata + request, metadata = ( + self._interceptor.pre_search_principal_access_boundary_policy_bindings( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseSearchPrincipalAccessBoundaryPolicyBindings._get_transcoded_request( http_options, request @@ -1387,9 +1356,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + resp = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() pb_resp = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.pb( resp ) @@ -1402,11 +1369,10 @@ def __call__( ) ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_search_principal_access_boundary_policy_bindings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_search_principal_access_boundary_policy_bindings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1497,15 +1463,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseUpdatePrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseUpdatePrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_update_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseUpdatePrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -1569,11 +1532,10 @@ def __call__( resp = self._interceptor.post_update_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1609,7 +1571,9 @@ def create_principal_access_boundary_policy( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreatePrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._CreatePrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_principal_access_boundary_policy( @@ -1622,7 +1586,9 @@ def delete_principal_access_boundary_policy( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeletePrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_principal_access_boundary_policy( @@ -1635,7 +1601,9 @@ def get_principal_access_boundary_policy( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetPrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._GetPrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_principal_access_boundary_policies( @@ -1648,7 +1616,9 @@ def list_principal_access_boundary_policies( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListPrincipalAccessBoundaryPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._ListPrincipalAccessBoundaryPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def search_principal_access_boundary_policy_bindings( @@ -1661,7 +1631,9 @@ def search_principal_access_boundary_policy_bindings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SearchPrincipalAccessBoundaryPolicyBindings(self._session, self._host, self._interceptor) # type: ignore + return self._SearchPrincipalAccessBoundaryPolicyBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_principal_access_boundary_policy( @@ -1674,7 +1646,9 @@ def update_principal_access_boundary_policy( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdatePrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -1734,9 +1708,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/__init__.py index f4ebb2d7c755..bb0caa3a5e8d 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/__init__.py @@ -13,8 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .operation_metadata import OperationMetadata -from .policy_binding_resources import PolicyBinding +from .operation_metadata import ( + OperationMetadata, +) +from .policy_binding_resources import ( + PolicyBinding, +) from .policy_bindings_service import ( CreatePolicyBindingRequest, DeletePolicyBindingRequest, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_binding_resources.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_binding_resources.py index 9d9ac8ab335b..364ebe83c9b4 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_binding_resources.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_binding_resources.py @@ -136,6 +136,7 @@ class PolicyKind(proto.Enum): PRINCIPAL_ACCESS_BOUNDARY (1): Principal access boundary policy kind """ + POLICY_KIND_UNSPECIFIED = 0 PRINCIPAL_ACCESS_BOUNDARY = 1 diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_bindings_service.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_bindings_service.py index 5e8879fb84af..83de2fce724d 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_bindings_service.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_bindings_service.py @@ -261,12 +261,12 @@ class ListPolicyBindingsResponse(proto.Message): def raw_page(self): return self - policy_bindings: MutableSequence[ - policy_binding_resources.PolicyBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=policy_binding_resources.PolicyBinding, + policy_bindings: MutableSequence[policy_binding_resources.PolicyBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=policy_binding_resources.PolicyBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -354,12 +354,12 @@ class SearchTargetPolicyBindingsResponse(proto.Message): def raw_page(self): return self - policy_bindings: MutableSequence[ - policy_binding_resources.PolicyBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=policy_binding_resources.PolicyBinding, + policy_bindings: MutableSequence[policy_binding_resources.PolicyBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=policy_binding_resources.PolicyBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policies_service.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policies_service.py index d0a342b45970..0a429ce125ea 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policies_service.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policies_service.py @@ -316,12 +316,12 @@ class SearchPrincipalAccessBoundaryPolicyBindingsResponse(proto.Message): def raw_page(self): return self - policy_bindings: MutableSequence[ - policy_binding_resources.PolicyBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=policy_binding_resources.PolicyBinding, + policy_bindings: MutableSequence[policy_binding_resources.PolicyBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=policy_binding_resources.PolicyBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policy_resources.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policy_resources.py index b19b55a31383..271256e78dc0 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policy_resources.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policy_resources.py @@ -171,6 +171,7 @@ class Effect(proto.Enum): ALLOW (1): Allows access to the resources in this rule. """ + EFFECT_UNSPECIFIED = 0 ALLOW = 1 diff --git a/packages/google-cloud-iam/mypy.ini b/packages/google-cloud-iam/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-iam/mypy.ini +++ b/packages/google-cloud-iam/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-iam/noxfile.py b/packages/google-cloud-iam/noxfile.py index 4f83b31943f5..62f728c9f18b 100644 --- a/packages/google-cloud-iam/noxfile.py +++ b/packages/google-cloud-iam/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_async.py b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_async.py index 51c69390ebb6..5ffdda4ed4af 100644 --- a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_async.py +++ b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iam -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START iam_v1_generated_IAM_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iam_admin_v1 diff --git a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_sync.py b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_sync.py index c78db954c2a2..3cd494d62363 100644 --- a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_sync.py +++ b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iam -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START iam_v1_generated_IAM_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iam_admin_v1 diff --git a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_async.py b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_async.py index 3e7f22ef9c1c..a7ecb8f4e9e1 100644 --- a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_async.py +++ b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iam -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START iam_v1_generated_IAM_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iam_admin_v1 diff --git a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_sync.py b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_sync.py index 537cf9107d62..275a47981900 100644 --- a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_sync.py +++ b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iam -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START iam_v1_generated_IAM_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iam_admin_v1 diff --git a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_async.py b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_async.py index 41df50158767..f4efd400eaa1 100644 --- a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_async.py +++ b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iam -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START iam_v1_generated_IAM_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iam_admin_v1 diff --git a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_sync.py b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_sync.py index aca38c96a8f9..9441abaf2baf 100644 --- a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_sync.py +++ b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iam -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START iam_v1_generated_IAM_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iam_admin_v1 diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_admin_v1/test_iam.py b/packages/google-cloud-iam/tests/unit/gapic/iam_admin_v1/test_iam.py index e1cccad4f002..a09b6473ff9d 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_admin_v1/test_iam.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_admin_v1/test_iam.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,20 +40,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.options_pb2 as options_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.iam_admin_v1.services.iam import ( IAMAsyncClient, @@ -855,10 +861,9 @@ def test_iam_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -903,10 +908,9 @@ def test_iam_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -942,10 +946,9 @@ def test_iam_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1170,9 +1173,7 @@ def test_iam_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1288,9 +1289,9 @@ def test_list_service_accounts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_service_accounts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_service_accounts] = ( + mock_rpc + ) request = {} client.list_service_accounts(request) @@ -1847,9 +1848,9 @@ def test_get_service_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_service_account] = ( + mock_rpc + ) request = {} client.get_service_account(request) @@ -2219,9 +2220,9 @@ def test_create_service_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_service_account] = ( + mock_rpc + ) request = {} client.create_service_account(request) @@ -2621,9 +2622,9 @@ def test_update_service_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_service_account] = ( + mock_rpc + ) request = {} client.update_service_account(request) @@ -2903,9 +2904,9 @@ def test_patch_service_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_service_account] = ( + mock_rpc + ) request = {} client.patch_service_account(request) @@ -3170,9 +3171,9 @@ def test_delete_service_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_service_account] = ( + mock_rpc + ) request = {} client.delete_service_account(request) @@ -3750,9 +3751,9 @@ def test_enable_service_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_service_account] = ( + mock_rpc + ) request = {} client.enable_service_account(request) @@ -7995,9 +7996,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -8369,9 +8370,9 @@ def test_query_grantable_roles_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_grantable_roles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_grantable_roles] = ( + mock_rpc + ) request = {} client.query_grantable_roles(request) diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_credentials_v1/test_iam_credentials.py b/packages/google-cloud-iam/tests/unit/gapic/iam_credentials_v1/test_iam_credentials.py index b79040f9d16c..3042348b1b97 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_credentials_v1/test_iam_credentials.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_credentials_v1/test_iam_credentials.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.iam_credentials_v1.services.iam_credentials import ( IAMCredentialsAsyncClient, @@ -946,10 +951,9 @@ def test_iam_credentials_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +998,9 @@ def test_iam_credentials_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1036,9 @@ def test_iam_credentials_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1283,9 +1285,7 @@ def test_iam_credentials_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1399,9 +1399,9 @@ def test_generate_access_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_access_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_access_token] = ( + mock_rpc + ) request = {} client.generate_access_token(request) @@ -1770,9 +1770,9 @@ def test_generate_id_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_id_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_id_token] = ( + mock_rpc + ) request = {} client.generate_id_token(request) @@ -2766,9 +2766,9 @@ def test_generate_access_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_access_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_access_token] = ( + mock_rpc + ) request = {} client.generate_access_token(request) @@ -2965,9 +2965,9 @@ def test_generate_id_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_id_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_id_token] = ( + mock_rpc + ) request = {} client.generate_id_token(request) diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_v2/test_policies.py b/packages/google-cloud-iam/tests/unit/gapic/iam_v2/test_policies.py index bfdf1c04fcd3..398fc41f6eb0 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_v2/test_policies.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_v2/test_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.iam_v2.services.policies import ( PoliciesAsyncClient, @@ -70,8 +70,7 @@ pagers, transports, ) -from google.cloud.iam_v2.types import deny -from google.cloud.iam_v2.types import policy +from google.cloud.iam_v2.types import deny, policy from google.cloud.iam_v2.types import policy as gi_policy CRED_INFO_JSON = { @@ -921,10 +920,9 @@ def test_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +967,9 @@ def test_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1005,9 @@ def test_policies_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1240,9 +1236,7 @@ def test_policies_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_v2beta/test_policies.py b/packages/google-cloud-iam/tests/unit/gapic/iam_v2beta/test_policies.py index 9800afcd899e..7c6ea74be941 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_v2beta/test_policies.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_v2beta/test_policies.py @@ -24,13 +24,14 @@ import json import math +from collections.abc import Mapping, Sequence -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +40,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,17 +54,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -import google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.iam_v2beta.services.policies import ( PoliciesAsyncClient, @@ -66,8 +67,7 @@ pagers, transports, ) -from google.cloud.iam_v2beta.types import deny -from google.cloud.iam_v2beta.types import policy +from google.cloud.iam_v2beta.types import deny, policy from google.cloud.iam_v2beta.types import policy as gi_policy CRED_INFO_JSON = { @@ -902,10 +902,9 @@ def test_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -950,10 +949,9 @@ def test_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +987,9 @@ def test_policies_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1219,9 +1216,7 @@ def test_policies_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_policy_bindings.py b/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_policy_bindings.py index ace8058e4da4..6f8db27fdff0 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_policy_bindings.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_policy_bindings.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.iam_v3.services.policy_bindings import ( PolicyBindingsAsyncClient, @@ -964,10 +964,9 @@ def test_policy_bindings_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1011,9 @@ def test_policy_bindings_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1051,10 +1049,9 @@ def test_policy_bindings_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1301,9 +1298,7 @@ def test_policy_bindings_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1416,9 +1411,9 @@ def test_create_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_policy_binding] = ( + mock_rpc + ) request = {} client.create_policy_binding(request) @@ -1800,9 +1795,9 @@ def test_get_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_policy_binding] = ( + mock_rpc + ) request = {} client.get_policy_binding(request) @@ -2151,9 +2146,9 @@ def test_update_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_policy_binding] = ( + mock_rpc + ) request = {} client.update_policy_binding(request) @@ -2510,9 +2505,9 @@ def test_delete_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_policy_binding] = ( + mock_rpc + ) request = {} client.delete_policy_binding(request) @@ -2863,9 +2858,9 @@ def test_list_policy_bindings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_policy_bindings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_policy_bindings] = ( + mock_rpc + ) request = {} client.list_policy_bindings(request) @@ -3909,9 +3904,9 @@ def test_create_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_policy_binding] = ( + mock_rpc + ) request = {} client.create_policy_binding(request) @@ -4129,9 +4124,9 @@ def test_get_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_policy_binding] = ( + mock_rpc + ) request = {} client.get_policy_binding(request) @@ -4314,9 +4309,9 @@ def test_update_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_policy_binding] = ( + mock_rpc + ) request = {} client.update_policy_binding(request) @@ -4513,9 +4508,9 @@ def test_delete_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_policy_binding] = ( + mock_rpc + ) request = {} client.delete_policy_binding(request) @@ -4711,9 +4706,9 @@ def test_list_policy_bindings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_policy_bindings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_policy_bindings] = ( + mock_rpc + ) request = {} client.list_policy_bindings(request) diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_principal_access_boundary_policies.py b/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_principal_access_boundary_policies.py index e7fd137f335d..246ffa958d6c 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_principal_access_boundary_policies.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_principal_access_boundary_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.iam_v3.services.principal_access_boundary_policies import ( PrincipalAccessBoundaryPoliciesAsyncClient, @@ -1078,10 +1078,9 @@ def test_principal_access_boundary_policies_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1126,10 +1125,9 @@ def test_principal_access_boundary_policies_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1165,10 +1163,9 @@ def test_principal_access_boundary_policies_client_get_mtls_endpoint_and_cert_so "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1433,9 +1430,7 @@ def test_principal_access_boundary_policies_client_create_channel_credentials_fi google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1485,9 +1480,7 @@ def test_create_principal_access_boundary_policy(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -1520,11 +1513,12 @@ def test_create_principal_access_boundary_policy_non_empty_request_with_auto_pop client.create_principal_access_boundary_policy(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest( - parent="parent_value", - principal_access_boundary_policy_id="principal_access_boundary_policy_id_value", + assert ( + args[0] + == principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest( + parent="parent_value", + principal_access_boundary_policy_id="principal_access_boundary_policy_id_value", + ) ) @@ -1647,9 +1641,7 @@ async def test_create_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -1668,9 +1660,7 @@ def test_create_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() request.parent = "parent_value" @@ -1702,9 +1692,7 @@ async def test_create_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() request.parent = "parent_value" @@ -1887,9 +1875,7 @@ def test_get_principal_access_boundary_policy(request_type, transport: str = "gr # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -1928,10 +1914,11 @@ def test_get_principal_access_boundary_policy_non_empty_request_with_auto_popula client.get_principal_access_boundary_policy(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest( - name="name_value", + assert ( + args[0] + == principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest( + name="name_value", + ) ) @@ -2049,9 +2036,7 @@ async def test_get_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2077,9 +2062,7 @@ def test_get_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -2113,9 +2096,7 @@ async def test_get_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -2259,9 +2240,7 @@ def test_update_principal_access_boundary_policy(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2279,9 +2258,7 @@ def test_update_principal_access_boundary_policy_non_empty_request_with_auto_pop # Populate all string fields in the request which are not UUID4 # since we want to check that UUID4 are populated automatically # if they meet the requirements of AIP 4235. - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -2418,9 +2395,7 @@ async def test_update_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2439,9 +2414,7 @@ def test_update_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() request.principal_access_boundary_policy.name = "name_value" @@ -2473,9 +2446,7 @@ async def test_update_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() request.principal_access_boundary_policy.name = "name_value" @@ -2641,9 +2612,7 @@ def test_delete_principal_access_boundary_policy(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2676,11 +2645,12 @@ def test_delete_principal_access_boundary_policy_non_empty_request_with_auto_pop client.delete_principal_access_boundary_policy(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest( - name="name_value", - etag="etag_value", + assert ( + args[0] + == principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest( + name="name_value", + etag="etag_value", + ) ) @@ -2803,9 +2773,7 @@ async def test_delete_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2824,9 +2792,7 @@ def test_delete_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -2858,9 +2824,7 @@ async def test_delete_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -3002,9 +2966,7 @@ def test_list_principal_access_boundary_policies(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3038,11 +3000,12 @@ def test_list_principal_access_boundary_policies_non_empty_request_with_auto_pop client.list_principal_access_boundary_policies(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest( - parent="parent_value", - page_token="page_token_value", + assert ( + args[0] + == principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest( + parent="parent_value", + page_token="page_token_value", + ) ) @@ -3157,9 +3120,7 @@ async def test_list_principal_access_boundary_policies_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3179,9 +3140,7 @@ def test_list_principal_access_boundary_policies_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() request.parent = "parent_value" @@ -3189,9 +3148,7 @@ def test_list_principal_access_boundary_policies_field_headers(): with mock.patch.object( type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() client.list_principal_access_boundary_policies(request) # Establish that the underlying gRPC stub method was called. @@ -3215,9 +3172,7 @@ async def test_list_principal_access_boundary_policies_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() request.parent = "parent_value" @@ -3253,9 +3208,7 @@ def test_list_principal_access_boundary_policies_flattened(): type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. client.list_principal_access_boundary_policies( @@ -3296,9 +3249,7 @@ async def test_list_principal_access_boundary_policies_flattened_async(): type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() @@ -3582,9 +3533,7 @@ def test_search_principal_access_boundary_policy_bindings( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3619,11 +3568,12 @@ def test_search_principal_access_boundary_policy_bindings_non_empty_request_with client.search_principal_access_boundary_policy_bindings(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest( - name="name_value", - page_token="page_token_value", + assert ( + args[0] + == principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest( + name="name_value", + page_token="page_token_value", + ) ) @@ -3741,9 +3691,7 @@ async def test_search_principal_access_boundary_policy_bindings_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3765,9 +3713,7 @@ def test_search_principal_access_boundary_policy_bindings_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() request.name = "name_value" @@ -3776,9 +3722,7 @@ def test_search_principal_access_boundary_policy_bindings_field_headers(): type(client.transport.search_principal_access_boundary_policy_bindings), "__call__", ) as call: - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() client.search_principal_access_boundary_policy_bindings(request) # Establish that the underlying gRPC stub method was called. @@ -3802,9 +3746,7 @@ async def test_search_principal_access_boundary_policy_bindings_field_headers_as # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() request.name = "name_value" @@ -3842,9 +3784,7 @@ def test_search_principal_access_boundary_policy_bindings_flattened(): "__call__", ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. client.search_principal_access_boundary_policy_bindings( @@ -3886,9 +3826,7 @@ async def test_search_principal_access_boundary_policy_bindings_flattened_async( "__call__", ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() @@ -4216,9 +4154,9 @@ def test_create_principal_access_boundary_policy_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "principalAccessBoundaryPolicyId" - ] = "principal_access_boundary_policy_id_value" + jsonified_request["principalAccessBoundaryPolicyId"] = ( + "principal_access_boundary_policy_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() @@ -5091,9 +5029,7 @@ def test_list_principal_access_boundary_policies_rest_required_fields( request = request_type(**request_init) # Designate an appropriate value for the returned response. - return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() # Mock the http request call within the method and fake a response. with mock.patch.object(Session, "request") as req: # We need to mock transcode() because providing default values @@ -5158,9 +5094,7 @@ def test_list_principal_access_boundary_policies_rest_flattened(): # Mock the http request call within the method and fake a response. with mock.patch.object(type(client.transport._session), "request") as req: # Designate an appropriate value for the returned response. - return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() # get arguments that satisfy an http rule for this method sample_request = {"parent": "organizations/sample1/locations/sample2"} @@ -5379,9 +5313,7 @@ def test_search_principal_access_boundary_policy_bindings_rest_required_fields( request = request_type(**request_init) # Designate an appropriate value for the returned response. - return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() # Mock the http request call within the method and fake a response. with mock.patch.object(Session, "request") as req: # We need to mock transcode() because providing default values @@ -5446,9 +5378,7 @@ def test_search_principal_access_boundary_policy_bindings_rest_flattened(): # Mock the http request call within the method and fake a response. with mock.patch.object(type(client.transport._session), "request") as req: # Designate an appropriate value for the returned response. - return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() # get arguments that satisfy an http rule for this method sample_request = { @@ -5705,9 +5635,7 @@ def test_create_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5732,9 +5660,7 @@ def test_get_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5757,9 +5683,7 @@ def test_update_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5782,9 +5706,7 @@ def test_delete_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5801,17 +5723,13 @@ def test_list_principal_access_boundary_policies_empty_call_grpc(): with mock.patch.object( type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() client.list_principal_access_boundary_policies(request=None) # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request_msg = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request_msg @@ -5829,17 +5747,13 @@ def test_search_principal_access_boundary_policy_bindings_empty_call_grpc(): type(client.transport.search_principal_access_boundary_policy_bindings), "__call__", ) as call: - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() client.search_principal_access_boundary_policy_bindings(request=None) # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request_msg = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request_msg @@ -5880,9 +5794,7 @@ async def test_create_principal_access_boundary_policy_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5914,9 +5826,7 @@ async def test_get_principal_access_boundary_policy_empty_call_grpc_asyncio(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5943,9 +5853,7 @@ async def test_update_principal_access_boundary_policy_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5972,9 +5880,7 @@ async def test_delete_principal_access_boundary_policy_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -6003,9 +5909,7 @@ async def test_list_principal_access_boundary_policies_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request_msg = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request_msg @@ -6035,9 +5939,7 @@ async def test_search_principal_access_boundary_policy_bindings_empty_call_grpc_ # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request_msg = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request_msg @@ -6247,9 +6149,7 @@ def test_create_principal_access_boundary_policy_rest_interceptors(null_intercep return_value = json_format.MessageToJson(operations_pb2.Operation()) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6400,9 +6300,7 @@ def test_get_principal_access_boundary_policy_rest_interceptors(null_interceptor ) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6635,9 +6533,7 @@ def test_update_principal_access_boundary_policy_rest_interceptors(null_intercep return_value = json_format.MessageToJson(operations_pb2.Operation()) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6767,9 +6663,7 @@ def test_delete_principal_access_boundary_policy_rest_interceptors(null_intercep return_value = json_format.MessageToJson(operations_pb2.Operation()) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6903,17 +6797,13 @@ def test_list_principal_access_boundary_policies_rest_interceptors(null_intercep ) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), ] pre.return_value = request, metadata - post.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + post.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() post_with_metadata.return_value = ( principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse(), metadata, @@ -7052,17 +6942,13 @@ def test_search_principal_access_boundary_policy_bindings_rest_interceptors( ) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), ] pre.return_value = request, metadata - post.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + post.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() post_with_metadata.return_value = ( principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse(), metadata, @@ -7167,9 +7053,7 @@ def test_create_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7191,9 +7075,7 @@ def test_get_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7215,9 +7097,7 @@ def test_update_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7239,9 +7119,7 @@ def test_delete_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7263,9 +7141,7 @@ def test_list_principal_access_boundary_policies_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request_msg = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request_msg @@ -7288,9 +7164,7 @@ def test_search_principal_access_boundary_policy_bindings_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request_msg = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request_msg diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_policy_bindings.py b/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_policy_bindings.py index 000d80cd8dbb..6c53a689eff2 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_policy_bindings.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_policy_bindings.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.iam_v3beta.services.policy_bindings import ( PolicyBindingsAsyncClient, @@ -964,10 +964,9 @@ def test_policy_bindings_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1011,9 @@ def test_policy_bindings_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1051,10 +1049,9 @@ def test_policy_bindings_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1301,9 +1298,7 @@ def test_policy_bindings_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1416,9 +1411,9 @@ def test_create_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_policy_binding] = ( + mock_rpc + ) request = {} client.create_policy_binding(request) @@ -1800,9 +1795,9 @@ def test_get_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_policy_binding] = ( + mock_rpc + ) request = {} client.get_policy_binding(request) @@ -2151,9 +2146,9 @@ def test_update_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_policy_binding] = ( + mock_rpc + ) request = {} client.update_policy_binding(request) @@ -2510,9 +2505,9 @@ def test_delete_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_policy_binding] = ( + mock_rpc + ) request = {} client.delete_policy_binding(request) @@ -2863,9 +2858,9 @@ def test_list_policy_bindings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_policy_bindings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_policy_bindings] = ( + mock_rpc + ) request = {} client.list_policy_bindings(request) @@ -3909,9 +3904,9 @@ def test_create_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_policy_binding] = ( + mock_rpc + ) request = {} client.create_policy_binding(request) @@ -4129,9 +4124,9 @@ def test_get_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_policy_binding] = ( + mock_rpc + ) request = {} client.get_policy_binding(request) @@ -4314,9 +4309,9 @@ def test_update_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_policy_binding] = ( + mock_rpc + ) request = {} client.update_policy_binding(request) @@ -4513,9 +4508,9 @@ def test_delete_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_policy_binding] = ( + mock_rpc + ) request = {} client.delete_policy_binding(request) @@ -4711,9 +4706,9 @@ def test_list_policy_bindings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_policy_bindings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_policy_bindings] = ( + mock_rpc + ) request = {} client.list_policy_bindings(request) diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_principal_access_boundary_policies.py b/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_principal_access_boundary_policies.py index c1b0b82be138..3e6c75d8cfc5 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_principal_access_boundary_policies.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_principal_access_boundary_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_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 google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_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 google.cloud.iam_v3beta.services.principal_access_boundary_policies import ( PrincipalAccessBoundaryPoliciesAsyncClient, @@ -1078,10 +1078,9 @@ def test_principal_access_boundary_policies_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1126,10 +1125,9 @@ def test_principal_access_boundary_policies_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1165,10 +1163,9 @@ def test_principal_access_boundary_policies_client_get_mtls_endpoint_and_cert_so "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1433,9 +1430,7 @@ def test_principal_access_boundary_policies_client_create_channel_credentials_fi google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1485,9 +1480,7 @@ def test_create_principal_access_boundary_policy(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -1520,11 +1513,12 @@ def test_create_principal_access_boundary_policy_non_empty_request_with_auto_pop client.create_principal_access_boundary_policy(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest( - parent="parent_value", - principal_access_boundary_policy_id="principal_access_boundary_policy_id_value", + assert ( + args[0] + == principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest( + parent="parent_value", + principal_access_boundary_policy_id="principal_access_boundary_policy_id_value", + ) ) @@ -1647,9 +1641,7 @@ async def test_create_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -1668,9 +1660,7 @@ def test_create_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() request.parent = "parent_value" @@ -1702,9 +1692,7 @@ async def test_create_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() request.parent = "parent_value" @@ -1887,9 +1875,7 @@ def test_get_principal_access_boundary_policy(request_type, transport: str = "gr # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -1928,10 +1914,11 @@ def test_get_principal_access_boundary_policy_non_empty_request_with_auto_popula client.get_principal_access_boundary_policy(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest( - name="name_value", + assert ( + args[0] + == principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest( + name="name_value", + ) ) @@ -2049,9 +2036,7 @@ async def test_get_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2077,9 +2062,7 @@ def test_get_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -2113,9 +2096,7 @@ async def test_get_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -2259,9 +2240,7 @@ def test_update_principal_access_boundary_policy(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2279,9 +2258,7 @@ def test_update_principal_access_boundary_policy_non_empty_request_with_auto_pop # Populate all string fields in the request which are not UUID4 # since we want to check that UUID4 are populated automatically # if they meet the requirements of AIP 4235. - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -2418,9 +2395,7 @@ async def test_update_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2439,9 +2414,7 @@ def test_update_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() request.principal_access_boundary_policy.name = "name_value" @@ -2473,9 +2446,7 @@ async def test_update_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() request.principal_access_boundary_policy.name = "name_value" @@ -2641,9 +2612,7 @@ def test_delete_principal_access_boundary_policy(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2676,11 +2645,12 @@ def test_delete_principal_access_boundary_policy_non_empty_request_with_auto_pop client.delete_principal_access_boundary_policy(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest( - name="name_value", - etag="etag_value", + assert ( + args[0] + == principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest( + name="name_value", + etag="etag_value", + ) ) @@ -2803,9 +2773,7 @@ async def test_delete_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2824,9 +2792,7 @@ def test_delete_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -2858,9 +2824,7 @@ async def test_delete_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -3002,9 +2966,7 @@ def test_list_principal_access_boundary_policies(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3038,11 +3000,12 @@ def test_list_principal_access_boundary_policies_non_empty_request_with_auto_pop client.list_principal_access_boundary_policies(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest( - parent="parent_value", - page_token="page_token_value", + assert ( + args[0] + == principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest( + parent="parent_value", + page_token="page_token_value", + ) ) @@ -3157,9 +3120,7 @@ async def test_list_principal_access_boundary_policies_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3179,9 +3140,7 @@ def test_list_principal_access_boundary_policies_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() request.parent = "parent_value" @@ -3189,9 +3148,7 @@ def test_list_principal_access_boundary_policies_field_headers(): with mock.patch.object( type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() client.list_principal_access_boundary_policies(request) # Establish that the underlying gRPC stub method was called. @@ -3215,9 +3172,7 @@ async def test_list_principal_access_boundary_policies_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() request.parent = "parent_value" @@ -3253,9 +3208,7 @@ def test_list_principal_access_boundary_policies_flattened(): type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. client.list_principal_access_boundary_policies( @@ -3296,9 +3249,7 @@ async def test_list_principal_access_boundary_policies_flattened_async(): type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() @@ -3582,9 +3533,7 @@ def test_search_principal_access_boundary_policy_bindings( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3619,11 +3568,12 @@ def test_search_principal_access_boundary_policy_bindings_non_empty_request_with client.search_principal_access_boundary_policy_bindings(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest( - name="name_value", - page_token="page_token_value", + assert ( + args[0] + == principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest( + name="name_value", + page_token="page_token_value", + ) ) @@ -3741,9 +3691,7 @@ async def test_search_principal_access_boundary_policy_bindings_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3765,9 +3713,7 @@ def test_search_principal_access_boundary_policy_bindings_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() request.name = "name_value" @@ -3776,9 +3722,7 @@ def test_search_principal_access_boundary_policy_bindings_field_headers(): type(client.transport.search_principal_access_boundary_policy_bindings), "__call__", ) as call: - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() client.search_principal_access_boundary_policy_bindings(request) # Establish that the underlying gRPC stub method was called. @@ -3802,9 +3746,7 @@ async def test_search_principal_access_boundary_policy_bindings_field_headers_as # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() request.name = "name_value" @@ -3842,9 +3784,7 @@ def test_search_principal_access_boundary_policy_bindings_flattened(): "__call__", ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. client.search_principal_access_boundary_policy_bindings( @@ -3886,9 +3826,7 @@ async def test_search_principal_access_boundary_policy_bindings_flattened_async( "__call__", ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() @@ -4216,9 +4154,9 @@ def test_create_principal_access_boundary_policy_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "principalAccessBoundaryPolicyId" - ] = "principal_access_boundary_policy_id_value" + jsonified_request["principalAccessBoundaryPolicyId"] = ( + "principal_access_boundary_policy_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() @@ -5091,9 +5029,7 @@ def test_list_principal_access_boundary_policies_rest_required_fields( request = request_type(**request_init) # Designate an appropriate value for the returned response. - return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() # Mock the http request call within the method and fake a response. with mock.patch.object(Session, "request") as req: # We need to mock transcode() because providing default values @@ -5158,9 +5094,7 @@ def test_list_principal_access_boundary_policies_rest_flattened(): # Mock the http request call within the method and fake a response. with mock.patch.object(type(client.transport._session), "request") as req: # Designate an appropriate value for the returned response. - return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() # get arguments that satisfy an http rule for this method sample_request = {"parent": "organizations/sample1/locations/sample2"} @@ -5379,9 +5313,7 @@ def test_search_principal_access_boundary_policy_bindings_rest_required_fields( request = request_type(**request_init) # Designate an appropriate value for the returned response. - return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() # Mock the http request call within the method and fake a response. with mock.patch.object(Session, "request") as req: # We need to mock transcode() because providing default values @@ -5446,9 +5378,7 @@ def test_search_principal_access_boundary_policy_bindings_rest_flattened(): # Mock the http request call within the method and fake a response. with mock.patch.object(type(client.transport._session), "request") as req: # Designate an appropriate value for the returned response. - return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() # get arguments that satisfy an http rule for this method sample_request = { @@ -5705,9 +5635,7 @@ def test_create_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5732,9 +5660,7 @@ def test_get_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5757,9 +5683,7 @@ def test_update_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5782,9 +5706,7 @@ def test_delete_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5801,17 +5723,13 @@ def test_list_principal_access_boundary_policies_empty_call_grpc(): with mock.patch.object( type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() client.list_principal_access_boundary_policies(request=None) # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request_msg = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request_msg @@ -5829,17 +5747,13 @@ def test_search_principal_access_boundary_policy_bindings_empty_call_grpc(): type(client.transport.search_principal_access_boundary_policy_bindings), "__call__", ) as call: - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() client.search_principal_access_boundary_policy_bindings(request=None) # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request_msg = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request_msg @@ -5880,9 +5794,7 @@ async def test_create_principal_access_boundary_policy_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5914,9 +5826,7 @@ async def test_get_principal_access_boundary_policy_empty_call_grpc_asyncio(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5943,9 +5853,7 @@ async def test_update_principal_access_boundary_policy_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5972,9 +5880,7 @@ async def test_delete_principal_access_boundary_policy_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -6003,9 +5909,7 @@ async def test_list_principal_access_boundary_policies_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request_msg = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request_msg @@ -6035,9 +5939,7 @@ async def test_search_principal_access_boundary_policy_bindings_empty_call_grpc_ # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request_msg = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request_msg @@ -6247,9 +6149,7 @@ def test_create_principal_access_boundary_policy_rest_interceptors(null_intercep return_value = json_format.MessageToJson(operations_pb2.Operation()) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6400,9 +6300,7 @@ def test_get_principal_access_boundary_policy_rest_interceptors(null_interceptor ) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6635,9 +6533,7 @@ def test_update_principal_access_boundary_policy_rest_interceptors(null_intercep return_value = json_format.MessageToJson(operations_pb2.Operation()) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6767,9 +6663,7 @@ def test_delete_principal_access_boundary_policy_rest_interceptors(null_intercep return_value = json_format.MessageToJson(operations_pb2.Operation()) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6903,17 +6797,13 @@ def test_list_principal_access_boundary_policies_rest_interceptors(null_intercep ) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), ] pre.return_value = request, metadata - post.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + post.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() post_with_metadata.return_value = ( principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse(), metadata, @@ -7052,17 +6942,13 @@ def test_search_principal_access_boundary_policy_bindings_rest_interceptors( ) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), ] pre.return_value = request, metadata - post.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + post.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() post_with_metadata.return_value = ( principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse(), metadata, @@ -7167,9 +7053,7 @@ def test_create_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7191,9 +7075,7 @@ def test_get_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7215,9 +7097,7 @@ def test_update_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7239,9 +7119,7 @@ def test_delete_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7263,9 +7141,7 @@ def test_list_principal_access_boundary_policies_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request_msg = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request_msg @@ -7288,9 +7164,7 @@ def test_search_principal_access_boundary_policy_bindings_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request_msg = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request_msg diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/__init__.py b/packages/google-cloud-iap/google/cloud/iap_v1/__init__.py index 094c4d798e0c..6eced41f6386 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/__init__.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.identity_aware_proxy_admin_service import ( IdentityAwareProxyAdminServiceAsyncClient, IdentityAwareProxyAdminServiceClient, diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py index e91d2a2c708b..368dd97653cf 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iap_v1 import gapic_version as package_version @@ -138,7 +138,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IdentityAwareProxyAdminServiceAsyncClient: The constructed client. """ - return IdentityAwareProxyAdminServiceClient.from_service_account_info.__func__(IdentityAwareProxyAdminServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + IdentityAwareProxyAdminServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + IdentityAwareProxyAdminServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +159,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IdentityAwareProxyAdminServiceAsyncClient: The constructed client. """ - return IdentityAwareProxyAdminServiceClient.from_service_account_file.__func__(IdentityAwareProxyAdminServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + IdentityAwareProxyAdminServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + IdentityAwareProxyAdminServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -192,7 +202,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return IdentityAwareProxyAdminServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return IdentityAwareProxyAdminServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> IdentityAwareProxyAdminServiceTransport: diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py index 1dfe7ab1e1f5..ab2e92b8e836 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iap_v1 import gapic_version as package_version @@ -85,13 +85,11 @@ class IdentityAwareProxyAdminServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[IdentityAwareProxyAdminServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[IdentityAwareProxyAdminServiceTransport]] _transport_registry["grpc"] = IdentityAwareProxyAdminServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = IdentityAwareProxyAdminServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + IdentityAwareProxyAdminServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = IdentityAwareProxyAdminServiceRestTransport def get_transport_class( @@ -660,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IdentityAwareProxyAdminServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IdentityAwareProxyAdminServiceClient._read_environment_variables() + ) self._client_cert_source = ( IdentityAwareProxyAdminServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -705,8 +701,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IdentityAwareProxyAdminServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/pagers.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/pagers.py index 81da253c87c8..6b8e85bb728b 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/pagers.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/__init__.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/__init__.py index d60fc8b6a338..cbd5c1a134f8 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/__init__.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[IdentityAwareProxyAdminServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[IdentityAwareProxyAdminServiceTransport]] _transport_registry["grpc"] = IdentityAwareProxyAdminServiceGrpcTransport _transport_registry["grpc_asyncio"] = IdentityAwareProxyAdminServiceGrpcAsyncIOTransport _transport_registry["rest"] = IdentityAwareProxyAdminServiceRestTransport diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/base.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/base.py index 22bb7d3f9653..8e00a0db708b 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/base.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core -from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1 -from google.api_core import retry as retries import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account # type: ignore import google.protobuf import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials # type: ignore +from google.oauth2 import service_account # type: ignore from google.cloud.iap_v1 import gapic_version as package_version from google.cloud.iap_v1.types import service diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc.py index cafdfa4c98ca..b3c9d4c0e2ec 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.iap_v1.types import service @@ -494,12 +494,12 @@ def validate_iap_attribute_expression( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "validate_iap_attribute_expression" not in self._stubs: - self._stubs[ - "validate_iap_attribute_expression" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyAdminService/ValidateIapAttributeExpression", - request_serializer=service.ValidateIapAttributeExpressionRequest.serialize, - response_deserializer=service.ValidateIapAttributeExpressionResponse.deserialize, + self._stubs["validate_iap_attribute_expression"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyAdminService/ValidateIapAttributeExpression", + request_serializer=service.ValidateIapAttributeExpressionRequest.serialize, + response_deserializer=service.ValidateIapAttributeExpressionResponse.deserialize, + ) ) return self._stubs["validate_iap_attribute_expression"] diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py index 96ab26010d8a..844c72bd568a 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py @@ -17,22 +17,22 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iap_v1.types import service @@ -502,12 +502,12 @@ def validate_iap_attribute_expression( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "validate_iap_attribute_expression" not in self._stubs: - self._stubs[ - "validate_iap_attribute_expression" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyAdminService/ValidateIapAttributeExpression", - request_serializer=service.ValidateIapAttributeExpressionRequest.serialize, - response_deserializer=service.ValidateIapAttributeExpressionResponse.deserialize, + self._stubs["validate_iap_attribute_expression"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyAdminService/ValidateIapAttributeExpression", + request_serializer=service.ValidateIapAttributeExpressionRequest.serialize, + response_deserializer=service.ValidateIapAttributeExpressionResponse.deserialize, + ) ) return self._stubs["validate_iap_attribute_expression"] diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest.py index 9a668afb4b7d..2b911fe856d0 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest.py @@ -16,19 +16,19 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore -import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.iap_v1.types import service @@ -813,9 +813,7 @@ def __call__( A TunnelDestGroup. """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseCreateTunnelDestGroup._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseCreateTunnelDestGroup._get_http_options() request, metadata = self._interceptor.pre_create_tunnel_dest_group( request, metadata @@ -963,9 +961,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseDeleteTunnelDestGroup._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseDeleteTunnelDestGroup._get_http_options() request, metadata = self._interceptor.pre_delete_tunnel_dest_group( request, metadata @@ -1152,9 +1148,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1304,9 +1298,7 @@ def __call__( The IAP configurable settings. """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseGetIapSettings._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseGetIapSettings._get_http_options() request, metadata = self._interceptor.pre_get_iap_settings( request, metadata @@ -1453,9 +1445,7 @@ def __call__( A TunnelDestGroup. """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseGetTunnelDestGroup._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseGetTunnelDestGroup._get_http_options() request, metadata = self._interceptor.pre_get_tunnel_dest_group( request, metadata @@ -1604,9 +1594,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseListTunnelDestGroups._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseListTunnelDestGroups._get_http_options() request, metadata = self._interceptor.pre_list_tunnel_dest_groups( request, metadata @@ -1829,9 +1817,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1984,9 +1970,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2138,9 +2122,7 @@ def __call__( The IAP configurable settings. """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseUpdateIapSettings._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseUpdateIapSettings._get_http_options() request, metadata = self._interceptor.pre_update_iap_settings( request, metadata @@ -2293,9 +2275,7 @@ def __call__( A TunnelDestGroup. """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseUpdateTunnelDestGroup._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseUpdateTunnelDestGroup._get_http_options() request, metadata = self._interceptor.pre_update_tunnel_dest_group( request, metadata @@ -2451,9 +2431,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseValidateIapAttributeExpression._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseValidateIapAttributeExpression._get_http_options() request, metadata = self._interceptor.pre_validate_iap_attribute_expression( request, metadata @@ -2517,11 +2495,10 @@ def __call__( resp = self._interceptor.post_validate_iap_attribute_expression(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_validate_iap_attribute_expression_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_validate_iap_attribute_expression_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2642,7 +2619,9 @@ def validate_iap_attribute_expression( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ValidateIapAttributeExpression(self._session, self._host, self._interceptor) # type: ignore + return self._ValidateIapAttributeExpression( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest_base.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest_base.py index 7556380acdfc..12ba3e312a08 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest_base.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.protobuf import json_format import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +from google.api_core import gapic_v1, path_template +from google.protobuf import json_format from google.cloud.iap_v1.types import service diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py index 509962b776e0..9af5b94cdfc3 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iap_v1 import gapic_version as package_version @@ -125,7 +125,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IdentityAwareProxyOAuthServiceAsyncClient: The constructed client. """ - return IdentityAwareProxyOAuthServiceClient.from_service_account_info.__func__(IdentityAwareProxyOAuthServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + IdentityAwareProxyOAuthServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func( + IdentityAwareProxyOAuthServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +146,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IdentityAwareProxyOAuthServiceAsyncClient: The constructed client. """ - return IdentityAwareProxyOAuthServiceClient.from_service_account_file.__func__(IdentityAwareProxyOAuthServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + IdentityAwareProxyOAuthServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func( + IdentityAwareProxyOAuthServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -179,7 +189,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return IdentityAwareProxyOAuthServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return IdentityAwareProxyOAuthServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> IdentityAwareProxyOAuthServiceTransport: diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py index d47945ba154c..72f267d7da1d 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iap_v1 import gapic_version as package_version @@ -81,13 +81,11 @@ class IdentityAwareProxyOAuthServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[IdentityAwareProxyOAuthServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[IdentityAwareProxyOAuthServiceTransport]] _transport_registry["grpc"] = IdentityAwareProxyOAuthServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = IdentityAwareProxyOAuthServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + IdentityAwareProxyOAuthServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = IdentityAwareProxyOAuthServiceRestTransport def get_transport_class( @@ -618,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IdentityAwareProxyOAuthServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IdentityAwareProxyOAuthServiceClient._read_environment_variables() + ) self._client_cert_source = ( IdentityAwareProxyOAuthServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -663,8 +659,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IdentityAwareProxyOAuthServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/pagers.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/pagers.py index 82117175c84c..7f1cd784156b 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/pagers.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/__init__.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/__init__.py index 27b55fc6102e..088601776ffc 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/__init__.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[IdentityAwareProxyOAuthServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[IdentityAwareProxyOAuthServiceTransport]] _transport_registry["grpc"] = IdentityAwareProxyOAuthServiceGrpcTransport _transport_registry["grpc_asyncio"] = IdentityAwareProxyOAuthServiceGrpcAsyncIOTransport _transport_registry["rest"] = IdentityAwareProxyOAuthServiceRestTransport diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/base.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/base.py index ac509b64081c..eee9a40f6d8b 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/base.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.iap_v1 import gapic_version as package_version from google.cloud.iap_v1.types import service diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc.py index cacfc81df238..59388695ac51 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # 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 import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.iap_v1.types import service @@ -435,12 +435,12 @@ def create_identity_aware_proxy_client( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_identity_aware_proxy_client" not in self._stubs: - self._stubs[ - "create_identity_aware_proxy_client" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/CreateIdentityAwareProxyClient", - request_serializer=service.CreateIdentityAwareProxyClientRequest.serialize, - response_deserializer=service.IdentityAwareProxyClient.deserialize, + self._stubs["create_identity_aware_proxy_client"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/CreateIdentityAwareProxyClient", + request_serializer=service.CreateIdentityAwareProxyClientRequest.serialize, + response_deserializer=service.IdentityAwareProxyClient.deserialize, + ) ) return self._stubs["create_identity_aware_proxy_client"] @@ -467,12 +467,12 @@ def list_identity_aware_proxy_clients( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_identity_aware_proxy_clients" not in self._stubs: - self._stubs[ - "list_identity_aware_proxy_clients" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ListIdentityAwareProxyClients", - request_serializer=service.ListIdentityAwareProxyClientsRequest.serialize, - response_deserializer=service.ListIdentityAwareProxyClientsResponse.deserialize, + self._stubs["list_identity_aware_proxy_clients"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ListIdentityAwareProxyClients", + request_serializer=service.ListIdentityAwareProxyClientsRequest.serialize, + response_deserializer=service.ListIdentityAwareProxyClientsResponse.deserialize, + ) ) return self._stubs["list_identity_aware_proxy_clients"] @@ -499,12 +499,12 @@ def get_identity_aware_proxy_client( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_identity_aware_proxy_client" not in self._stubs: - self._stubs[ - "get_identity_aware_proxy_client" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/GetIdentityAwareProxyClient", - request_serializer=service.GetIdentityAwareProxyClientRequest.serialize, - response_deserializer=service.IdentityAwareProxyClient.deserialize, + self._stubs["get_identity_aware_proxy_client"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/GetIdentityAwareProxyClient", + request_serializer=service.GetIdentityAwareProxyClientRequest.serialize, + response_deserializer=service.IdentityAwareProxyClient.deserialize, + ) ) return self._stubs["get_identity_aware_proxy_client"] @@ -533,12 +533,12 @@ def reset_identity_aware_proxy_client_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "reset_identity_aware_proxy_client_secret" not in self._stubs: - self._stubs[ - "reset_identity_aware_proxy_client_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ResetIdentityAwareProxyClientSecret", - request_serializer=service.ResetIdentityAwareProxyClientSecretRequest.serialize, - response_deserializer=service.IdentityAwareProxyClient.deserialize, + self._stubs["reset_identity_aware_proxy_client_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ResetIdentityAwareProxyClientSecret", + request_serializer=service.ResetIdentityAwareProxyClientSecretRequest.serialize, + response_deserializer=service.IdentityAwareProxyClient.deserialize, + ) ) return self._stubs["reset_identity_aware_proxy_client_secret"] @@ -565,12 +565,12 @@ def delete_identity_aware_proxy_client( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_identity_aware_proxy_client" not in self._stubs: - self._stubs[ - "delete_identity_aware_proxy_client" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/DeleteIdentityAwareProxyClient", - request_serializer=service.DeleteIdentityAwareProxyClientRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_identity_aware_proxy_client"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/DeleteIdentityAwareProxyClient", + request_serializer=service.DeleteIdentityAwareProxyClientRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_identity_aware_proxy_client"] diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py index 90aaee3b25cc..e39dfe41ca15 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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 -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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iap_v1.types import service @@ -447,12 +447,12 @@ def create_identity_aware_proxy_client( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_identity_aware_proxy_client" not in self._stubs: - self._stubs[ - "create_identity_aware_proxy_client" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/CreateIdentityAwareProxyClient", - request_serializer=service.CreateIdentityAwareProxyClientRequest.serialize, - response_deserializer=service.IdentityAwareProxyClient.deserialize, + self._stubs["create_identity_aware_proxy_client"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/CreateIdentityAwareProxyClient", + request_serializer=service.CreateIdentityAwareProxyClientRequest.serialize, + response_deserializer=service.IdentityAwareProxyClient.deserialize, + ) ) return self._stubs["create_identity_aware_proxy_client"] @@ -479,12 +479,12 @@ def list_identity_aware_proxy_clients( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_identity_aware_proxy_clients" not in self._stubs: - self._stubs[ - "list_identity_aware_proxy_clients" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ListIdentityAwareProxyClients", - request_serializer=service.ListIdentityAwareProxyClientsRequest.serialize, - response_deserializer=service.ListIdentityAwareProxyClientsResponse.deserialize, + self._stubs["list_identity_aware_proxy_clients"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ListIdentityAwareProxyClients", + request_serializer=service.ListIdentityAwareProxyClientsRequest.serialize, + response_deserializer=service.ListIdentityAwareProxyClientsResponse.deserialize, + ) ) return self._stubs["list_identity_aware_proxy_clients"] @@ -512,12 +512,12 @@ def get_identity_aware_proxy_client( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_identity_aware_proxy_client" not in self._stubs: - self._stubs[ - "get_identity_aware_proxy_client" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/GetIdentityAwareProxyClient", - request_serializer=service.GetIdentityAwareProxyClientRequest.serialize, - response_deserializer=service.IdentityAwareProxyClient.deserialize, + self._stubs["get_identity_aware_proxy_client"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/GetIdentityAwareProxyClient", + request_serializer=service.GetIdentityAwareProxyClientRequest.serialize, + response_deserializer=service.IdentityAwareProxyClient.deserialize, + ) ) return self._stubs["get_identity_aware_proxy_client"] @@ -546,12 +546,12 @@ def reset_identity_aware_proxy_client_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "reset_identity_aware_proxy_client_secret" not in self._stubs: - self._stubs[ - "reset_identity_aware_proxy_client_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ResetIdentityAwareProxyClientSecret", - request_serializer=service.ResetIdentityAwareProxyClientSecretRequest.serialize, - response_deserializer=service.IdentityAwareProxyClient.deserialize, + self._stubs["reset_identity_aware_proxy_client_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ResetIdentityAwareProxyClientSecret", + request_serializer=service.ResetIdentityAwareProxyClientSecretRequest.serialize, + response_deserializer=service.IdentityAwareProxyClient.deserialize, + ) ) return self._stubs["reset_identity_aware_proxy_client_secret"] @@ -580,12 +580,12 @@ def delete_identity_aware_proxy_client( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_identity_aware_proxy_client" not in self._stubs: - self._stubs[ - "delete_identity_aware_proxy_client" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/DeleteIdentityAwareProxyClient", - request_serializer=service.DeleteIdentityAwareProxyClientRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_identity_aware_proxy_client"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/DeleteIdentityAwareProxyClient", + request_serializer=service.DeleteIdentityAwareProxyClientRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_identity_aware_proxy_client"] diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest.py index a9b05bd865a4..ee92c9e8a726 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.iap_v1.types import service @@ -642,9 +642,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseCreateBrand._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseCreateBrand._get_http_options() request, metadata = self._interceptor.pre_create_brand(request, metadata) transcoded_request = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseCreateBrand._get_transcoded_request( @@ -801,15 +799,12 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseCreateIdentityAwareProxyClient._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseCreateIdentityAwareProxyClient._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_identity_aware_proxy_client( - request, metadata + request, metadata = ( + self._interceptor.pre_create_identity_aware_proxy_client( + request, metadata + ) ) transcoded_request = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseCreateIdentityAwareProxyClient._get_transcoded_request( http_options, request @@ -875,11 +870,10 @@ def __call__( resp = self._interceptor.post_create_identity_aware_proxy_client(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_identity_aware_proxy_client_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_identity_aware_proxy_client_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -961,15 +955,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseDeleteIdentityAwareProxyClient._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseDeleteIdentityAwareProxyClient._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_identity_aware_proxy_client( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_identity_aware_proxy_client( + request, metadata + ) ) transcoded_request = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseDeleteIdentityAwareProxyClient._get_transcoded_request( http_options, request @@ -1080,9 +1071,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseGetBrand._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseGetBrand._get_http_options() request, metadata = self._interceptor.pre_get_brand(request, metadata) transcoded_request = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseGetBrand._get_transcoded_request( @@ -1233,9 +1222,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseGetIdentityAwareProxyClient._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseGetIdentityAwareProxyClient._get_http_options() request, metadata = self._interceptor.pre_get_identity_aware_proxy_client( request, metadata @@ -1299,11 +1286,10 @@ def __call__( resp = self._interceptor.post_get_identity_aware_proxy_client(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_identity_aware_proxy_client_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_identity_aware_proxy_client_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1385,9 +1371,7 @@ def __call__( Response message for ListBrands. """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseListBrands._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseListBrands._get_http_options() request, metadata = self._interceptor.pre_list_brands(request, metadata) transcoded_request = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseListBrands._get_transcoded_request( @@ -1538,9 +1522,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseListIdentityAwareProxyClients._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseListIdentityAwareProxyClients._get_http_options() request, metadata = self._interceptor.pre_list_identity_aware_proxy_clients( request, metadata @@ -1604,11 +1586,10 @@ def __call__( resp = self._interceptor.post_list_identity_aware_proxy_clients(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_identity_aware_proxy_clients_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_identity_aware_proxy_clients_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1697,15 +1678,12 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseResetIdentityAwareProxyClientSecret._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseResetIdentityAwareProxyClientSecret._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_reset_identity_aware_proxy_client_secret( - request, metadata + request, metadata = ( + self._interceptor.pre_reset_identity_aware_proxy_client_secret( + request, metadata + ) ) transcoded_request = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseResetIdentityAwareProxyClientSecret._get_transcoded_request( http_options, request @@ -1771,11 +1749,10 @@ def __call__( resp = self._interceptor.post_reset_identity_aware_proxy_client_secret(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_reset_identity_aware_proxy_client_secret_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_reset_identity_aware_proxy_client_secret_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1817,7 +1794,9 @@ def create_identity_aware_proxy_client( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateIdentityAwareProxyClient(self._session, self._host, self._interceptor) # type: ignore + return self._CreateIdentityAwareProxyClient( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_identity_aware_proxy_client( @@ -1825,7 +1804,9 @@ def delete_identity_aware_proxy_client( ) -> Callable[[service.DeleteIdentityAwareProxyClientRequest], empty_pb2.Empty]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteIdentityAwareProxyClient(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteIdentityAwareProxyClient( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_brand(self) -> Callable[[service.GetBrandRequest], service.Brand]: @@ -1841,7 +1822,9 @@ def get_identity_aware_proxy_client( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetIdentityAwareProxyClient(self._session, self._host, self._interceptor) # type: ignore + return self._GetIdentityAwareProxyClient( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_brands( @@ -1860,7 +1843,9 @@ def list_identity_aware_proxy_clients( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListIdentityAwareProxyClients(self._session, self._host, self._interceptor) # type: ignore + return self._ListIdentityAwareProxyClients( + self._session, self._host, self._interceptor + ) # type: ignore @property def reset_identity_aware_proxy_client_secret( @@ -1871,7 +1856,9 @@ def reset_identity_aware_proxy_client_secret( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ResetIdentityAwareProxyClientSecret(self._session, self._host, self._interceptor) # type: ignore + return self._ResetIdentityAwareProxyClientSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest_base.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest_base.py index c08f295a7cca..27323320e2be 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest_base.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.iap_v1.types import service diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/types/service.py b/packages/google-cloud-iap/google/cloud/iap_v1/types/service.py index 619d9bff6aef..7c5db05fc493 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/types/service.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/types/service.py @@ -376,6 +376,7 @@ class IdentitySource(proto.Enum): Use external identities set up on Google Cloud Workforce Identity Federation. """ + IDENTITY_SOURCE_UNSPECIFIED = 0 WORKFORCE_IDENTITY_FEDERATION = 3 @@ -584,6 +585,7 @@ class Method(proto.Enum): ENROLLED_SECOND_FACTORS (4): User can use any enabled 2nd factor. """ + METHOD_UNSPECIFIED = 0 LOGIN = 1 PASSWORD = 2 @@ -604,6 +606,7 @@ class PolicyType(proto.Enum): This policy acts as a default if no other reauth policy is set. """ + POLICY_TYPE_UNSPECIFIED = 0 MINIMUM = 1 DEFAULT = 2 @@ -835,6 +838,7 @@ class OutputCredentials(proto.Enum): Propagate attributes in the RCToken of the form: ``"additional_claims": { "my_attribute": ["value1", "value2"] }`` """ + OUTPUT_CREDENTIALS_UNSPECIFIED = 0 HEADER = 1 JWT = 2 @@ -1005,12 +1009,12 @@ class ListIdentityAwareProxyClientsResponse(proto.Message): def raw_page(self): return self - identity_aware_proxy_clients: MutableSequence[ - "IdentityAwareProxyClient" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="IdentityAwareProxyClient", + identity_aware_proxy_clients: MutableSequence["IdentityAwareProxyClient"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="IdentityAwareProxyClient", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-iap/mypy.ini b/packages/google-cloud-iap/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-iap/mypy.ini +++ b/packages/google-cloud-iap/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-iap/noxfile.py b/packages/google-cloud-iap/noxfile.py index 6d4ee0ad99ff..da88510ea5fd 100644 --- a/packages/google-cloud-iap/noxfile.py +++ b/packages/google-cloud-iap/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_async.py b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_async.py index 34e4df1fb144..2127d4c72047 100644 --- a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_async.py +++ b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iap -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START iap_v1_generated_IdentityAwareProxyAdminService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iap_v1 diff --git a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_sync.py b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_sync.py index b9be61c543aa..d7d383abec87 100644 --- a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_sync.py +++ b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iap -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START iap_v1_generated_IdentityAwareProxyAdminService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iap_v1 diff --git a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_async.py b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_async.py index 14932fc2f720..b6b4b9633050 100644 --- a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_async.py +++ b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iap -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START iap_v1_generated_IdentityAwareProxyAdminService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iap_v1 diff --git a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_sync.py b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_sync.py index 07ea167a5eb1..d684b6046c50 100644 --- a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_sync.py +++ b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iap -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START iap_v1_generated_IdentityAwareProxyAdminService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iap_v1 diff --git a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_async.py b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_async.py index 4ac8a74ce904..910c8d75dd47 100644 --- a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_async.py +++ b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iap -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START iap_v1_generated_IdentityAwareProxyAdminService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iap_v1 diff --git a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_sync.py b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_sync.py index a4b3dfc32cc8..b2743d9fd242 100644 --- a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iap -import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore - # [START iap_v1_generated_IdentityAwareProxyAdminService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iap_v1 diff --git a/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py b/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py index cb846a0133b2..17f4dfa39c92 100644 --- a/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py +++ b/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,21 +43,26 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -from google.api_core import retry as retries import google.auth -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore import google.iam.v1.options_pb2 as options_pb2 # type: ignore import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore -from google.oauth2 import service_account 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.wrappers_pb2 as wrappers_pb2 # type: ignore import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account from google.cloud.iap_v1.services.identity_aware_proxy_admin_service import ( IdentityAwareProxyAdminServiceAsyncClient, @@ -1059,10 +1064,9 @@ def test_identity_aware_proxy_admin_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1107,10 +1111,9 @@ def test_identity_aware_proxy_admin_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1146,10 +1149,9 @@ def test_identity_aware_proxy_admin_service_client_get_mtls_endpoint_and_cert_so "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1414,9 +1416,7 @@ def test_identity_aware_proxy_admin_service_client_create_channel_credentials_fi google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2050,9 +2050,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -2319,9 +2319,9 @@ def test_get_iap_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_iap_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_iap_settings] = ( + mock_rpc + ) request = {} client.get_iap_settings(request) @@ -2562,9 +2562,9 @@ def test_update_iap_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_iap_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_iap_settings] = ( + mock_rpc + ) request = {} client.update_iap_settings(request) @@ -3991,9 +3991,9 @@ def test_get_tunnel_dest_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tunnel_dest_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tunnel_dest_group] = ( + mock_rpc + ) request = {} client.get_tunnel_dest_group(request) @@ -5200,9 +5200,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5333,9 +5333,9 @@ def test_get_iap_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_iap_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_iap_settings] = ( + mock_rpc + ) request = {} client.get_iap_settings(request) @@ -5457,9 +5457,9 @@ def test_update_iap_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_iap_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_iap_settings] = ( + mock_rpc + ) request = {} client.update_iap_settings(request) @@ -6207,9 +6207,9 @@ def test_get_tunnel_dest_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tunnel_dest_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tunnel_dest_group] = ( + mock_rpc + ) request = {} client.get_tunnel_dest_group(request) diff --git a/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_o_auth_service.py b/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_o_auth_service.py index fbb1dda8127a..b4c5d79575dd 100644 --- a/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_o_auth_service.py +++ b/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_o_auth_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -1052,10 +1057,9 @@ def test_identity_aware_proxy_o_auth_service_client_get_mtls_endpoint_and_cert_s client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1104,9 @@ def test_identity_aware_proxy_o_auth_service_client_get_mtls_endpoint_and_cert_s client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1139,10 +1142,9 @@ def test_identity_aware_proxy_o_auth_service_client_get_mtls_endpoint_and_cert_s "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1407,9 +1409,7 @@ def test_identity_aware_proxy_o_auth_service_client_create_channel_credentials_f google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/__init__.py b/packages/google-cloud-ids/google/cloud/ids_v1/__init__.py index 5bee133ded7e..ba8ca02fee5e 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/__init__.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.ids import IDSAsyncClient, IDSClient from .types.ids import ( CreateEndpointRequest, diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/async_client.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/async_client.py index f3354814de6a..eb6a45ce0b59 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/async_client.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.ids_v1 import gapic_version as package_version @@ -109,7 +109,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IDSAsyncClient: The constructed client. """ - return IDSClient.from_service_account_info.__func__(IDSAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + IDSClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(IDSAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -125,7 +128,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IDSAsyncClient: The constructed client. """ - return IDSClient.from_service_account_file.__func__(IDSAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + IDSClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(IDSAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/client.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/client.py index 6160fd2c5484..5e049f0af09c 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/client.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.ids_v1 import gapic_version as package_version @@ -624,11 +624,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IDSClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IDSClient._read_environment_variables() + ) self._client_cert_source = IDSClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -663,8 +661,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IDSTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/pagers.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/pagers.py index 61f86810a0a3..757794e65887 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/pagers.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/base.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/base.py index e6ebc6d5cbcf..098d712a5b77 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/base.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.ids_v1 import gapic_version as package_version from google.cloud.ids_v1.types import ids diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc.py index ec028e549559..4ab8c06401dc 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.ids_v1.types import ids diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc_asyncio.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc_asyncio.py index 4fbd7f8180fe..d245f05b5894 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc_asyncio.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.ids_v1.types import ids diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/rest.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/rest.py index d1f27482e838..6beb4c6f2585 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/rest.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/types/ids.py b/packages/google-cloud-ids/google/cloud/ids_v1/types/ids.py index 43e9bc9f85d8..49fc48d2bcdb 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/types/ids.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/types/ids.py @@ -85,6 +85,7 @@ class Severity(proto.Enum): CRITICAL (5): Critical severity alerts. """ + SEVERITY_UNSPECIFIED = 0 INFORMATIONAL = 1 LOW = 2 @@ -105,6 +106,7 @@ class State(proto.Enum): DELETING (3): Being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 diff --git a/packages/google-cloud-ids/mypy.ini b/packages/google-cloud-ids/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-ids/mypy.ini +++ b/packages/google-cloud-ids/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-ids/noxfile.py b/packages/google-cloud-ids/noxfile.py index 49b5f9cb54d1..5d723f18dc9e 100644 --- a/packages/google-cloud-ids/noxfile.py +++ b/packages/google-cloud-ids/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-ids/tests/unit/gapic/ids_v1/test_ids.py b/packages/google-cloud-ids/tests/unit/gapic/ids_v1/test_ids.py index 0ded189cc80a..edf8f84f1c8c 100644 --- a/packages/google-cloud-ids/tests/unit/gapic/ids_v1/test_ids.py +++ b/packages/google-cloud-ids/tests/unit/gapic/ids_v1/test_ids.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -44,7 +44,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,17 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.ids_v1.services.ids import ( IDSAsyncClient, @@ -881,10 +881,9 @@ def test_ids_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_ids_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_ids_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1198,9 +1195,7 @@ def test_ids_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/__init__.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/__init__.py index f7f5cf214e12..c42fdd83a082 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/__init__.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.key_dashboard_service import ( KeyDashboardServiceAsyncClient, KeyDashboardServiceClient, diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/async_client.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/async_client.py index 1265f4cc0b6f..df377724485c 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/async_client.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_inventory_v1 import gapic_version as package_version @@ -125,7 +125,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: KeyDashboardServiceAsyncClient: The constructed client. """ - return KeyDashboardServiceClient.from_service_account_info.__func__(KeyDashboardServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + KeyDashboardServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(KeyDashboardServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +144,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: KeyDashboardServiceAsyncClient: The constructed client. """ - return KeyDashboardServiceClient.from_service_account_file.__func__(KeyDashboardServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + KeyDashboardServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(KeyDashboardServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -179,7 +185,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return KeyDashboardServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return KeyDashboardServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> KeyDashboardServiceTransport: diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/client.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/client.py index c8388a3a559f..5806a8e39835 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/client.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_inventory_v1 import gapic_version as package_version @@ -80,9 +80,7 @@ class KeyDashboardServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[KeyDashboardServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[KeyDashboardServiceTransport]] _transport_registry["grpc"] = KeyDashboardServiceGrpcTransport _transport_registry["grpc_asyncio"] = KeyDashboardServiceGrpcAsyncIOTransport _transport_registry["rest"] = KeyDashboardServiceRestTransport @@ -656,11 +654,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = KeyDashboardServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + KeyDashboardServiceClient._read_environment_variables() + ) self._client_cert_source = KeyDashboardServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -695,8 +691,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(KeyDashboardServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/pagers.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/pagers.py index 70f65f5351e6..cc2990dd6b45 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/pagers.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/pagers.py @@ -69,7 +69,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/__init__.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/__init__.py index 4d2babaf1df2..ec7a4be11c1e 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/__init__.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import KeyDashboardServiceRestInterceptor, KeyDashboardServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[KeyDashboardServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[KeyDashboardServiceTransport]] _transport_registry["grpc"] = KeyDashboardServiceGrpcTransport _transport_registry["grpc_asyncio"] = KeyDashboardServiceGrpcAsyncIOTransport _transport_registry["rest"] = KeyDashboardServiceRestTransport diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/base.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/base.py index eac83c97793b..f5479548f6f4 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/base.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_inventory_v1 import gapic_version as package_version from google.cloud.kms_inventory_v1.types import key_dashboard_service diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc.py index 5ac80383b31c..ef33b871ce3d 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.kms_inventory_v1.types import key_dashboard_service diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc_asyncio.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc_asyncio.py index 205eff91e547..3d9078c264b1 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.kms_inventory_v1.types import key_dashboard_service diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/rest.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/rest.py index 7a33ef3ee2c2..82639373a614 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/rest.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -285,9 +285,7 @@ def __call__( """ - http_options = ( - _BaseKeyDashboardServiceRestTransport._BaseListCryptoKeys._get_http_options() - ) + http_options = _BaseKeyDashboardServiceRestTransport._BaseListCryptoKeys._get_http_options() request, metadata = self._interceptor.pre_list_crypto_keys( request, metadata diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/async_client.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/async_client.py index 15da5e3918f7..e823c7f459eb 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/async_client.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_inventory_v1 import gapic_version as package_version @@ -127,7 +127,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: KeyTrackingServiceAsyncClient: The constructed client. """ - return KeyTrackingServiceClient.from_service_account_info.__func__(KeyTrackingServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + KeyTrackingServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(KeyTrackingServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +146,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: KeyTrackingServiceAsyncClient: The constructed client. """ - return KeyTrackingServiceClient.from_service_account_file.__func__(KeyTrackingServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + KeyTrackingServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(KeyTrackingServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +187,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return KeyTrackingServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return KeyTrackingServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> KeyTrackingServiceTransport: diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/client.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/client.py index f6c5306efb89..f62c9ed37eb0 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/client.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_inventory_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class KeyTrackingServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[KeyTrackingServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[KeyTrackingServiceTransport]] _transport_registry["grpc"] = KeyTrackingServiceGrpcTransport _transport_registry["grpc_asyncio"] = KeyTrackingServiceGrpcAsyncIOTransport _transport_registry["rest"] = KeyTrackingServiceRestTransport @@ -665,11 +663,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = KeyTrackingServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + KeyTrackingServiceClient._read_environment_variables() + ) self._client_cert_source = KeyTrackingServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -704,8 +700,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(KeyTrackingServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/pagers.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/pagers.py index c8b7d91c2578..3af1e71c02d5 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/pagers.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/__init__.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/__init__.py index 6885548188e8..b45f8e5a0f50 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/__init__.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import KeyTrackingServiceRestInterceptor, KeyTrackingServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[KeyTrackingServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[KeyTrackingServiceTransport]] _transport_registry["grpc"] = KeyTrackingServiceGrpcTransport _transport_registry["grpc_asyncio"] = KeyTrackingServiceGrpcAsyncIOTransport _transport_registry["rest"] = KeyTrackingServiceRestTransport diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/base.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/base.py index 99e512ec6276..b523f397c504 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/base.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_inventory_v1 import gapic_version as package_version from google.cloud.kms_inventory_v1.types import key_tracking_service diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc.py index 07ad07f64131..0a83aa6d0ecd 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.kms_inventory_v1.types import key_tracking_service @@ -349,12 +349,12 @@ def get_protected_resources_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_protected_resources_summary" not in self._stubs: - self._stubs[ - "get_protected_resources_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.inventory.v1.KeyTrackingService/GetProtectedResourcesSummary", - request_serializer=key_tracking_service.GetProtectedResourcesSummaryRequest.serialize, - response_deserializer=key_tracking_service.ProtectedResourcesSummary.deserialize, + self._stubs["get_protected_resources_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.inventory.v1.KeyTrackingService/GetProtectedResourcesSummary", + request_serializer=key_tracking_service.GetProtectedResourcesSummaryRequest.serialize, + response_deserializer=key_tracking_service.ProtectedResourcesSummary.deserialize, + ) ) return self._stubs["get_protected_resources_summary"] @@ -382,12 +382,12 @@ def search_protected_resources( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_protected_resources" not in self._stubs: - self._stubs[ - "search_protected_resources" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.inventory.v1.KeyTrackingService/SearchProtectedResources", - request_serializer=key_tracking_service.SearchProtectedResourcesRequest.serialize, - response_deserializer=key_tracking_service.SearchProtectedResourcesResponse.deserialize, + self._stubs["search_protected_resources"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.inventory.v1.KeyTrackingService/SearchProtectedResources", + request_serializer=key_tracking_service.SearchProtectedResourcesRequest.serialize, + response_deserializer=key_tracking_service.SearchProtectedResourcesResponse.deserialize, + ) ) return self._stubs["search_protected_resources"] diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc_asyncio.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc_asyncio.py index 11f264dd00c4..31bc5c107099 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.kms_inventory_v1.types import key_tracking_service @@ -357,12 +357,12 @@ def get_protected_resources_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_protected_resources_summary" not in self._stubs: - self._stubs[ - "get_protected_resources_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.inventory.v1.KeyTrackingService/GetProtectedResourcesSummary", - request_serializer=key_tracking_service.GetProtectedResourcesSummaryRequest.serialize, - response_deserializer=key_tracking_service.ProtectedResourcesSummary.deserialize, + self._stubs["get_protected_resources_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.inventory.v1.KeyTrackingService/GetProtectedResourcesSummary", + request_serializer=key_tracking_service.GetProtectedResourcesSummaryRequest.serialize, + response_deserializer=key_tracking_service.ProtectedResourcesSummary.deserialize, + ) ) return self._stubs["get_protected_resources_summary"] @@ -390,12 +390,12 @@ def search_protected_resources( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_protected_resources" not in self._stubs: - self._stubs[ - "search_protected_resources" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.inventory.v1.KeyTrackingService/SearchProtectedResources", - request_serializer=key_tracking_service.SearchProtectedResourcesRequest.serialize, - response_deserializer=key_tracking_service.SearchProtectedResourcesResponse.deserialize, + self._stubs["search_protected_resources"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.inventory.v1.KeyTrackingService/SearchProtectedResources", + request_serializer=key_tracking_service.SearchProtectedResourcesRequest.serialize, + response_deserializer=key_tracking_service.SearchProtectedResourcesResponse.deserialize, + ) ) return self._stubs["search_protected_resources"] diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/rest.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/rest.py index ad9e0a8631e0..2f3adb2620d1 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/rest.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -348,9 +348,7 @@ def __call__( """ - http_options = ( - _BaseKeyTrackingServiceRestTransport._BaseGetProtectedResourcesSummary._get_http_options() - ) + http_options = _BaseKeyTrackingServiceRestTransport._BaseGetProtectedResourcesSummary._get_http_options() request, metadata = self._interceptor.pre_get_protected_resources_summary( request, metadata @@ -414,11 +412,10 @@ def __call__( resp = self._interceptor.post_get_protected_resources_summary(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_protected_resources_summary_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_protected_resources_summary_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -504,9 +501,7 @@ def __call__( """ - http_options = ( - _BaseKeyTrackingServiceRestTransport._BaseSearchProtectedResources._get_http_options() - ) + http_options = _BaseKeyTrackingServiceRestTransport._BaseSearchProtectedResources._get_http_options() request, metadata = self._interceptor.pre_search_protected_resources( request, metadata @@ -611,7 +606,9 @@ def get_protected_resources_summary( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetProtectedResourcesSummary(self._session, self._host, self._interceptor) # type: ignore + return self._GetProtectedResourcesSummary( + self._session, self._host, self._interceptor + ) # type: ignore @property def search_protected_resources( @@ -622,7 +619,9 @@ def search_protected_resources( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SearchProtectedResources(self._session, self._host, self._interceptor) # type: ignore + return self._SearchProtectedResources( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/__init__.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/__init__.py index 76f11b5eb4f3..6adabccaa191 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/__init__.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .key_dashboard_service import ListCryptoKeysRequest, ListCryptoKeysResponse +from .key_dashboard_service import ( + ListCryptoKeysRequest, + ListCryptoKeysResponse, +) from .key_tracking_service import ( GetProtectedResourcesSummaryRequest, ProtectedResource, diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/key_dashboard_service.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/key_dashboard_service.py index da4dd9d3c5e9..0b576891be2c 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/key_dashboard_service.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/key_dashboard_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.cloud.kms_v1.types import resources import proto # type: ignore +from google.cloud.kms_v1.types import resources __protobuf__ = proto.module( package="google.cloud.kms.inventory.v1", diff --git a/packages/google-cloud-kms-inventory/mypy.ini b/packages/google-cloud-kms-inventory/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-kms-inventory/mypy.ini +++ b/packages/google-cloud-kms-inventory/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-kms-inventory/noxfile.py b/packages/google-cloud-kms-inventory/noxfile.py index faed902abea9..db2d13a6f1ed 100644 --- a/packages/google-cloud-kms-inventory/noxfile.py +++ b/packages/google-cloud-kms-inventory/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_dashboard_service.py b/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_dashboard_service.py index 06d773014833..181bff2be9a2 100644 --- a/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_dashboard_service.py +++ b/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_dashboard_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.kms_v1.types import resources @@ -993,10 +998,9 @@ def test_key_dashboard_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1045,9 @@ def test_key_dashboard_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1083,9 @@ def test_key_dashboard_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1343,9 +1345,7 @@ def test_key_dashboard_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1454,9 +1454,9 @@ def test_list_crypto_keys_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_crypto_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_crypto_keys] = ( + mock_rpc + ) request = {} client.list_crypto_keys(request) @@ -1910,9 +1910,9 @@ def test_list_crypto_keys_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_crypto_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_crypto_keys] = ( + mock_rpc + ) request = {} client.list_crypto_keys(request) diff --git a/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_tracking_service.py b/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_tracking_service.py index 751f2b3d2ab6..90d5bc8d7a27 100644 --- a/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_tracking_service.py +++ b/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_tracking_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -982,10 +987,9 @@ def test_key_tracking_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1034,9 @@ def test_key_tracking_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1069,10 +1072,9 @@ def test_key_tracking_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1324,9 +1326,7 @@ def test_key_tracking_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/__init__.py b/packages/google-cloud-kms/google/cloud/kms_v1/__init__.py index c0d6c2ba0736..9979c1a22145 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/__init__.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.autokey import AutokeyAsyncClient, AutokeyClient from .services.autokey_admin import AutokeyAdminAsyncClient, AutokeyAdminClient from .services.ekm_service import EkmServiceAsyncClient, EkmServiceClient diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/async_client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/async_client.py index 0e0be7bd9374..59e0011c56ce 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/async_client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -47,8 +47,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.kms_v1.services.autokey import pagers @@ -133,7 +135,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AutokeyAsyncClient: The constructed client. """ - return AutokeyClient.from_service_account_info.__func__(AutokeyAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AutokeyClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AutokeyAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +154,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AutokeyAsyncClient: The constructed client. """ - return AutokeyClient.from_service_account_file.__func__(AutokeyAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AutokeyClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AutokeyAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/client.py index f86b9eb58c98..e25ab1860929 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -64,8 +64,10 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.kms_v1.services.autokey import pagers @@ -668,11 +670,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutokeyClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutokeyClient._read_environment_variables() + ) self._client_cert_source = AutokeyClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -707,8 +707,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutokeyTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/pagers.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/pagers.py index ea05adf77870..7d34d7102cee 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/pagers.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/base.py index 407a7b0235d2..eca91a4262b7 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version from google.cloud.kms_v1.types import autokey diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc.py index e3546890b1ab..de1d7dcc4825 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import autokey diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc_asyncio.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc_asyncio.py index 015cc9c8f787..d3685df1bcd3 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc_asyncio.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import autokey diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest.py index 812500fa2c6a..facbd9cbdf4b 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest_base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest_base.py index 2dbf59119ee4..170f9d6f52eb 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest_base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/async_client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/async_client.py index 09f15d07c4c9..87c6b782db0f 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/async_client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -44,11 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.kms_v1.types import autokey_admin @@ -125,7 +127,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AutokeyAdminAsyncClient: The constructed client. """ - return AutokeyAdminClient.from_service_account_info.__func__(AutokeyAdminAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AutokeyAdminClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(AutokeyAdminAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +146,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AutokeyAdminAsyncClient: The constructed client. """ - return AutokeyAdminClient.from_service_account_file.__func__(AutokeyAdminAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AutokeyAdminClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(AutokeyAdminAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/client.py index b94af893b3a7..2363f9f29071 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -61,11 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.kms_v1.types import autokey_admin @@ -625,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutokeyAdminClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutokeyAdminClient._read_environment_variables() + ) self._client_cert_source = AutokeyAdminClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutokeyAdminTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/base.py index 4a02a2d05683..3bd926bfb804 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version from google.cloud.kms_v1.types import autokey_admin diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc.py index 7c74a5d8b92f..ba2b16085a0a 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import autokey_admin @@ -419,12 +421,12 @@ def show_effective_autokey_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "show_effective_autokey_config" not in self._stubs: - self._stubs[ - "show_effective_autokey_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.AutokeyAdmin/ShowEffectiveAutokeyConfig", - request_serializer=autokey_admin.ShowEffectiveAutokeyConfigRequest.serialize, - response_deserializer=autokey_admin.ShowEffectiveAutokeyConfigResponse.deserialize, + self._stubs["show_effective_autokey_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.AutokeyAdmin/ShowEffectiveAutokeyConfig", + request_serializer=autokey_admin.ShowEffectiveAutokeyConfigRequest.serialize, + response_deserializer=autokey_admin.ShowEffectiveAutokeyConfigResponse.deserialize, + ) ) return self._stubs["show_effective_autokey_config"] diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc_asyncio.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc_asyncio.py index 5df7dd62d0e8..5795a8d27ab2 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc_asyncio.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import autokey_admin @@ -430,12 +432,12 @@ def show_effective_autokey_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "show_effective_autokey_config" not in self._stubs: - self._stubs[ - "show_effective_autokey_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.AutokeyAdmin/ShowEffectiveAutokeyConfig", - request_serializer=autokey_admin.ShowEffectiveAutokeyConfigRequest.serialize, - response_deserializer=autokey_admin.ShowEffectiveAutokeyConfigResponse.deserialize, + self._stubs["show_effective_autokey_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.AutokeyAdmin/ShowEffectiveAutokeyConfig", + request_serializer=autokey_admin.ShowEffectiveAutokeyConfigRequest.serialize, + response_deserializer=autokey_admin.ShowEffectiveAutokeyConfigResponse.deserialize, + ) ) return self._stubs["show_effective_autokey_config"] diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest.py index d6e6b91f19f2..624dbd768e92 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -706,9 +708,7 @@ def __call__( """ - http_options = ( - _BaseAutokeyAdminRestTransport._BaseShowEffectiveAutokeyConfig._get_http_options() - ) + http_options = _BaseAutokeyAdminRestTransport._BaseShowEffectiveAutokeyConfig._get_http_options() request, metadata = self._interceptor.pre_show_effective_autokey_config( request, metadata @@ -774,11 +774,10 @@ def __call__( resp = self._interceptor.post_show_effective_autokey_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_show_effective_autokey_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_show_effective_autokey_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -865,9 +864,7 @@ def __call__( """ - http_options = ( - _BaseAutokeyAdminRestTransport._BaseUpdateAutokeyConfig._get_http_options() - ) + http_options = _BaseAutokeyAdminRestTransport._BaseUpdateAutokeyConfig._get_http_options() request, metadata = self._interceptor.pre_update_autokey_config( request, metadata @@ -979,7 +976,9 @@ def show_effective_autokey_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ShowEffectiveAutokeyConfig(self._session, self._host, self._interceptor) # type: ignore + return self._ShowEffectiveAutokeyConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_autokey_config( @@ -1625,9 +1624,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseAutokeyAdminRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseAutokeyAdminRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest_base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest_base.py index 7a05103d4187..9e61f4cbe3e1 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest_base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/async_client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/async_client.py index b2d9ef42571f..8124a6381d23 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/async_client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -44,12 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.kms_v1.services.ekm_service import pagers from google.cloud.kms_v1.types import ekm_service @@ -124,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EkmServiceAsyncClient: The constructed client. """ - return EkmServiceClient.from_service_account_info.__func__(EkmServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EkmServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(EkmServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +145,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EkmServiceAsyncClient: The constructed client. """ - return EkmServiceClient.from_service_account_file.__func__(EkmServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EkmServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(EkmServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/client.py index ce8c9cb5fcd7..b9d3563133d5 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -61,12 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_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 google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.kms_v1.services.ekm_service import pagers from google.cloud.kms_v1.types import ekm_service @@ -674,11 +676,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EkmServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EkmServiceClient._read_environment_variables() + ) self._client_cert_source = EkmServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -713,8 +713,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EkmServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/pagers.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/pagers.py index 571042cec93f..bfb80848f2a0 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/pagers.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/base.py index b7f9c8852efc..b5cfc6f258a9 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version from google.cloud.kms_v1.types import ekm_service diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc.py index 0dd5b58430d9..9b6d010d000f 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import ekm_service diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc_asyncio.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc_asyncio.py index 89f2f2ae83b2..5f57fcdb1443 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import ekm_service diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest.py index ff9f7ecbbd6c..44fc0a4cfc22 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -786,9 +788,7 @@ def __call__( """ - http_options = ( - _BaseEkmServiceRestTransport._BaseCreateEkmConnection._get_http_options() - ) + http_options = _BaseEkmServiceRestTransport._BaseCreateEkmConnection._get_http_options() request, metadata = self._interceptor.pre_create_ekm_connection( request, metadata @@ -1583,9 +1583,7 @@ def __call__( """ - http_options = ( - _BaseEkmServiceRestTransport._BaseUpdateEkmConnection._get_http_options() - ) + http_options = _BaseEkmServiceRestTransport._BaseUpdateEkmConnection._get_http_options() request, metadata = self._interceptor.pre_update_ekm_connection( request, metadata diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest_base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest_base.py index 839aa836355d..069b63c5249c 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest_base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/async_client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/async_client.py index 3dfbb4fc4788..32bae7238a69 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/async_client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -46,12 +46,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.kms_v1.services.hsm_management import pagers from google.cloud.kms_v1.types import hsm_management @@ -140,7 +142,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: HsmManagementAsyncClient: The constructed client. """ - return HsmManagementClient.from_service_account_info.__func__(HsmManagementAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + HsmManagementClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(HsmManagementAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -156,7 +161,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: HsmManagementAsyncClient: The constructed client. """ - return HsmManagementClient.from_service_account_file.__func__(HsmManagementAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + HsmManagementClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(HsmManagementAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/client.py index 394d2215cdcb..4f4df1b2694d 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -63,12 +63,14 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.kms_v1.services.hsm_management import pagers from google.cloud.kms_v1.types import hsm_management @@ -659,11 +661,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = HsmManagementClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + HsmManagementClient._read_environment_variables() + ) self._client_cert_source = HsmManagementClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -698,8 +698,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(HsmManagementTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/pagers.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/pagers.py index 8ddb79e3b47e..724fef8b16eb 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/pagers.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/base.py index 76fcb2b48315..18e5ee97abb5 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.kms_v1 import gapic_version as package_version from google.cloud.kms_v1.types import hsm_management diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc.py index 1c81ed0b71b7..a5f3a3d90f10 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 -import proto # type: ignore from google.cloud.kms_v1.types import hsm_management @@ -374,12 +376,12 @@ def list_single_tenant_hsm_instances( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_single_tenant_hsm_instances" not in self._stubs: - self._stubs[ - "list_single_tenant_hsm_instances" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstances", - request_serializer=hsm_management.ListSingleTenantHsmInstancesRequest.serialize, - response_deserializer=hsm_management.ListSingleTenantHsmInstancesResponse.deserialize, + self._stubs["list_single_tenant_hsm_instances"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstances", + request_serializer=hsm_management.ListSingleTenantHsmInstancesRequest.serialize, + response_deserializer=hsm_management.ListSingleTenantHsmInstancesResponse.deserialize, + ) ) return self._stubs["list_single_tenant_hsm_instances"] @@ -406,12 +408,12 @@ def get_single_tenant_hsm_instance( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_single_tenant_hsm_instance" not in self._stubs: - self._stubs[ - "get_single_tenant_hsm_instance" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstance", - request_serializer=hsm_management.GetSingleTenantHsmInstanceRequest.serialize, - response_deserializer=hsm_management.SingleTenantHsmInstance.deserialize, + self._stubs["get_single_tenant_hsm_instance"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstance", + request_serializer=hsm_management.GetSingleTenantHsmInstanceRequest.serialize, + response_deserializer=hsm_management.SingleTenantHsmInstance.deserialize, + ) ) return self._stubs["get_single_tenant_hsm_instance"] @@ -441,12 +443,12 @@ def create_single_tenant_hsm_instance( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_single_tenant_hsm_instance" not in self._stubs: - self._stubs[ - "create_single_tenant_hsm_instance" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstance", - request_serializer=hsm_management.CreateSingleTenantHsmInstanceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_single_tenant_hsm_instance"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstance", + request_serializer=hsm_management.CreateSingleTenantHsmInstanceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_single_tenant_hsm_instance"] @@ -476,12 +478,12 @@ def create_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "create_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.CreateSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.CreateSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_single_tenant_hsm_instance_proposal"] @@ -514,12 +516,12 @@ def approve_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "approve_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "approve_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ApproveSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=hsm_management.ApproveSingleTenantHsmInstanceProposalResponse.deserialize, + self._stubs["approve_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ApproveSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=hsm_management.ApproveSingleTenantHsmInstanceProposalResponse.deserialize, + ) ) return self._stubs["approve_single_tenant_hsm_instance_proposal"] @@ -552,12 +554,12 @@ def execute_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "execute_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "execute_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ExecuteSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.ExecuteSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["execute_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ExecuteSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.ExecuteSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["execute_single_tenant_hsm_instance_proposal"] @@ -585,12 +587,12 @@ def get_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "get_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.GetSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=hsm_management.SingleTenantHsmInstanceProposal.deserialize, + self._stubs["get_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.GetSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=hsm_management.SingleTenantHsmInstanceProposal.deserialize, + ) ) return self._stubs["get_single_tenant_hsm_instance_proposal"] @@ -618,12 +620,12 @@ def list_single_tenant_hsm_instance_proposals( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_single_tenant_hsm_instance_proposals" not in self._stubs: - self._stubs[ - "list_single_tenant_hsm_instance_proposals" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstanceProposals", - request_serializer=hsm_management.ListSingleTenantHsmInstanceProposalsRequest.serialize, - response_deserializer=hsm_management.ListSingleTenantHsmInstanceProposalsResponse.deserialize, + self._stubs["list_single_tenant_hsm_instance_proposals"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstanceProposals", + request_serializer=hsm_management.ListSingleTenantHsmInstanceProposalsRequest.serialize, + response_deserializer=hsm_management.ListSingleTenantHsmInstanceProposalsResponse.deserialize, + ) ) return self._stubs["list_single_tenant_hsm_instance_proposals"] @@ -650,12 +652,12 @@ def delete_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "delete_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/DeleteSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.DeleteSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/DeleteSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.DeleteSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_single_tenant_hsm_instance_proposal"] diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc_asyncio.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc_asyncio.py index 64dab8fcbc08..4ce8d3b2f0da 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc_asyncio.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_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 from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import hsm_management @@ -382,12 +384,12 @@ def list_single_tenant_hsm_instances( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_single_tenant_hsm_instances" not in self._stubs: - self._stubs[ - "list_single_tenant_hsm_instances" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstances", - request_serializer=hsm_management.ListSingleTenantHsmInstancesRequest.serialize, - response_deserializer=hsm_management.ListSingleTenantHsmInstancesResponse.deserialize, + self._stubs["list_single_tenant_hsm_instances"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstances", + request_serializer=hsm_management.ListSingleTenantHsmInstancesRequest.serialize, + response_deserializer=hsm_management.ListSingleTenantHsmInstancesResponse.deserialize, + ) ) return self._stubs["list_single_tenant_hsm_instances"] @@ -414,12 +416,12 @@ def get_single_tenant_hsm_instance( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_single_tenant_hsm_instance" not in self._stubs: - self._stubs[ - "get_single_tenant_hsm_instance" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstance", - request_serializer=hsm_management.GetSingleTenantHsmInstanceRequest.serialize, - response_deserializer=hsm_management.SingleTenantHsmInstance.deserialize, + self._stubs["get_single_tenant_hsm_instance"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstance", + request_serializer=hsm_management.GetSingleTenantHsmInstanceRequest.serialize, + response_deserializer=hsm_management.SingleTenantHsmInstance.deserialize, + ) ) return self._stubs["get_single_tenant_hsm_instance"] @@ -450,12 +452,12 @@ def create_single_tenant_hsm_instance( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_single_tenant_hsm_instance" not in self._stubs: - self._stubs[ - "create_single_tenant_hsm_instance" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstance", - request_serializer=hsm_management.CreateSingleTenantHsmInstanceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_single_tenant_hsm_instance"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstance", + request_serializer=hsm_management.CreateSingleTenantHsmInstanceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_single_tenant_hsm_instance"] @@ -485,12 +487,12 @@ def create_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "create_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.CreateSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.CreateSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_single_tenant_hsm_instance_proposal"] @@ -523,12 +525,12 @@ def approve_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "approve_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "approve_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ApproveSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=hsm_management.ApproveSingleTenantHsmInstanceProposalResponse.deserialize, + self._stubs["approve_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ApproveSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=hsm_management.ApproveSingleTenantHsmInstanceProposalResponse.deserialize, + ) ) return self._stubs["approve_single_tenant_hsm_instance_proposal"] @@ -561,12 +563,12 @@ def execute_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "execute_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "execute_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ExecuteSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.ExecuteSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["execute_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ExecuteSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.ExecuteSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["execute_single_tenant_hsm_instance_proposal"] @@ -594,12 +596,12 @@ def get_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "get_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.GetSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=hsm_management.SingleTenantHsmInstanceProposal.deserialize, + self._stubs["get_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.GetSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=hsm_management.SingleTenantHsmInstanceProposal.deserialize, + ) ) return self._stubs["get_single_tenant_hsm_instance_proposal"] @@ -627,12 +629,12 @@ def list_single_tenant_hsm_instance_proposals( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_single_tenant_hsm_instance_proposals" not in self._stubs: - self._stubs[ - "list_single_tenant_hsm_instance_proposals" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstanceProposals", - request_serializer=hsm_management.ListSingleTenantHsmInstanceProposalsRequest.serialize, - response_deserializer=hsm_management.ListSingleTenantHsmInstanceProposalsResponse.deserialize, + self._stubs["list_single_tenant_hsm_instance_proposals"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstanceProposals", + request_serializer=hsm_management.ListSingleTenantHsmInstanceProposalsRequest.serialize, + response_deserializer=hsm_management.ListSingleTenantHsmInstanceProposalsResponse.deserialize, + ) ) return self._stubs["list_single_tenant_hsm_instance_proposals"] @@ -660,12 +662,12 @@ def delete_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "delete_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/DeleteSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.DeleteSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/DeleteSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.DeleteSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_single_tenant_hsm_instance_proposal"] diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest.py index a307d8e96a04..ec800cab6d96 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest.py @@ -16,21 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from google.cloud.kms_v1.types import hsm_management @@ -911,15 +913,12 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseApproveSingleTenantHsmInstanceProposal._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseApproveSingleTenantHsmInstanceProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_approve_single_tenant_hsm_instance_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_approve_single_tenant_hsm_instance_proposal( + request, metadata + ) ) transcoded_request = _BaseHsmManagementRestTransport._BaseApproveSingleTenantHsmInstanceProposal._get_transcoded_request( http_options, request @@ -989,11 +988,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_approve_single_tenant_hsm_instance_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_approve_single_tenant_hsm_instance_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1081,9 +1079,7 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseCreateSingleTenantHsmInstance._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseCreateSingleTenantHsmInstance._get_http_options() request, metadata = self._interceptor.pre_create_single_tenant_hsm_instance( request, metadata @@ -1152,11 +1148,10 @@ def __call__( resp = self._interceptor.post_create_single_tenant_hsm_instance(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_single_tenant_hsm_instance_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_single_tenant_hsm_instance_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1244,15 +1239,12 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseCreateSingleTenantHsmInstanceProposal._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseCreateSingleTenantHsmInstanceProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_single_tenant_hsm_instance_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_create_single_tenant_hsm_instance_proposal( + request, metadata + ) ) transcoded_request = _BaseHsmManagementRestTransport._BaseCreateSingleTenantHsmInstanceProposal._get_transcoded_request( http_options, request @@ -1318,11 +1310,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_single_tenant_hsm_instance_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_single_tenant_hsm_instance_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1402,15 +1393,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseHsmManagementRestTransport._BaseDeleteSingleTenantHsmInstanceProposal._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseDeleteSingleTenantHsmInstanceProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_single_tenant_hsm_instance_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_single_tenant_hsm_instance_proposal( + request, metadata + ) ) transcoded_request = _BaseHsmManagementRestTransport._BaseDeleteSingleTenantHsmInstanceProposal._get_transcoded_request( http_options, request @@ -1526,15 +1514,12 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseExecuteSingleTenantHsmInstanceProposal._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseExecuteSingleTenantHsmInstanceProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_execute_single_tenant_hsm_instance_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_execute_single_tenant_hsm_instance_proposal( + request, metadata + ) ) transcoded_request = _BaseHsmManagementRestTransport._BaseExecuteSingleTenantHsmInstanceProposal._get_transcoded_request( http_options, request @@ -1600,11 +1585,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_execute_single_tenant_hsm_instance_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_execute_single_tenant_hsm_instance_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1697,9 +1681,7 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseGetSingleTenantHsmInstance._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseGetSingleTenantHsmInstance._get_http_options() request, metadata = self._interceptor.pre_get_single_tenant_hsm_instance( request, metadata @@ -1765,11 +1747,10 @@ def __call__( resp = self._interceptor.post_get_single_tenant_hsm_instance(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_single_tenant_hsm_instance_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_single_tenant_hsm_instance_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1857,15 +1838,12 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseGetSingleTenantHsmInstanceProposal._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseGetSingleTenantHsmInstanceProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_single_tenant_hsm_instance_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_get_single_tenant_hsm_instance_proposal( + request, metadata + ) ) transcoded_request = _BaseHsmManagementRestTransport._BaseGetSingleTenantHsmInstanceProposal._get_transcoded_request( http_options, request @@ -1926,11 +1904,10 @@ def __call__( resp = self._interceptor.post_get_single_tenant_hsm_instance_proposal(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_single_tenant_hsm_instance_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_single_tenant_hsm_instance_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2018,15 +1995,12 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseListSingleTenantHsmInstanceProposals._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseListSingleTenantHsmInstanceProposals._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_single_tenant_hsm_instance_proposals( - request, metadata + request, metadata = ( + self._interceptor.pre_list_single_tenant_hsm_instance_proposals( + request, metadata + ) ) transcoded_request = _BaseHsmManagementRestTransport._BaseListSingleTenantHsmInstanceProposals._get_transcoded_request( http_options, request @@ -2091,11 +2065,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_single_tenant_hsm_instance_proposals_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_single_tenant_hsm_instance_proposals_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2181,9 +2154,7 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseListSingleTenantHsmInstances._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseListSingleTenantHsmInstances._get_http_options() request, metadata = self._interceptor.pre_list_single_tenant_hsm_instances( request, metadata @@ -2249,11 +2220,10 @@ def __call__( resp = self._interceptor.post_list_single_tenant_hsm_instances(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_single_tenant_hsm_instances_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_single_tenant_hsm_instances_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2291,7 +2261,9 @@ def approve_single_tenant_hsm_instance_proposal( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ApproveSingleTenantHsmInstanceProposal(self._session, self._host, self._interceptor) # type: ignore + return self._ApproveSingleTenantHsmInstanceProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_single_tenant_hsm_instance( @@ -2301,7 +2273,9 @@ def create_single_tenant_hsm_instance( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSingleTenantHsmInstance(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSingleTenantHsmInstance( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_single_tenant_hsm_instance_proposal( @@ -2312,7 +2286,9 @@ def create_single_tenant_hsm_instance_proposal( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateSingleTenantHsmInstanceProposal(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSingleTenantHsmInstanceProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_single_tenant_hsm_instance_proposal( @@ -2322,7 +2298,9 @@ def delete_single_tenant_hsm_instance_proposal( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteSingleTenantHsmInstanceProposal(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSingleTenantHsmInstanceProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def execute_single_tenant_hsm_instance_proposal( @@ -2333,7 +2311,9 @@ def execute_single_tenant_hsm_instance_proposal( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ExecuteSingleTenantHsmInstanceProposal(self._session, self._host, self._interceptor) # type: ignore + return self._ExecuteSingleTenantHsmInstanceProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_single_tenant_hsm_instance( @@ -2344,7 +2324,9 @@ def get_single_tenant_hsm_instance( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetSingleTenantHsmInstance(self._session, self._host, self._interceptor) # type: ignore + return self._GetSingleTenantHsmInstance( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_single_tenant_hsm_instance_proposal( @@ -2355,7 +2337,9 @@ def get_single_tenant_hsm_instance_proposal( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetSingleTenantHsmInstanceProposal(self._session, self._host, self._interceptor) # type: ignore + return self._GetSingleTenantHsmInstanceProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_single_tenant_hsm_instance_proposals( @@ -2366,7 +2350,9 @@ def list_single_tenant_hsm_instance_proposals( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListSingleTenantHsmInstanceProposals(self._session, self._host, self._interceptor) # type: ignore + return self._ListSingleTenantHsmInstanceProposals( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_single_tenant_hsm_instances( @@ -2377,7 +2363,9 @@ def list_single_tenant_hsm_instances( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListSingleTenantHsmInstances(self._session, self._host, self._interceptor) # type: ignore + return self._ListSingleTenantHsmInstances( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -3005,9 +2993,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseHsmManagementRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest_base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest_base.py index a9f7afcb4d1a..48ca59615bcc 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest_base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest_base.py @@ -17,13 +17,15 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.kms_v1.types import hsm_management diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/async_client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/async_client.py index 49e2e7f61d3d..406322820d91 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/async_client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -44,14 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore 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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.kms_v1.services.key_management_service import pagers from google.cloud.kms_v1.types import resources, service @@ -152,7 +154,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: KeyManagementServiceAsyncClient: The constructed client. """ - return KeyManagementServiceClient.from_service_account_info.__func__(KeyManagementServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + KeyManagementServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(KeyManagementServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -168,7 +173,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: KeyManagementServiceAsyncClient: The constructed client. """ - return KeyManagementServiceClient.from_service_account_file.__func__(KeyManagementServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + KeyManagementServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(KeyManagementServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -206,7 +214,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return KeyManagementServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return KeyManagementServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> KeyManagementServiceTransport: diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/client.py index 9935bdabafcb..9537e63dd855 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -61,14 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore 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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.cloud.location import locations_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) +from google.longrunning import operations_pb2 # type: ignore from google.cloud.kms_v1.services.key_management_service import pagers from google.cloud.kms_v1.types import resources, service @@ -87,9 +89,7 @@ class KeyManagementServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[KeyManagementServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[KeyManagementServiceTransport]] _transport_registry["grpc"] = KeyManagementServiceGrpcTransport _transport_registry["grpc_asyncio"] = KeyManagementServiceGrpcAsyncIOTransport _transport_registry["rest"] = KeyManagementServiceRestTransport @@ -745,11 +745,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = KeyManagementServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + KeyManagementServiceClient._read_environment_variables() + ) self._client_cert_source = KeyManagementServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -784,8 +782,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(KeyManagementServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/pagers.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/pagers.py index ca1df0009940..2b2fc51a7f33 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/pagers.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/__init__.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/__init__.py index c1465b157cbb..90199bc4b838 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/__init__.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import KeyManagementServiceRestInterceptor, KeyManagementServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[KeyManagementServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[KeyManagementServiceTransport]] _transport_registry["grpc"] = KeyManagementServiceGrpcTransport _transport_registry["grpc_asyncio"] = KeyManagementServiceGrpcAsyncIOTransport _transport_registry["rest"] = KeyManagementServiceRestTransport diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/base.py index a3b748efb138..eea688ab8010 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version from google.cloud.kms_v1.types import resources, service diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc.py index 69e29d87f76d..280f3463d765 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import resources, service @@ -828,12 +830,12 @@ def update_crypto_key_primary_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_crypto_key_primary_version" not in self._stubs: - self._stubs[ - "update_crypto_key_primary_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.KeyManagementService/UpdateCryptoKeyPrimaryVersion", - request_serializer=service.UpdateCryptoKeyPrimaryVersionRequest.serialize, - response_deserializer=resources.CryptoKey.deserialize, + self._stubs["update_crypto_key_primary_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.KeyManagementService/UpdateCryptoKeyPrimaryVersion", + request_serializer=service.UpdateCryptoKeyPrimaryVersionRequest.serialize, + response_deserializer=resources.CryptoKey.deserialize, + ) ) return self._stubs["update_crypto_key_primary_version"] @@ -878,12 +880,12 @@ def destroy_crypto_key_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "destroy_crypto_key_version" not in self._stubs: - self._stubs[ - "destroy_crypto_key_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.KeyManagementService/DestroyCryptoKeyVersion", - request_serializer=service.DestroyCryptoKeyVersionRequest.serialize, - response_deserializer=resources.CryptoKeyVersion.deserialize, + self._stubs["destroy_crypto_key_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.KeyManagementService/DestroyCryptoKeyVersion", + request_serializer=service.DestroyCryptoKeyVersionRequest.serialize, + response_deserializer=resources.CryptoKeyVersion.deserialize, + ) ) return self._stubs["destroy_crypto_key_version"] @@ -917,12 +919,12 @@ def restore_crypto_key_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restore_crypto_key_version" not in self._stubs: - self._stubs[ - "restore_crypto_key_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.KeyManagementService/RestoreCryptoKeyVersion", - request_serializer=service.RestoreCryptoKeyVersionRequest.serialize, - response_deserializer=resources.CryptoKeyVersion.deserialize, + self._stubs["restore_crypto_key_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.KeyManagementService/RestoreCryptoKeyVersion", + request_serializer=service.RestoreCryptoKeyVersionRequest.serialize, + response_deserializer=resources.CryptoKeyVersion.deserialize, + ) ) return self._stubs["restore_crypto_key_version"] diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc_asyncio.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc_asyncio.py index 2a0796c3ea7b..65676dd7a063 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import resources, service @@ -855,12 +857,12 @@ def update_crypto_key_primary_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_crypto_key_primary_version" not in self._stubs: - self._stubs[ - "update_crypto_key_primary_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.KeyManagementService/UpdateCryptoKeyPrimaryVersion", - request_serializer=service.UpdateCryptoKeyPrimaryVersionRequest.serialize, - response_deserializer=resources.CryptoKey.deserialize, + self._stubs["update_crypto_key_primary_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.KeyManagementService/UpdateCryptoKeyPrimaryVersion", + request_serializer=service.UpdateCryptoKeyPrimaryVersionRequest.serialize, + response_deserializer=resources.CryptoKey.deserialize, + ) ) return self._stubs["update_crypto_key_primary_version"] @@ -907,12 +909,12 @@ def destroy_crypto_key_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "destroy_crypto_key_version" not in self._stubs: - self._stubs[ - "destroy_crypto_key_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.KeyManagementService/DestroyCryptoKeyVersion", - request_serializer=service.DestroyCryptoKeyVersionRequest.serialize, - response_deserializer=resources.CryptoKeyVersion.deserialize, + self._stubs["destroy_crypto_key_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.KeyManagementService/DestroyCryptoKeyVersion", + request_serializer=service.DestroyCryptoKeyVersionRequest.serialize, + response_deserializer=resources.CryptoKeyVersion.deserialize, + ) ) return self._stubs["destroy_crypto_key_version"] @@ -948,12 +950,12 @@ def restore_crypto_key_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restore_crypto_key_version" not in self._stubs: - self._stubs[ - "restore_crypto_key_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.KeyManagementService/RestoreCryptoKeyVersion", - request_serializer=service.RestoreCryptoKeyVersionRequest.serialize, - response_deserializer=resources.CryptoKeyVersion.deserialize, + self._stubs["restore_crypto_key_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.KeyManagementService/RestoreCryptoKeyVersion", + request_serializer=service.RestoreCryptoKeyVersionRequest.serialize, + response_deserializer=resources.CryptoKeyVersion.deserialize, + ) ) return self._stubs["restore_crypto_key_version"] diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest.py index 7aa860c37cd2..c5430dd19657 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1970,9 +1972,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseAsymmetricDecrypt._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseAsymmetricDecrypt._get_http_options() request, metadata = self._interceptor.pre_asymmetric_decrypt( request, metadata @@ -2130,9 +2130,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseAsymmetricSign._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseAsymmetricSign._get_http_options() request, metadata = self._interceptor.pre_asymmetric_sign(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseAsymmetricSign._get_transcoded_request( @@ -2291,9 +2289,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseCreateCryptoKey._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseCreateCryptoKey._get_http_options() request, metadata = self._interceptor.pre_create_crypto_key( request, metadata @@ -2460,9 +2456,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseCreateCryptoKeyVersion._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseCreateCryptoKeyVersion._get_http_options() request, metadata = self._interceptor.pre_create_crypto_key_version( request, metadata @@ -2661,9 +2655,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseCreateImportJob._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseCreateImportJob._get_http_options() request, metadata = self._interceptor.pre_create_import_job( request, metadata @@ -2818,9 +2810,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseCreateKeyRing._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseCreateKeyRing._get_http_options() request, metadata = self._interceptor.pre_create_key_ring(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseCreateKeyRing._get_transcoded_request( @@ -2972,9 +2962,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseDecapsulate._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseDecapsulate._get_http_options() request, metadata = self._interceptor.pre_decapsulate(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseDecapsulate._get_transcoded_request( @@ -3294,9 +3282,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseDestroyCryptoKeyVersion._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseDestroyCryptoKeyVersion._get_http_options() request, metadata = self._interceptor.pre_destroy_crypto_key_version( request, metadata @@ -3604,9 +3590,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGenerateRandomBytes._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGenerateRandomBytes._get_http_options() request, metadata = self._interceptor.pre_generate_random_bytes( request, metadata @@ -3770,9 +3754,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetCryptoKey._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetCryptoKey._get_http_options() request, metadata = self._interceptor.pre_get_crypto_key(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseGetCryptoKey._get_transcoded_request( @@ -3931,9 +3913,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetCryptoKeyVersion._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetCryptoKeyVersion._get_http_options() request, metadata = self._interceptor.pre_get_crypto_key_version( request, metadata @@ -4126,9 +4106,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetImportJob._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetImportJob._get_http_options() request, metadata = self._interceptor.pre_get_import_job(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseGetImportJob._get_transcoded_request( @@ -4275,9 +4253,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetKeyRing._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetKeyRing._get_http_options() request, metadata = self._interceptor.pre_get_key_ring(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseGetKeyRing._get_transcoded_request( @@ -4425,9 +4401,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetPublicKey._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetPublicKey._get_http_options() request, metadata = self._interceptor.pre_get_public_key(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseGetPublicKey._get_transcoded_request( @@ -4587,9 +4561,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseImportCryptoKeyVersion._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseImportCryptoKeyVersion._get_http_options() request, metadata = self._interceptor.pre_import_crypto_key_version( request, metadata @@ -4744,9 +4716,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseListCryptoKeys._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseListCryptoKeys._get_http_options() request, metadata = self._interceptor.pre_list_crypto_keys( request, metadata @@ -4894,9 +4864,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseListCryptoKeyVersions._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseListCryptoKeyVersions._get_http_options() request, metadata = self._interceptor.pre_list_crypto_key_versions( request, metadata @@ -5048,9 +5016,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseListImportJobs._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseListImportJobs._get_http_options() request, metadata = self._interceptor.pre_list_import_jobs( request, metadata @@ -5198,9 +5164,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseListKeyRings._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseListKeyRings._get_http_options() request, metadata = self._interceptor.pre_list_key_rings(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseListKeyRings._get_transcoded_request( @@ -5501,9 +5465,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseMacVerify._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseMacVerify._get_http_options() request, metadata = self._interceptor.pre_mac_verify(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseMacVerify._get_transcoded_request( @@ -5655,9 +5617,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseRawDecrypt._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseRawDecrypt._get_http_options() request, metadata = self._interceptor.pre_raw_decrypt(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseRawDecrypt._get_transcoded_request( @@ -5809,9 +5769,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseRawEncrypt._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseRawEncrypt._get_http_options() request, metadata = self._interceptor.pre_raw_encrypt(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseRawEncrypt._get_transcoded_request( @@ -5977,9 +5935,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseRestoreCryptoKeyVersion._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseRestoreCryptoKeyVersion._get_http_options() request, metadata = self._interceptor.pre_restore_crypto_key_version( request, metadata @@ -6140,9 +6096,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseUpdateCryptoKey._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseUpdateCryptoKey._get_http_options() request, metadata = self._interceptor.pre_update_crypto_key( request, metadata @@ -6306,9 +6260,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseUpdateCryptoKeyPrimaryVersion._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseUpdateCryptoKeyPrimaryVersion._get_http_options() request, metadata = self._interceptor.pre_update_crypto_key_primary_version( request, metadata @@ -6377,11 +6329,10 @@ def __call__( resp = self._interceptor.post_update_crypto_key_primary_version(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_crypto_key_primary_version_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_crypto_key_primary_version_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6478,9 +6429,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseUpdateCryptoKeyVersion._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseUpdateCryptoKeyVersion._get_http_options() request, metadata = self._interceptor.pre_update_crypto_key_version( request, metadata @@ -6609,7 +6558,9 @@ def create_crypto_key_version( ) -> Callable[[service.CreateCryptoKeyVersionRequest], resources.CryptoKeyVersion]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateCryptoKeyVersion(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCryptoKeyVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_import_job( @@ -6647,7 +6598,9 @@ def destroy_crypto_key_version( ) -> Callable[[service.DestroyCryptoKeyVersionRequest], resources.CryptoKeyVersion]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DestroyCryptoKeyVersion(self._session, self._host, self._interceptor) # type: ignore + return self._DestroyCryptoKeyVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def encrypt(self) -> Callable[[service.EncryptRequest], service.EncryptResponse]: @@ -6709,7 +6662,9 @@ def import_crypto_key_version( ) -> Callable[[service.ImportCryptoKeyVersionRequest], resources.CryptoKeyVersion]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportCryptoKeyVersion(self._session, self._host, self._interceptor) # type: ignore + return self._ImportCryptoKeyVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_crypto_keys( @@ -6781,7 +6736,9 @@ def restore_crypto_key_version( ) -> Callable[[service.RestoreCryptoKeyVersionRequest], resources.CryptoKeyVersion]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._RestoreCryptoKeyVersion(self._session, self._host, self._interceptor) # type: ignore + return self._RestoreCryptoKeyVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_crypto_key( @@ -6797,7 +6754,9 @@ def update_crypto_key_primary_version( ) -> Callable[[service.UpdateCryptoKeyPrimaryVersionRequest], resources.CryptoKey]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateCryptoKeyPrimaryVersion(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCryptoKeyPrimaryVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_crypto_key_version( @@ -6805,7 +6764,9 @@ def update_crypto_key_version( ) -> Callable[[service.UpdateCryptoKeyVersionRequest], resources.CryptoKeyVersion]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateCryptoKeyVersion(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCryptoKeyVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -6865,9 +6826,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -7006,9 +6965,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -7147,9 +7104,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -7289,9 +7244,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -7436,9 +7389,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -7586,9 +7537,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest_base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest_base.py index 9b8ba9ad899b..34275601d66d 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest_base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/types/autokey_admin.py b/packages/google-cloud-kms/google/cloud/kms_v1/types/autokey_admin.py index fc8d1a62840e..804b0fe77684 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/types/autokey_admin.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/types/autokey_admin.py @@ -126,6 +126,7 @@ class State(proto.Enum): has been reset to its default uninitialized state. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 KEY_PROJECT_DELETED = 2 diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/types/ekm_service.py b/packages/google-cloud-kms/google/cloud/kms_v1/types/ekm_service.py index baf111b86933..1ab357b637d6 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/types/ekm_service.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/types/ekm_service.py @@ -419,6 +419,7 @@ class KeyManagementMode(proto.Enum): [DestroyCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.DestroyCryptoKeyVersion]. - Automatic rotation of key material is supported. """ + KEY_MANAGEMENT_MODE_UNSPECIFIED = 0 MANUAL = 1 CLOUD_KMS = 2 diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/types/hsm_management.py b/packages/google-cloud-kms/google/cloud/kms_v1/types/hsm_management.py index 2905631ec223..0c926bb42141 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/types/hsm_management.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/types/hsm_management.py @@ -147,6 +147,7 @@ class State(proto.Enum): [SingleTenantHsmInstance][google.cloud.kms.v1.SingleTenantHsmInstance] has failed and can not be recovered or used. """ + STATE_UNSPECIFIED = 0 CREATING = 1 PENDING_TWO_FACTOR_AUTH_REGISTRATION = 2 @@ -418,6 +419,7 @@ class State(proto.Enum): [SingleTenantHsmInstanceProposal][google.cloud.kms.v1.SingleTenantHsmInstanceProposal] has been deleted and will be purged after the purge_time. """ + STATE_UNSPECIFIED = 0 CREATING = 1 PENDING = 2 @@ -877,12 +879,12 @@ class ListSingleTenantHsmInstancesResponse(proto.Message): def raw_page(self): return self - single_tenant_hsm_instances: MutableSequence[ - "SingleTenantHsmInstance" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SingleTenantHsmInstance", + single_tenant_hsm_instances: MutableSequence["SingleTenantHsmInstance"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SingleTenantHsmInstance", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1091,19 +1093,19 @@ class RequiredActionQuorumReply(proto.Message): required_challenge_replies are provided. """ - required_challenge_replies: MutableSequence[ - "ChallengeReply" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ChallengeReply", + required_challenge_replies: MutableSequence["ChallengeReply"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ChallengeReply", + ) ) - quorum_challenge_replies: MutableSequence[ - "ChallengeReply" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ChallengeReply", + quorum_challenge_replies: MutableSequence["ChallengeReply"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ChallengeReply", + ) ) name: str = proto.Field( diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/types/resources.py b/packages/google-cloud-kms/google/cloud/kms_v1/types/resources.py index b56206161983..17a9ac9d41cf 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/types/resources.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/types/resources.py @@ -65,6 +65,7 @@ class ProtectionLevel(proto.Enum): Crypto operations are performed in a single-tenant HSM. """ + PROTECTION_LEVEL_UNSPECIFIED = 0 SOFTWARE = 1 HSM = 2 @@ -153,6 +154,7 @@ class AccessReason(proto.Enum): - Google-initiated support access to protect system reliability. """ + REASON_UNSPECIFIED = 0 CUSTOMER_INITIATED_SUPPORT = 1 GOOGLE_INITIATED_SERVICE = 2 @@ -379,6 +381,7 @@ class CryptoKeyPurpose(proto.Enum): and [Decapsulate][google.cloud.kms.v1.KeyManagementService.Decapsulate]. """ + CRYPTO_KEY_PURPOSE_UNSPECIFIED = 0 ENCRYPT_DECRYPT = 1 ASYMMETRIC_SIGN = 5 @@ -524,6 +527,7 @@ class AttestationFormat(proto.Enum): gzip. This is a new format introduced in Cavium's version 3.2-08. """ + ATTESTATION_FORMAT_UNSPECIFIED = 0 CAVIUM_V1_COMPRESSED = 3 CAVIUM_V2_COMPRESSED = 4 @@ -832,6 +836,7 @@ class CryptoKeyVersionAlgorithm(proto.Enum): signature algorithm, at security level 1. Randomized version. """ + CRYPTO_KEY_VERSION_ALGORITHM_UNSPECIFIED = 0 GOOGLE_SYMMETRIC_ENCRYPTION = 1 AES_128_GCM = 41 @@ -940,6 +945,7 @@ class CryptoKeyVersionState(proto.Enum): manager was destroyed. Additional details can be found in [CryptoKeyVersion.external_destruction_failure_reason][google.cloud.kms.v1.CryptoKeyVersion.external_destruction_failure_reason]. """ + CRYPTO_KEY_VERSION_STATE_UNSPECIFIED = 0 PENDING_GENERATION = 5 ENABLED = 1 @@ -974,6 +980,7 @@ class CryptoKeyVersionView(proto.Enum): including the [attestation][google.cloud.kms.v1.CryptoKeyVersion.attestation]. """ + CRYPTO_KEY_VERSION_VIEW_UNSPECIFIED = 0 FULL = 1 @@ -1187,6 +1194,7 @@ class PublicKeyFormat(proto.Enum): format defined in its standard https://datatracker.ietf.org/doc/draft-connolly-cfrg-xwing-kem. """ + PUBLIC_KEY_FORMAT_UNSPECIFIED = 0 PEM = 1 DER = 2 @@ -1379,6 +1387,7 @@ class ImportMethod(proto.Enum): this method cannot be used to wrap RSA keys for import. """ + IMPORT_METHOD_UNSPECIFIED = 0 RSA_OAEP_3072_SHA1_AES_256 = 1 RSA_OAEP_4096_SHA1_AES_256 = 2 @@ -1410,6 +1419,7 @@ class ImportJobState(proto.Enum): This job can no longer be used and may not leave this state once entered. """ + IMPORT_JOB_STATE_UNSPECIFIED = 0 PENDING_GENERATION = 1 ACTIVE = 2 diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/types/service.py b/packages/google-cloud-kms/google/cloud/kms_v1/types/service.py index b42b2cbde05a..3568eb1b2ac7 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/types/service.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/types/service.py @@ -414,12 +414,12 @@ class ListCryptoKeyVersionsResponse(proto.Message): def raw_page(self): return self - crypto_key_versions: MutableSequence[ - resources.CryptoKeyVersion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.CryptoKeyVersion, + crypto_key_versions: MutableSequence[resources.CryptoKeyVersion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.CryptoKeyVersion, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-kms/mypy.ini b/packages/google-cloud-kms/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-kms/mypy.ini +++ b/packages/google-cloud-kms/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-kms/noxfile.py b/packages/google-cloud-kms/noxfile.py index cf9b815c11d9..c49d817729d4 100644 --- a/packages/google-cloud-kms/noxfile.py +++ b/packages/google-cloud-kms/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_async.py b/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_async.py index 70646a6ef94e..6e34563cc007 100644 --- a/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_async.py +++ b/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_async.py @@ -40,9 +40,7 @@ async def sample_create_single_tenant_hsm_instance_proposal(): # Initialize request argument(s) single_tenant_hsm_instance_proposal = kms_v1.SingleTenantHsmInstanceProposal() - single_tenant_hsm_instance_proposal.register_two_factor_auth_keys.required_approver_count = ( - 2487 - ) + single_tenant_hsm_instance_proposal.register_two_factor_auth_keys.required_approver_count = 2487 single_tenant_hsm_instance_proposal.register_two_factor_auth_keys.two_factor_public_key_pems = [ "two_factor_public_key_pems_value1", "two_factor_public_key_pems_value2", diff --git a/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_sync.py b/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_sync.py index 3f3992a30e0d..b950272bb1ea 100644 --- a/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_sync.py +++ b/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_sync.py @@ -40,9 +40,7 @@ def sample_create_single_tenant_hsm_instance_proposal(): # Initialize request argument(s) single_tenant_hsm_instance_proposal = kms_v1.SingleTenantHsmInstanceProposal() - single_tenant_hsm_instance_proposal.register_two_factor_auth_keys.required_approver_count = ( - 2487 - ) + single_tenant_hsm_instance_proposal.register_two_factor_auth_keys.required_approver_count = 2487 single_tenant_hsm_instance_proposal.register_two_factor_auth_keys.two_factor_public_key_pems = [ "two_factor_public_key_pems_value1", "two_factor_public_key_pems_value2", diff --git a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey.py b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey.py index 55dc804d243b..317d493930d4 100644 --- a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey.py +++ b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +55,16 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -910,10 +912,9 @@ def test_autokey_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +959,9 @@ def test_autokey_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +997,9 @@ def test_autokey_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1229,9 +1228,7 @@ def test_autokey_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1344,9 +1341,9 @@ def test_create_key_handle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_key_handle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_key_handle] = ( + mock_rpc + ) request = {} client.create_key_handle(request) @@ -2037,9 +2034,9 @@ def test_list_key_handles_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_key_handles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_key_handles] = ( + mock_rpc + ) request = {} client.list_key_handles(request) @@ -2492,9 +2489,9 @@ def test_create_key_handle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_key_handle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_key_handle] = ( + mock_rpc + ) request = {} client.create_key_handle(request) @@ -2862,9 +2859,9 @@ def test_list_key_handles_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_key_handles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_key_handles] = ( + mock_rpc + ) request = {} client.list_key_handles(request) diff --git a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey_admin.py b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey_admin.py index bbd8980dcbf6..d753189f9e02 100644 --- a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey_admin.py +++ b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey_admin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,20 +43,27 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.kms_v1.services.autokey_admin import ( AutokeyAdminAsyncClient, @@ -931,10 +938,9 @@ def test_autokey_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +985,9 @@ def test_autokey_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1023,9 @@ def test_autokey_admin_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1264,9 +1268,7 @@ def test_autokey_admin_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1385,9 +1387,9 @@ def test_update_autokey_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_autokey_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_autokey_config] = ( + mock_rpc + ) request = {} client.update_autokey_config(request) @@ -1749,9 +1751,9 @@ def test_get_autokey_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_autokey_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_autokey_config] = ( + mock_rpc + ) request = {} client.get_autokey_config(request) @@ -2372,9 +2374,9 @@ def test_update_autokey_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_autokey_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_autokey_config] = ( + mock_rpc + ) request = {} client.update_autokey_config(request) @@ -2562,9 +2564,9 @@ def test_get_autokey_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_autokey_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_autokey_config] = ( + mock_rpc + ) request = {} client.get_autokey_config(request) diff --git a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_ekm_service.py b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_ekm_service.py index e6de5a584a58..6f69b5b7d8af 100644 --- a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_ekm_service.py +++ b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_ekm_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,21 +43,28 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.kms_v1.services.ekm_service import ( EkmServiceAsyncClient, @@ -925,10 +932,9 @@ def test_ekm_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +979,9 @@ def test_ekm_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1017,9 @@ def test_ekm_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1248,9 +1252,7 @@ def test_ekm_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1374,9 +1376,9 @@ def test_list_ekm_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_ekm_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_ekm_connections] = ( + mock_rpc + ) request = {} client.list_ekm_connections(request) @@ -1928,9 +1930,9 @@ def test_get_ekm_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ekm_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ekm_connection] = ( + mock_rpc + ) request = {} client.get_ekm_connection(request) @@ -2290,9 +2292,9 @@ def test_create_ekm_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_ekm_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_ekm_connection] = ( + mock_rpc + ) request = {} client.create_ekm_connection(request) @@ -2666,9 +2668,9 @@ def test_update_ekm_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_ekm_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_ekm_connection] = ( + mock_rpc + ) request = {} client.update_ekm_connection(request) @@ -3349,9 +3351,9 @@ def test_update_ekm_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_ekm_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_ekm_config] = ( + mock_rpc + ) request = {} client.update_ekm_config(request) @@ -3699,9 +3701,9 @@ def test_verify_connectivity_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.verify_connectivity - ] = mock_rpc + client._transport._wrapped_methods[client._transport.verify_connectivity] = ( + mock_rpc + ) request = {} client.verify_connectivity(request) @@ -3969,9 +3971,9 @@ def test_list_ekm_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_ekm_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_ekm_connections] = ( + mock_rpc + ) request = {} client.list_ekm_connections(request) @@ -4233,9 +4235,9 @@ def test_get_ekm_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ekm_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ekm_connection] = ( + mock_rpc + ) request = {} client.get_ekm_connection(request) @@ -4418,9 +4420,9 @@ def test_create_ekm_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_ekm_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_ekm_connection] = ( + mock_rpc + ) request = {} client.create_ekm_connection(request) @@ -4630,9 +4632,9 @@ def test_update_ekm_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_ekm_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_ekm_connection] = ( + mock_rpc + ) request = {} client.update_ekm_connection(request) @@ -4999,9 +5001,9 @@ def test_update_ekm_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_ekm_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_ekm_config] = ( + mock_rpc + ) request = {} client.update_ekm_config(request) @@ -5191,9 +5193,9 @@ def test_verify_connectivity_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.verify_connectivity - ] = mock_rpc + client._transport._wrapped_methods[client._transport.verify_connectivity] = ( + mock_rpc + ) request = {} client.verify_connectivity(request) diff --git a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_hsm_management.py b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_hsm_management.py index 825ce04d3905..f8d2489e6ac9 100644 --- a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_hsm_management.py +++ b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_hsm_management.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +57,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.api_core.operation_async as operation_async # type: ignore -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -import google.protobuf.duration_pb2 as duration_pb2 # type: ignore -import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.kms_v1.services.hsm_management import ( HsmManagementAsyncClient, @@ -957,10 +959,9 @@ def test_hsm_management_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1005,10 +1006,9 @@ def test_hsm_management_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1044,9 @@ def test_hsm_management_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1294,9 +1293,7 @@ def test_hsm_management_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3279,12 +3276,15 @@ def test_approve_single_tenant_hsm_instance_proposal_flattened(): arg = args[0].name mock_val = "name_value" assert arg == mock_val - assert args[ - 0 - ].quorum_reply == hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.QuorumReply( - challenge_replies=[ - hsm_management.ChallengeReply(signed_challenge=b"signed_challenge_blob") - ] + assert ( + args[0].quorum_reply + == hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.QuorumReply( + challenge_replies=[ + hsm_management.ChallengeReply( + signed_challenge=b"signed_challenge_blob" + ) + ] + ) ) @@ -3347,12 +3347,15 @@ async def test_approve_single_tenant_hsm_instance_proposal_flattened_async(): arg = args[0].name mock_val = "name_value" assert arg == mock_val - assert args[ - 0 - ].quorum_reply == hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.QuorumReply( - challenge_replies=[ - hsm_management.ChallengeReply(signed_challenge=b"signed_challenge_blob") - ] + assert ( + args[0].quorum_reply + == hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.QuorumReply( + challenge_replies=[ + hsm_management.ChallengeReply( + signed_challenge=b"signed_challenge_blob" + ) + ] + ) ) diff --git a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_key_management_service.py b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_key_management_service.py index ab83573a55ce..a786169ed897 100644 --- a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_key_management_service.py +++ b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_key_management_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,23 +43,30 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -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 google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.cloud.kms_v1.services.key_management_service import ( KeyManagementServiceAsyncClient, @@ -1001,10 +1008,9 @@ def test_key_management_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1049,10 +1055,9 @@ def test_key_management_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1088,10 +1093,9 @@ def test_key_management_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1351,9 +1355,7 @@ def test_key_management_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1998,9 +2000,9 @@ def test_list_crypto_keys_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_crypto_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_crypto_keys] = ( + mock_rpc + ) request = {} client.list_crypto_keys(request) @@ -3083,9 +3085,9 @@ def test_list_import_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_import_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_import_jobs] = ( + mock_rpc + ) request = {} client.list_import_jobs(request) @@ -4286,9 +4288,9 @@ def test_get_crypto_key_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_crypto_key_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_crypto_key_version] = ( + mock_rpc + ) request = {} client.get_crypto_key_version(request) @@ -5681,9 +5683,9 @@ def test_create_crypto_key_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_crypto_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_crypto_key] = ( + mock_rpc + ) request = {} client.create_crypto_key(request) @@ -6767,9 +6769,9 @@ def test_create_import_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_import_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_import_job] = ( + mock_rpc + ) request = {} client.create_import_job(request) @@ -7135,9 +7137,9 @@ def test_update_crypto_key_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_crypto_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_crypto_key] = ( + mock_rpc + ) request = {} client.update_crypto_key(request) @@ -10598,9 +10600,9 @@ def test_asymmetric_decrypt_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.asymmetric_decrypt - ] = mock_rpc + client._transport._wrapped_methods[client._transport.asymmetric_decrypt] = ( + mock_rpc + ) request = {} client.asymmetric_decrypt(request) @@ -11915,9 +11917,9 @@ def test_generate_random_bytes_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_random_bytes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_random_bytes] = ( + mock_rpc + ) request = {} client.generate_random_bytes(request) @@ -12461,9 +12463,9 @@ def test_list_crypto_keys_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_crypto_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_crypto_keys] = ( + mock_rpc + ) request = {} client.list_crypto_keys(request) @@ -12998,9 +13000,9 @@ def test_list_import_jobs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_import_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_import_jobs] = ( + mock_rpc + ) request = {} client.list_import_jobs(request) @@ -13618,9 +13620,9 @@ def test_get_crypto_key_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_crypto_key_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_crypto_key_version] = ( + mock_rpc + ) request = {} client.get_crypto_key_version(request) @@ -14364,9 +14366,9 @@ def test_create_crypto_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_crypto_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_crypto_key] = ( + mock_rpc + ) request = {} client.create_crypto_key(request) @@ -14920,9 +14922,9 @@ def test_create_import_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_import_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_import_job] = ( + mock_rpc + ) request = {} client.create_import_job(request) @@ -15131,9 +15133,9 @@ def test_update_crypto_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_crypto_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_crypto_key] = ( + mock_rpc + ) request = {} client.update_crypto_key(request) @@ -16932,9 +16934,9 @@ def test_asymmetric_decrypt_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.asymmetric_decrypt - ] = mock_rpc + client._transport._wrapped_methods[client._transport.asymmetric_decrypt] = ( + mock_rpc + ) request = {} client.asymmetric_decrypt(request) @@ -17656,9 +17658,9 @@ def test_generate_random_bytes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_random_bytes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_random_bytes] = ( + mock_rpc + ) request = {} client.generate_random_bytes(request) diff --git a/packages/google-cloud-language/google/cloud/language_v1/__init__.py b/packages/google-cloud-language/google/cloud/language_v1/__init__.py index 35f37c76a388..5a6b3ac69d4d 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/__init__.py +++ b/packages/google-cloud-language/google/cloud/language_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.language_service import LanguageServiceAsyncClient, LanguageServiceClient from .types.language_service import ( AnalyzeEntitiesRequest, diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/async_client.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/async_client.py index 604b436bcae2..23b8919c01df 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/async_client.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v1 import gapic_version as package_version @@ -112,7 +112,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: LanguageServiceAsyncClient: The constructed client. """ - return LanguageServiceClient.from_service_account_info.__func__(LanguageServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + LanguageServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(LanguageServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -128,7 +131,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: LanguageServiceAsyncClient: The constructed client. """ - return LanguageServiceClient.from_service_account_file.__func__(LanguageServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + LanguageServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(LanguageServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/client.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/client.py index 11f77c44c275..77bae4803ec7 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/client.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v1 import gapic_version as package_version @@ -77,9 +77,7 @@ class LanguageServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[LanguageServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[LanguageServiceTransport]] _transport_registry["grpc"] = LanguageServiceGrpcTransport _transport_registry["grpc_asyncio"] = LanguageServiceGrpcAsyncIOTransport _transport_registry["rest"] = LanguageServiceRestTransport @@ -601,11 +599,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LanguageServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LanguageServiceClient._read_environment_variables() + ) self._client_cert_source = LanguageServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +636,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LanguageServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/base.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/base.py index 652ba8d31814..d630e3631cf7 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/base.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v1 import gapic_version as package_version from google.cloud.language_v1.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc.py index 41be62d85c04..119597f4af99 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.language_v1.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc_asyncio.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc_asyncio.py index 75ad3954766b..e4590b1f6334 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.language_v1.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/rest.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/rest.py index dd88782c87e4..1a965757f7a8 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/rest.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -633,9 +633,7 @@ def __call__( The entity analysis response message. """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeEntities._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeEntities._get_http_options() request, metadata = self._interceptor.pre_analyze_entities( request, metadata @@ -791,9 +789,7 @@ def __call__( """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeEntitySentiment._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeEntitySentiment._get_http_options() request, metadata = self._interceptor.pre_analyze_entity_sentiment( request, metadata @@ -952,9 +948,7 @@ def __call__( """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeSentiment._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeSentiment._get_http_options() request, metadata = self._interceptor.pre_analyze_sentiment( request, metadata @@ -1690,7 +1684,9 @@ def analyze_entity_sentiment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AnalyzeEntitySentiment(self._session, self._host, self._interceptor) # type: ignore + return self._AnalyzeEntitySentiment( + self._session, self._host, self._interceptor + ) # type: ignore @property def analyze_sentiment( diff --git a/packages/google-cloud-language/google/cloud/language_v1/types/language_service.py b/packages/google-cloud-language/google/cloud/language_v1/types/language_service.py index 64994ab8bc8c..b46f6479e6db 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/types/language_service.py +++ b/packages/google-cloud-language/google/cloud/language_v1/types/language_service.py @@ -80,6 +80,7 @@ class EncodingType(proto.Enum): is an example of a language that uses this encoding natively. """ + NONE = 0 UTF8 = 1 UTF16 = 2 @@ -136,6 +137,7 @@ class Type(proto.Enum): HTML (2): HTML """ + TYPE_UNSPECIFIED = 0 PLAIN_TEXT = 1 HTML = 2 @@ -293,6 +295,7 @@ class Type(proto.Enum): The metadata identifies the ``value`` and ``currency``. """ + UNKNOWN = 0 PERSON = 1 LOCATION = 2 @@ -462,6 +465,7 @@ class Tag(proto.Enum): AFFIX (13): Affix """ + UNKNOWN = 0 ADJ = 1 ADP = 2 @@ -492,6 +496,7 @@ class Aspect(proto.Enum): PROGRESSIVE (3): Progressive """ + ASPECT_UNKNOWN = 0 PERFECTIVE = 1 IMPERFECTIVE = 2 @@ -536,6 +541,7 @@ class Case(proto.Enum): VOCATIVE (14): Vocative """ + CASE_UNKNOWN = 0 ACCUSATIVE = 1 ADVERBIAL = 2 @@ -586,6 +592,7 @@ class Form(proto.Enum): SPECIFIC (11): Specific form """ + FORM_UNKNOWN = 0 ADNOMIAL = 1 AUXILIARY = 2 @@ -614,6 +621,7 @@ class Gender(proto.Enum): NEUTER (3): Neuter """ + GENDER_UNKNOWN = 0 FEMININE = 1 MASCULINE = 2 @@ -640,6 +648,7 @@ class Mood(proto.Enum): SUBJUNCTIVE (6): Subjunctive """ + MOOD_UNKNOWN = 0 CONDITIONAL_MOOD = 1 IMPERATIVE = 2 @@ -662,6 +671,7 @@ class Number(proto.Enum): DUAL (3): Dual """ + NUMBER_UNKNOWN = 0 SINGULAR = 1 PLURAL = 2 @@ -684,6 +694,7 @@ class Person(proto.Enum): REFLEXIVE_PERSON (4): Reflexive """ + PERSON_UNKNOWN = 0 FIRST = 1 SECOND = 2 @@ -702,6 +713,7 @@ class Proper(proto.Enum): NOT_PROPER (2): Not proper """ + PROPER_UNKNOWN = 0 PROPER = 1 NOT_PROPER = 2 @@ -718,6 +730,7 @@ class Reciprocity(proto.Enum): NON_RECIPROCAL (2): Non-reciprocal """ + RECIPROCITY_UNKNOWN = 0 RECIPROCAL = 1 NON_RECIPROCAL = 2 @@ -742,6 +755,7 @@ class Tense(proto.Enum): PLUPERFECT (6): Pluperfect """ + TENSE_UNKNOWN = 0 CONDITIONAL_TENSE = 1 FUTURE = 2 @@ -765,6 +779,7 @@ class Voice(proto.Enum): PASSIVE (3): Passive """ + VOICE_UNKNOWN = 0 ACTIVE = 1 CAUSATIVE = 2 @@ -1025,6 +1040,7 @@ class Label(proto.Enum): NCOMP (82): Nominal complement of a noun """ + UNKNOWN = 0 ABBREV = 1 ACOMP = 2 @@ -1148,6 +1164,7 @@ class Type(proto.Enum): COMMON (2): Common noun (or noun compound) """ + TYPE_UNKNOWN = 0 PROPER = 1 COMMON = 2 @@ -1266,6 +1283,7 @@ class ContentCategoriesVersion(proto.Enum): V2 (2): Updated content categories in 2022. """ + CONTENT_CATEGORIES_VERSION_UNSPECIFIED = 0 V1 = 1 V2 = 2 @@ -1562,12 +1580,12 @@ class ModerateTextResponse(proto.Message): the input document. """ - moderation_categories: MutableSequence[ - "ClassificationCategory" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ClassificationCategory", + moderation_categories: MutableSequence["ClassificationCategory"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ClassificationCategory", + ) ) @@ -1721,12 +1739,12 @@ class AnnotateTextResponse(proto.Message): number=6, message="ClassificationCategory", ) - moderation_categories: MutableSequence[ - "ClassificationCategory" - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message="ClassificationCategory", + moderation_categories: MutableSequence["ClassificationCategory"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message="ClassificationCategory", + ) ) diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/__init__.py b/packages/google-cloud-language/google/cloud/language_v1beta2/__init__.py index 5fc6e884ffad..08b77eab2f12 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/__init__.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.language_service import LanguageServiceAsyncClient, LanguageServiceClient from .types.language_service import ( AnalyzeEntitiesRequest, diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/async_client.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/async_client.py index 90788be4c3e3..6a56901f0961 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/async_client.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v1beta2 import gapic_version as package_version @@ -112,7 +112,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: LanguageServiceAsyncClient: The constructed client. """ - return LanguageServiceClient.from_service_account_info.__func__(LanguageServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + LanguageServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(LanguageServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -128,7 +131,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: LanguageServiceAsyncClient: The constructed client. """ - return LanguageServiceClient.from_service_account_file.__func__(LanguageServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + LanguageServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(LanguageServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/client.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/client.py index 02e839260c7d..6429a5c16ef9 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/client.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v1beta2 import gapic_version as package_version @@ -77,9 +77,7 @@ class LanguageServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[LanguageServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[LanguageServiceTransport]] _transport_registry["grpc"] = LanguageServiceGrpcTransport _transport_registry["grpc_asyncio"] = LanguageServiceGrpcAsyncIOTransport _transport_registry["rest"] = LanguageServiceRestTransport @@ -601,11 +599,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LanguageServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LanguageServiceClient._read_environment_variables() + ) self._client_cert_source = LanguageServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +636,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LanguageServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/base.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/base.py index d2f3ef846d65..4fa4d5e49a27 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/base.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v1beta2 import gapic_version as package_version from google.cloud.language_v1beta2.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc.py index a1b1024bd3fc..e8e9e0c5456d 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.language_v1beta2.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc_asyncio.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc_asyncio.py index 650af7d270fb..a27cd776a646 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.language_v1beta2.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/rest.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/rest.py index 73e1571fd611..75ab8665949c 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/rest.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -633,9 +633,7 @@ def __call__( The entity analysis response message. """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeEntities._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeEntities._get_http_options() request, metadata = self._interceptor.pre_analyze_entities( request, metadata @@ -791,9 +789,7 @@ def __call__( """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeEntitySentiment._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeEntitySentiment._get_http_options() request, metadata = self._interceptor.pre_analyze_entity_sentiment( request, metadata @@ -952,9 +948,7 @@ def __call__( """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeSentiment._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeSentiment._get_http_options() request, metadata = self._interceptor.pre_analyze_sentiment( request, metadata @@ -1690,7 +1684,9 @@ def analyze_entity_sentiment( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._AnalyzeEntitySentiment(self._session, self._host, self._interceptor) # type: ignore + return self._AnalyzeEntitySentiment( + self._session, self._host, self._interceptor + ) # type: ignore @property def analyze_sentiment( diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/types/language_service.py b/packages/google-cloud-language/google/cloud/language_v1beta2/types/language_service.py index 7be1d2a2ab6d..41f4f9dc83a9 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/types/language_service.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/types/language_service.py @@ -80,6 +80,7 @@ class EncodingType(proto.Enum): is an example of a language that uses this encoding natively. """ + NONE = 0 UTF8 = 1 UTF16 = 2 @@ -146,6 +147,7 @@ class Type(proto.Enum): HTML (2): HTML """ + TYPE_UNSPECIFIED = 0 PLAIN_TEXT = 1 HTML = 2 @@ -163,6 +165,7 @@ class BoilerplateHandling(proto.Enum): KEEP_BOILERPLATE (2): Treat boilerplate the same as content. """ + BOILERPLATE_HANDLING_UNSPECIFIED = 0 SKIP_BOILERPLATE = 1 KEEP_BOILERPLATE = 2 @@ -329,6 +332,7 @@ class Type(proto.Enum): The metadata identifies the ``value`` and ``currency``. """ + UNKNOWN = 0 PERSON = 1 LOCATION = 2 @@ -497,6 +501,7 @@ class Tag(proto.Enum): AFFIX (13): Affix """ + UNKNOWN = 0 ADJ = 1 ADP = 2 @@ -527,6 +532,7 @@ class Aspect(proto.Enum): PROGRESSIVE (3): Progressive """ + ASPECT_UNKNOWN = 0 PERFECTIVE = 1 IMPERFECTIVE = 2 @@ -571,6 +577,7 @@ class Case(proto.Enum): VOCATIVE (14): Vocative """ + CASE_UNKNOWN = 0 ACCUSATIVE = 1 ADVERBIAL = 2 @@ -621,6 +628,7 @@ class Form(proto.Enum): SPECIFIC (11): Specific form """ + FORM_UNKNOWN = 0 ADNOMIAL = 1 AUXILIARY = 2 @@ -649,6 +657,7 @@ class Gender(proto.Enum): NEUTER (3): Neuter """ + GENDER_UNKNOWN = 0 FEMININE = 1 MASCULINE = 2 @@ -675,6 +684,7 @@ class Mood(proto.Enum): SUBJUNCTIVE (6): Subjunctive """ + MOOD_UNKNOWN = 0 CONDITIONAL_MOOD = 1 IMPERATIVE = 2 @@ -697,6 +707,7 @@ class Number(proto.Enum): DUAL (3): Dual """ + NUMBER_UNKNOWN = 0 SINGULAR = 1 PLURAL = 2 @@ -719,6 +730,7 @@ class Person(proto.Enum): REFLEXIVE_PERSON (4): Reflexive """ + PERSON_UNKNOWN = 0 FIRST = 1 SECOND = 2 @@ -737,6 +749,7 @@ class Proper(proto.Enum): NOT_PROPER (2): Not proper """ + PROPER_UNKNOWN = 0 PROPER = 1 NOT_PROPER = 2 @@ -753,6 +766,7 @@ class Reciprocity(proto.Enum): NON_RECIPROCAL (2): Non-reciprocal """ + RECIPROCITY_UNKNOWN = 0 RECIPROCAL = 1 NON_RECIPROCAL = 2 @@ -777,6 +791,7 @@ class Tense(proto.Enum): PLUPERFECT (6): Pluperfect """ + TENSE_UNKNOWN = 0 CONDITIONAL_TENSE = 1 FUTURE = 2 @@ -800,6 +815,7 @@ class Voice(proto.Enum): PASSIVE (3): Passive """ + VOICE_UNKNOWN = 0 ACTIVE = 1 CAUSATIVE = 2 @@ -1058,6 +1074,7 @@ class Label(proto.Enum): NCOMP (82): Nominal complement of a noun """ + UNKNOWN = 0 ABBREV = 1 ACOMP = 2 @@ -1181,6 +1198,7 @@ class Type(proto.Enum): COMMON (2): Common noun (or noun compound) """ + TYPE_UNKNOWN = 0 PROPER = 1 COMMON = 2 @@ -1299,6 +1317,7 @@ class ContentCategoriesVersion(proto.Enum): V2 (2): Updated content categories in 2022. """ + CONTENT_CATEGORIES_VERSION_UNSPECIFIED = 0 V1 = 1 V2 = 2 @@ -1596,12 +1615,12 @@ class ModerateTextResponse(proto.Message): the input document. """ - moderation_categories: MutableSequence[ - "ClassificationCategory" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ClassificationCategory", + moderation_categories: MutableSequence["ClassificationCategory"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ClassificationCategory", + ) ) @@ -1758,12 +1777,12 @@ class AnnotateTextResponse(proto.Message): number=6, message="ClassificationCategory", ) - moderation_categories: MutableSequence[ - "ClassificationCategory" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="ClassificationCategory", + moderation_categories: MutableSequence["ClassificationCategory"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="ClassificationCategory", + ) ) diff --git a/packages/google-cloud-language/google/cloud/language_v2/__init__.py b/packages/google-cloud-language/google/cloud/language_v2/__init__.py index 5e0e470bd2d2..6f90d4ce26de 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/__init__.py +++ b/packages/google-cloud-language/google/cloud/language_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.language_service import LanguageServiceAsyncClient, LanguageServiceClient from .types.language_service import ( AnalyzeEntitiesRequest, diff --git a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/async_client.py b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/async_client.py index 6626a4411ee2..1d78626ee20a 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/async_client.py +++ b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v2 import gapic_version as package_version @@ -112,7 +112,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: LanguageServiceAsyncClient: The constructed client. """ - return LanguageServiceClient.from_service_account_info.__func__(LanguageServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + LanguageServiceClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(LanguageServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -128,7 +131,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: LanguageServiceAsyncClient: The constructed client. """ - return LanguageServiceClient.from_service_account_file.__func__(LanguageServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + LanguageServiceClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(LanguageServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/client.py b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/client.py index 2bb46b6baeb9..2fd04191a594 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/client.py +++ b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v2 import gapic_version as package_version @@ -77,9 +77,7 @@ class LanguageServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[LanguageServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[LanguageServiceTransport]] _transport_registry["grpc"] = LanguageServiceGrpcTransport _transport_registry["grpc_asyncio"] = LanguageServiceGrpcAsyncIOTransport _transport_registry["rest"] = LanguageServiceRestTransport @@ -601,11 +599,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LanguageServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LanguageServiceClient._read_environment_variables() + ) self._client_cert_source = LanguageServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +636,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LanguageServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/base.py b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/base.py index cda739ff3f5d..cc05f0c42c09 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/base.py +++ b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v2 import gapic_version as package_version from google.cloud.language_v2.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc.py b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc.py index 42eeb1d5a5ba..839d35bd45de 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc.py +++ b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers 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.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.language_v2.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc_asyncio.py b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc_asyncio.py index 539e1396ea3b..6e1ff3d978b3 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async 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.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.language_v2.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/rest.py b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/rest.py index 53c8ce95b1e1..9b3ca98e498d 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/rest.py +++ b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries 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 json_format from requests import __version__ as requests_version @@ -515,9 +515,7 @@ def __call__( The entity analysis response message. """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeEntities._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeEntities._get_http_options() request, metadata = self._interceptor.pre_analyze_entities( request, metadata @@ -672,9 +670,7 @@ def __call__( """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeSentiment._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeSentiment._get_http_options() request, metadata = self._interceptor.pre_analyze_sentiment( request, metadata diff --git a/packages/google-cloud-language/google/cloud/language_v2/types/language_service.py b/packages/google-cloud-language/google/cloud/language_v2/types/language_service.py index 54fc5a85156d..d422df78b887 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/types/language_service.py +++ b/packages/google-cloud-language/google/cloud/language_v2/types/language_service.py @@ -72,6 +72,7 @@ class EncodingType(proto.Enum): is an example of a language that uses this encoding natively. """ + NONE = 0 UTF8 = 1 UTF16 = 2 @@ -128,6 +129,7 @@ class Type(proto.Enum): HTML (2): HTML """ + TYPE_UNSPECIFIED = 0 PLAIN_TEXT = 1 HTML = 2 @@ -275,6 +277,7 @@ class Type(proto.Enum): The metadata identifies the ``value`` and ``currency``. """ + UNKNOWN = 0 PERSON = 1 LOCATION = 2 @@ -372,6 +375,7 @@ class Type(proto.Enum): COMMON (2): Common noun (or noun compound) """ + TYPE_UNKNOWN = 0 PROPER = 1 COMMON = 2 @@ -651,6 +655,7 @@ class ModelVersion(proto.Enum): returns severity score for a subset of the categories. """ + MODEL_VERSION_UNSPECIFIED = 0 MODEL_VERSION_1 = 1 MODEL_VERSION_2 = 2 @@ -686,12 +691,12 @@ class ModerateTextResponse(proto.Message): effort basis. """ - moderation_categories: MutableSequence[ - "ClassificationCategory" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ClassificationCategory", + moderation_categories: MutableSequence["ClassificationCategory"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ClassificationCategory", + ) ) language_code: str = proto.Field( proto.STRING, @@ -828,12 +833,12 @@ class AnnotateTextResponse(proto.Message): number=5, message="ClassificationCategory", ) - moderation_categories: MutableSequence[ - "ClassificationCategory" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="ClassificationCategory", + moderation_categories: MutableSequence["ClassificationCategory"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="ClassificationCategory", + ) ) language_supported: bool = proto.Field( proto.BOOL, diff --git a/packages/google-cloud-language/mypy.ini b/packages/google-cloud-language/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-language/mypy.ini +++ b/packages/google-cloud-language/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-language/noxfile.py b/packages/google-cloud-language/noxfile.py index d670857c0c09..4a021286eda5 100644 --- a/packages/google-cloud-language/noxfile.py +++ b/packages/google-cloud-language/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting session.run( - "black", + "ruff", + "format", "--check", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -161,10 +165,18 @@ def lint(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in a future release. Please use 'nox -s format' in the future." + ) + + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", *LINT_PATHS, ) @@ -172,19 +184,31 @@ def blacken(session): @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + f"--target-version=py{ALL_PYTHON[0].replace('.', '')}", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-language/tests/unit/gapic/language_v1/test_language_service.py b/packages/google-cloud-language/tests/unit/gapic/language_v1/test_language_service.py index e5e5b3125756..f9878735ce1f 100644 --- a/packages/google-cloud-language/tests/unit/gapic/language_v1/test_language_service.py +++ b/packages/google-cloud-language/tests/unit/gapic/language_v1/test_language_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -968,10 +973,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1020,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1055,10 +1058,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1305,9 +1307,7 @@ def test_language_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1417,9 +1417,9 @@ def test_analyze_sentiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_sentiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_sentiment] = ( + mock_rpc + ) request = {} client.analyze_sentiment(request) @@ -1706,9 +1706,9 @@ def test_analyze_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_entities] = ( + mock_rpc + ) request = {} client.analyze_entities(request) @@ -3323,9 +3323,9 @@ def test_analyze_sentiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_sentiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_sentiment] = ( + mock_rpc + ) request = {} client.analyze_sentiment(request) @@ -3503,9 +3503,9 @@ def test_analyze_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_entities] = ( + mock_rpc + ) request = {} client.analyze_entities(request) diff --git a/packages/google-cloud-language/tests/unit/gapic/language_v1beta2/test_language_service.py b/packages/google-cloud-language/tests/unit/gapic/language_v1beta2/test_language_service.py index 213af1c57113..9b33bc96cc40 100644 --- a/packages/google-cloud-language/tests/unit/gapic/language_v1beta2/test_language_service.py +++ b/packages/google-cloud-language/tests/unit/gapic/language_v1beta2/test_language_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -968,10 +973,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1020,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1055,10 +1058,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1305,9 +1307,7 @@ def test_language_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1417,9 +1417,9 @@ def test_analyze_sentiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_sentiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_sentiment] = ( + mock_rpc + ) request = {} client.analyze_sentiment(request) @@ -1706,9 +1706,9 @@ def test_analyze_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_entities] = ( + mock_rpc + ) request = {} client.analyze_entities(request) @@ -3323,9 +3323,9 @@ def test_analyze_sentiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_sentiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_sentiment] = ( + mock_rpc + ) request = {} client.analyze_sentiment(request) @@ -3503,9 +3503,9 @@ def test_analyze_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_entities] = ( + mock_rpc + ) request = {} client.analyze_entities(request) diff --git a/packages/google-cloud-language/tests/unit/gapic/language_v2/test_language_service.py b/packages/google-cloud-language/tests/unit/gapic/language_v2/test_language_service.py index 573e03eac222..8143bbb1549b 100644 --- a/packages/google-cloud-language/tests/unit/gapic/language_v2/test_language_service.py +++ b/packages/google-cloud-language/tests/unit/gapic/language_v2/test_language_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable, Mapping, Sequence +import grpc +import pytest from google.api_core import api_core_version from google.protobuf import json_format -import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest from requests import PreparedRequest, Request, Response from requests.sessions import Session @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -968,10 +973,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1020,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1055,10 +1058,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1305,9 +1307,7 @@ def test_language_service_client_create_channel_credentials_file( google.auth, "load_credentials_from_file", autospec=True ) as load_creds, mock.patch.object( google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + ) as adc, mock.patch.object(grpc_helpers, "create_channel") as create_channel: creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1419,9 +1419,9 @@ def test_analyze_sentiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_sentiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_sentiment] = ( + mock_rpc + ) request = {} client.analyze_sentiment(request) @@ -1712,9 +1712,9 @@ def test_analyze_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_entities] = ( + mock_rpc + ) request = {} client.analyze_entities(request) @@ -2787,9 +2787,9 @@ def test_analyze_sentiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_sentiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_sentiment] = ( + mock_rpc + ) request = {} client.analyze_sentiment(request) @@ -2967,9 +2967,9 @@ def test_analyze_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_entities] = ( + mock_rpc + ) request = {} client.analyze_entities(request) diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/__init__.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/__init__.py index 4a70dff8313a..cce0a59c655c 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/__init__.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.license_manager import LicenseManagerAsyncClient, LicenseManagerClient from .types.api_entities import ( ActivationState, diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/async_client.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/async_client.py index e0c73ccfcef1..1825f0fb601e 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/async_client.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.licensemanager_v1 import gapic_version as package_version @@ -46,11 +46,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.licensemanager_v1.services.license_manager import pagers from google.cloud.licensemanager_v1.types import api_entities, licensemanager @@ -131,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: LicenseManagerAsyncClient: The constructed client. """ - return LicenseManagerClient.from_service_account_info.__func__(LicenseManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + LicenseManagerClient.from_service_account_info.__func__ # type: ignore + ) + return sa_info_func(LicenseManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: LicenseManagerAsyncClient: The constructed client. """ - return LicenseManagerClient.from_service_account_file.__func__(LicenseManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + LicenseManagerClient.from_service_account_file.__func__ # type: ignore + ) + return sa_file_func(LicenseManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/client.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/client.py index 8e246486b1d5..a55568045bf9 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/client.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.licensemanager_v1 import gapic_version as package_version @@ -63,11 +63,11 @@ import google.api_core.operation as operation # type: ignore import google.api_core.operation_async as operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore import google.protobuf.empty_pb2 as empty_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 google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.cloud.licensemanager_v1.services.license_manager import pagers from google.cloud.licensemanager_v1.types import api_entities, licensemanager @@ -86,9 +86,7 @@ class LicenseManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[LicenseManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[LicenseManagerTransport]] _transport_registry["grpc"] = LicenseManagerGrpcTransport _transport_registry["grpc_asyncio"] = LicenseManagerGrpcAsyncIOTransport _transport_registry["rest"] = LicenseManagerRestTransport @@ -694,11 +692,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LicenseManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LicenseManagerClient._read_environment_variables() + ) self._client_cert_source = LicenseManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -733,8 +729,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LicenseManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/pagers.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/pagers.py index b5d8b4203776..06bb1c29594d 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/pagers.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/base.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/base.py index 76cc23e04536..7b93ebc4ba0b 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/base.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.licensemanager_v1 import gapic_version as package_version from google.cloud.licensemanager_v1.types import api_entities, licensemanager @@ -468,13 +468,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc.py index ca49b931d28b..7d6c1117fd34 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.licensemanager_v1.types import api_entities, licensemanager @@ -613,12 +613,12 @@ def query_configuration_license_usage( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_configuration_license_usage" not in self._stubs: - self._stubs[ - "query_configuration_license_usage" - ] = self._logged_channel.unary_unary( - "/google.cloud.licensemanager.v1.LicenseManager/QueryConfigurationLicenseUsage", - request_serializer=licensemanager.QueryConfigurationLicenseUsageRequest.serialize, - response_deserializer=licensemanager.QueryConfigurationLicenseUsageResponse.deserialize, + self._stubs["query_configuration_license_usage"] = ( + self._logged_channel.unary_unary( + "/google.cloud.licensemanager.v1.LicenseManager/QueryConfigurationLicenseUsage", + request_serializer=licensemanager.QueryConfigurationLicenseUsageRequest.serialize, + response_deserializer=licensemanager.QueryConfigurationLicenseUsageResponse.deserialize, + ) ) return self._stubs["query_configuration_license_usage"] diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc_asyncio.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc_asyncio.py index b2d54fbd3d3c..1d1b1eba32e9 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.licensemanager_v1.types import api_entities, licensemanager @@ -628,12 +628,12 @@ def query_configuration_license_usage( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_configuration_license_usage" not in self._stubs: - self._stubs[ - "query_configuration_license_usage" - ] = self._logged_channel.unary_unary( - "/google.cloud.licensemanager.v1.LicenseManager/QueryConfigurationLicenseUsage", - request_serializer=licensemanager.QueryConfigurationLicenseUsageRequest.serialize, - response_deserializer=licensemanager.QueryConfigurationLicenseUsageResponse.deserialize, + self._stubs["query_configuration_license_usage"] = ( + self._logged_channel.unary_unary( + "/google.cloud.licensemanager.v1.LicenseManager/QueryConfigurationLicenseUsage", + request_serializer=licensemanager.QueryConfigurationLicenseUsageRequest.serialize, + response_deserializer=licensemanager.QueryConfigurationLicenseUsageResponse.deserialize, + ) ) return self._stubs["query_configuration_license_usage"] diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/rest.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/rest.py index 4bd53a99d123..67f60406b987 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/rest.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1321,9 +1321,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseCreateConfiguration._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseCreateConfiguration._get_http_options() request, metadata = self._interceptor.pre_create_configuration( request, metadata @@ -1476,9 +1474,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseDeactivateConfiguration._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseDeactivateConfiguration._get_http_options() request, metadata = self._interceptor.pre_deactivate_configuration( request, metadata @@ -1631,9 +1627,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseDeleteConfiguration._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseDeleteConfiguration._get_http_options() request, metadata = self._interceptor.pre_delete_configuration( request, metadata @@ -1777,9 +1771,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseGetConfiguration._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseGetConfiguration._get_http_options() request, metadata = self._interceptor.pre_get_configuration( request, metadata @@ -2216,9 +2208,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseListConfigurations._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseListConfigurations._get_http_options() request, metadata = self._interceptor.pre_list_configurations( request, metadata @@ -2667,9 +2657,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseQueryConfigurationLicenseUsage._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseQueryConfigurationLicenseUsage._get_http_options() request, metadata = self._interceptor.pre_query_configuration_license_usage( request, metadata @@ -2733,11 +2721,10 @@ def __call__( resp = self._interceptor.post_query_configuration_license_usage(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_configuration_license_usage_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_configuration_license_usage_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2825,9 +2812,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseReactivateConfiguration._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseReactivateConfiguration._get_http_options() request, metadata = self._interceptor.pre_reactivate_configuration( request, metadata @@ -2981,9 +2966,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseUpdateConfiguration._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseUpdateConfiguration._get_http_options() request, metadata = self._interceptor.pre_update_configuration( request, metadata @@ -3104,7 +3087,9 @@ def deactivate_configuration( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeactivateConfiguration(self._session, self._host, self._interceptor) # type: ignore + return self._DeactivateConfiguration( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_configuration( @@ -3180,7 +3165,9 @@ def query_configuration_license_usage( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._QueryConfigurationLicenseUsage(self._session, self._host, self._interceptor) # type: ignore + return self._QueryConfigurationLicenseUsage( + self._session, self._host, self._interceptor + ) # type: ignore @property def reactivate_configuration( @@ -3190,7 +3177,9 @@ def reactivate_configuration( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ReactivateConfiguration(self._session, self._host, self._interceptor) # type: ignore + return self._ReactivateConfiguration( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_configuration( @@ -3537,9 +3526,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3656,9 +3643,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/types/api_entities.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/types/api_entities.py index 7cccf9c8f07f..5141ffef0e83 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/types/api_entities.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/types/api_entities.py @@ -48,6 +48,7 @@ class LicenseType(proto.Enum): LICENSE_TYPE_BRING_YOUR_OWN_LICENSE (2): Bring your own license. """ + LICENSE_TYPE_UNSPECIFIED = 0 LICENSE_TYPE_PER_MONTH_PER_USER = 1 LICENSE_TYPE_BRING_YOUR_OWN_LICENSE = 2 @@ -76,6 +77,7 @@ class ActivationState(proto.Enum): License Key activation failed on the instance. """ + ACTIVATION_STATE_UNSPECIFIED = 0 ACTIVATION_STATE_KEY_REQUESTED = 1 ACTIVATION_STATE_ACTIVATING = 2 @@ -129,6 +131,7 @@ class State(proto.Enum): STATE_DELETED (3): Configuration is in deleted state. """ + STATE_UNSPECIFIED = 0 STATE_ACTIVE = 1 STATE_SUSPENDED = 2 @@ -287,6 +290,7 @@ class State(proto.Enum): STATE_TERMINATED (4): The product has been terminated. """ + STATE_UNSPECIFIED = 0 STATE_PROVISIONING = 1 STATE_RUNNING = 2 @@ -377,6 +381,7 @@ class State(proto.Enum): REPAIRING (7): The instance is in repair. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 STAGING = 2 diff --git a/packages/google-cloud-licensemanager/mypy.ini b/packages/google-cloud-licensemanager/mypy.ini index a3cb5c292172..e0e0da2e9e40 100644 --- a/packages/google-cloud-licensemanager/mypy.ini +++ b/packages/google-cloud-licensemanager/mypy.ini @@ -1,3 +1,15 @@ [mypy] python_version = 3.14 namespace_packages = True +ignore_missing_imports = False + +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563): +# Dependencies that historically lacks py.typed markers +[mypy-google.iam.*] +ignore_missing_imports = True + +# Helps mypy navigate the 'google' namespace more reliably in 3.10+ +explicit_package_bases = True + +# Performance: reuse results from previous runs to speed up 'nox' +incremental = True diff --git a/packages/google-cloud-licensemanager/noxfile.py b/packages/google-cloud-licensemanager/noxfile.py index 2e40cbaf4cd0..fab7b08f4103 100644 --- a/packages/google-cloud-licensemanager/noxfile.py +++ b/packages/google-cloud-licensemanager/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,10 +148,15 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) + session.install("flake8", RUFF_VERSION) + + # 2. Check format{"code":"deadline_exceeded","msg":"operation timed out"}